From a923349c5eece4aa2d10a8b443785663b80097c8 Mon Sep 17 00:00:00 2001 From: Konstantin Date: Thu, 8 Sep 2016 19:26:20 +0400 Subject: [PATCH 1/5] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 20acee5..b25e0e2 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ -Development is suspended for year (I am in the army now) --- Vala Panel Extras --- From 4278fb3e62340100c2caeea8938733a6824cde4e Mon Sep 17 00:00:00 2001 From: Konstantin Date: Wed, 28 Sep 2016 17:37:31 +0400 Subject: [PATCH 2/5] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index b25e0e2..e46fa2f 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ Vala Panel Extras This is StatusNotifierItems for using in Vala Panel (but can be used any DE in list below). Supported DE is: * XFCE (via xfce4-sntray-plugin or xfce4-snw-plugin) + * Mate (via xfce4-sntray-plugin or xfce4-snw-plugin) * ValaPanel (SNTray) * KDE (native) * Gnome (via gnome-shell-extension-appindicator) From 4d0219c76d8d04643007012349ed4499d29936f6 Mon Sep 17 00:00:00 2001 From: Konstantin Date: Tue, 4 Apr 2017 00:40:55 +0300 Subject: [PATCH 3/5] Moved ArchLinux --- archlinux/PKGBUILD | 140 ---------------------------- archlinux/vala-panel-extras.install | 12 --- cmake | 2 +- 3 files changed, 1 insertion(+), 153 deletions(-) delete mode 100644 archlinux/PKGBUILD delete mode 100644 archlinux/vala-panel-extras.install diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD deleted file mode 100644 index 4e94f13..0000000 --- a/archlinux/PKGBUILD +++ /dev/null @@ -1,140 +0,0 @@ -# Maintainer: rilian-la-te - -_pkgbase=vala-panel-extras -pkgbase=vala-panel-extras-git -pkgname=('vala-panel-extras-battery-git' 'vala-panel-extras-volume-git' 'vala-panel-extras-xkb-git' 'vala-panel-extras-gtop-git' 'vala-panel-extras-weather-git' 'vala-panel-extras-common-git' 'vala-panel-extras-xkb-flags-git') -_cmakename=cmake-vala -pkgver=0.1.2.r0.ga50a288 -pkgrel=1 -pkgdesc="Simple StatusNotifierItems for Indicator plugins" -url="https://github.com/rilian-la-te/vala-panel-extras" -arch=('i686' 'x86_64') -license=('GPL3') -replaces=('vala-panel-extras-meta-git') -makedepends=('cmake' 'vala' 'gtk3>=3.12.0' 'libxkbcommon-x11>=0.5.0' 'libxcb>=1.10' 'alsa-lib>=1.0.26' 'libgweather>=3.12.0' 'libx11' 'libgtop') -source=("git://github.com/rilian-la-te/${_pkgbase}.git" - "git://github.com/rilian-la-te/${_cmakename}.git") -sha256sums=('SKIP' - 'SKIP') - -pkgver() { - cd "${srcdir}/${_pkgbase}" - ( set -o pipefail - git describe --long --tags 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' || - printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" - ) -} - -prepare() { - cd "${srcdir}/${_cmakename}" - cp -r . "${srcdir}/${_pkgbase}/cmake" -} - -build() { - cd "${srcdir}/${_pkgbase}" - cmake ./ -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_WEATHER=ON -DENABLE_ALSA=ON -DENABLE_XKB=ON -DENABLE_BATTERY=ON -DGSETTINGS_COMPILE=OFF - make -} - -package_vala-panel-extras-volume-git() { - pkgdesc="Simple volume indicator" - depends=('gtk3' 'alsa-lib>=1.0.26' 'vala-panel-extras-common-git') - optdepends=('xfce4-sntray-plugin: for showing in Xfce' - 'vala-panel-sntray: for showing in vala-panel' - 'xfce4-snw-plugin: for showing in Xfce, alternate way' - 'enlightenment: for showing in E19' - 'indicator-application: for showing in Indicator Environment, like Pantheon or Unity' - 'plasma-desktop: for showing in KDE Frameworks' - 'kdebase-plasma: for showing in KDE4') - install=vala-panel-extras.install - - cd "${srcdir}/${_pkgbase}" - make -C "applets/volume" DESTDIR="${pkgdir}" install - install -D -m644 data/gschemas/org.valapanel.volume.gschema.xml "$pkgdir/usr/share/glib-2.0/schemas/org.valapanel.volume.gschema.xml" -} -package_vala-panel-extras-xkb-git() { - pkgdesc="Simple keyboard layout indicator/switcher" - depends=('gtk3' 'libxkbcommon-x11>=0.5' 'libxcb>=1.10' 'libx11' 'vala-panel-extras-common-git') - optdepends=('xfce4-sntray-plugin: for showing in Xfce' - 'vala-panel-sntray: for showing in vala-panel' - 'xfce4-snw-plugin: for showing in Xfce, alternate way' - 'enlightenment: for showing in E19' - 'indicator-application: for showing in Indicator Environment, like Pantheon or Unity' - 'plasma-desktop: for showing in KDE Frameworks' - 'kdebase-plasma: for showing in KDE4' - 'vala-panel-extras-xkb-flags: builtin flags') - install=vala-panel-extras.install - - cd "${srcdir}/${_pkgbase}" - make -C "applets/xkb" DESTDIR="${pkgdir}" install - install -D -m644 data/gschemas/org.valapanel.xkb.gschema.xml "$pkgdir/usr/share/glib-2.0/schemas/org.valapanel.xkb.gschema.xml" - rm -fr "$pkgdir/usr/share/vala-panel-extras/" -} -package_vala-panel-extras-gtop-git() { - pkgdesc="Simple network speed indicator" - depends=('gtk3' 'libgtop' 'vala-panel-extras-common-git') - optdepends=('xfce4-sntray-plugin: for showing in Xfce' - 'vala-panel-sntray: for showing in vala-panel' - 'xfce4-snw-plugin: for showing in Xfce, alternate way' - 'enlightenment: for showing in E19' - 'indicator-application: for showing in Indicator Environment, like Pantheon or Unity' - 'plasma-desktop: for showing in KDE Frameworks' - 'kdebase-plasma: for showing in KDE4') - install=vala-panel-extras.install - - cd "${srcdir}/${_pkgbase}" - make -C "applets/gtop" DESTDIR="${pkgdir}" install - install -D -m644 data/gschemas/org.valapanel.gtop.gschema.xml "$pkgdir/usr/share/glib-2.0/schemas/org.valapanel.gtop.gschema.xml" -} -package_vala-panel-extras-weather-git() { - pkgdesc="Simple weather indicator" - depends=('gtk3' 'libgweather>=3.12.0' 'vala-panel-extras-common-git') - optdepends=('xfce4-sntray-plugin: for showing in Xfce' - 'vala-panel-sntray: for showing in vala-panel' - 'xfce4-snw-plugin: for showing in Xfce, alternate way' - 'enlightenment: for showing in E19' - 'indicator-application: for showing in Indicator Environment, like Pantheon or Unity' - 'plasma-desktop: for showing in KDE Frameworks' - 'kdebase-plasma: for showing in KDE4') - install=vala-panel-extras.install - - cd "${srcdir}/${_pkgbase}" - make -C "applets/weather" DESTDIR="${pkgdir}" install - install -D -m644 data/gschemas/org.valapanel.weather.gschema.xml "$pkgdir/usr/share/glib-2.0/schemas/org.valapanel.weather.gschema.xml" -} -package_vala-panel-extras-xkb-flags-git() { - arch=('any') - pkgdesc="Flags for XKB plugin" - optdepends=('vala-panel-extras-xkb-git') - install=vala-panel-extras.install - - cd "${srcdir}/${_pkgbase}" - make -C "applets/xkb" DESTDIR="${pkgdir}" install - rm -fr "$pkgdir/usr/bin/" - rm -fr "$pkgdir/usr/share/applications" -} -package_vala-panel-extras-battery-git() { - pkgdesc="Simple battery indicator" - depends=('gtk3' 'upower>=0.99' 'vala-panel-extras-common-git') - optdepends=('xfce4-sntray-plugin: for showing in Xfce' - 'vala-panel-sntray: for showing in vala-panel' - 'xfce4-snw-plugin: for showing in Xfce, alternate way' - 'enlightenment: for showing in E19' - 'indicator-application: for showing in Indicator Environment, like Pantheon or Unity' - 'plasma-desktop: for showing in KDE Frameworks' - 'kdebase-plasma: for showing in KDE4') - install=vala-panel-extras.install - - cd "${srcdir}/${_pkgbase}" - make -C "applets/batt" DESTDIR="${pkgdir}" install - install -D -m644 data/gschemas/org.valapanel.battery.gschema.xml "$pkgdir/usr/share/glib-2.0/schemas/org.valapanel.battery.gschema.xml" -} - -package_vala-panel-extras-common-git() { - arch=('any') - pkgdesc="Common files for vala-panel-extras" - replaces=('vala-panel-extras-translations-git') - - cd "${srcdir}/${_pkgbase}" - make -C "po" DESTDIR="${pkgdir}" install -} \ No newline at end of file diff --git a/archlinux/vala-panel-extras.install b/archlinux/vala-panel-extras.install deleted file mode 100644 index 2b25fae..0000000 --- a/archlinux/vala-panel-extras.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas - update-desktop-database -q -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/cmake b/cmake index 2e518fc..0e6fcd5 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 2e518fc9a18a659203050269a4783949e34bd3a6 +Subproject commit 0e6fcd579147de15f9a0fcdd94509ed60e17e600 From 7e3ddaa578a8a4b14dc0106fb9a1d3f53ddacdee Mon Sep 17 00:00:00 2001 From: Konstantin Date: Tue, 4 Apr 2017 00:44:23 +0300 Subject: [PATCH 4/5] Moved debian folder --- debian/changelog | 17 --- debian/compat | 1 - debian/control | 121 ------------------ debian/copyright | 28 ---- debian/docs | 1 - .../patches/install-all-schemas-at-once.patch | 26 ---- debian/patches/series | 1 - debian/rules | 49 ------- debian/source/format | 1 - debian/vala-panel-extras-battery.1 | 16 --- debian/vala-panel-extras-battery.install | 3 - debian/vala-panel-extras-battery.manpages | 1 - debian/vala-panel-extras-common.install | 1 - debian/vala-panel-extras-gtop.1 | 16 --- debian/vala-panel-extras-gtop.install | 3 - debian/vala-panel-extras-gtop.manpages | 1 - debian/vala-panel-extras-volume.1 | 16 --- debian/vala-panel-extras-volume.install | 3 - debian/vala-panel-extras-volume.manpages | 1 - debian/vala-panel-extras-weather.1 | 16 --- debian/vala-panel-extras-weather.install | 3 - debian/vala-panel-extras-weather.manpages | 1 - debian/vala-panel-extras-xkb-flags.install | 1 - debian/vala-panel-extras-xkb.1 | 16 --- debian/vala-panel-extras-xkb.install | 3 - debian/vala-panel-extras-xkb.manpages | 1 - 26 files changed, 347 deletions(-) delete mode 100644 debian/changelog delete mode 100644 debian/compat delete mode 100644 debian/control delete mode 100644 debian/copyright delete mode 100644 debian/docs delete mode 100644 debian/patches/install-all-schemas-at-once.patch delete mode 100644 debian/patches/series delete mode 100755 debian/rules delete mode 100644 debian/source/format delete mode 100644 debian/vala-panel-extras-battery.1 delete mode 100644 debian/vala-panel-extras-battery.install delete mode 100644 debian/vala-panel-extras-battery.manpages delete mode 100644 debian/vala-panel-extras-common.install delete mode 100644 debian/vala-panel-extras-gtop.1 delete mode 100644 debian/vala-panel-extras-gtop.install delete mode 100644 debian/vala-panel-extras-gtop.manpages delete mode 100644 debian/vala-panel-extras-volume.1 delete mode 100644 debian/vala-panel-extras-volume.install delete mode 100644 debian/vala-panel-extras-volume.manpages delete mode 100644 debian/vala-panel-extras-weather.1 delete mode 100644 debian/vala-panel-extras-weather.install delete mode 100644 debian/vala-panel-extras-weather.manpages delete mode 100644 debian/vala-panel-extras-xkb-flags.install delete mode 100644 debian/vala-panel-extras-xkb.1 delete mode 100644 debian/vala-panel-extras-xkb.install delete mode 100644 debian/vala-panel-extras-xkb.manpages diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index 5956798..0000000 --- a/debian/changelog +++ /dev/null @@ -1,17 +0,0 @@ -vala-panel-extras (0.1.4-1) vivid; urgency=medium - - * New upstream version - - -- Konstantin Sun, 24 May 2015 20:24:48 +0600 - -vala-panel-extras (0.1.3.1-1ubuntu1) vivid; urgency=medium - - * Fixed valac builddep - - -- Konstantin Sun, 26 Apr 2015 20:24:48 +0600 - -vala-panel-extras (0.1.3.1-1) vivid; urgency=low - - * Initial release - - -- Konstantin Sat, 25 Apr 2015 00:57:09 +0600 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index ec63514..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/debian/control b/debian/control deleted file mode 100644 index 214f3b8..0000000 --- a/debian/control +++ /dev/null @@ -1,121 +0,0 @@ -Source: vala-panel-extras -Section: x11 -Priority: optional -Maintainer: Konstantin P. -Build-Depends: debhelper (>= 9), cmake (>= 2.8.0), valac (>= 0.24.0), libgtk-3-dev (>= 3.12.0), libasound2-dev, libgtop2-dev, libxkbcommon-x11-dev, libx11-xcb-dev, libxcb-xkb-dev, libgweather-3-dev -Standards-Version: 3.9.6 -Homepage: https://github.com/rilian-la-te/vala-panel-extras -Vcs-Git: https://github.com/rilian-la-te/vala-panel-extras.git -Vcs-Browser: https://github.com/rilian-la-te/vala-panel-extras - -Package: vala-panel-extras-common -Architecture: all -Depends: ${misc:Depends} -Description: This is Vala Panel Extras common files. - Vala Panel Extras is small programs that can be used with - any StatusNotifierWatcher. It may not be useful in Ubuntu, - but very good in other environments - -Package: vala-panel-extras-volume -Architecture: any -Enhances: vala-panel -Depends: ${shlibs:Depends}, ${misc:Depends}, vala-panel-extras-common -Description: This is Vala Panel Extras volume applet. - Vala Panel Extras is small programs that can be used with - any StatusNotifierWatcher. It may not be useful in Ubuntu, - but very good in other environments - -Package: vala-panel-extras-volume-dbg -Architecture: any -Section: debug -Priority: extra -Depends: ${misc:Depends}, vala-panel-extras-volume (= ${binary:Version}) -Description: This is debug information for Vala Panel Extras (volume applet) - Vala Panel Extras is small programs that can be used with - any StatusNotifierWatcher. It may not be useful in Ubuntu, - but very good in other environments - -Package: vala-panel-extras-xkb -Architecture: any -Enhances: vala-panel -Depends: ${shlibs:Depends}, ${misc:Depends}, vala-panel-extras-common -Recommends: vala-panel-extras-xkb-flags -Description: This is Vala Panel Extras keyboard layout applet. - Vala Panel Extras is small programs that can be used with - any StatusNotifierWatcher. It may not be useful in Ubuntu, - but very good in other environments - -Package: vala-panel-extras-xkb-flags -Architecture: all -Depends: ${misc:Depends}, vala-panel-extras-xkb -Description: This is Vala Panel Extras keyboard layout applet flags. - Vala Panel Extras is small programs that can be used with - any StatusNotifierWatcher. It may not be useful in Ubuntu, - but very good in other environments - -Package: vala-panel-extras-xkb-dbg -Architecture: any -Section: debug -Priority: extra -Depends: ${misc:Depends}, vala-panel-extras-xkb (= ${binary:Version}) -Description: This is debug information for Vala Panel Extras (keyboard layout applet) - Vala Panel Extras is small programs that can be used with - any StatusNotifierWatcher. It may not be useful in Ubuntu, - but very good in other environments - -Package: vala-panel-extras-gtop -Architecture: any -Enhances: vala-panel -Depends: ${shlibs:Depends}, ${misc:Depends}, vala-panel-extras-common -Description: This is Vala Panel Extras gtop applet. - Vala Panel Extras is small programs that can be used with - any StatusNotifierWatcher. It may not be useful in Ubuntu, - but very good in other environments - -Package: vala-panel-extras-gtop-dbg -Architecture: any -Section: debug -Priority: extra -Depends: ${misc:Depends}, vala-panel-extras-gtop (= ${binary:Version}) -Description: This is debug information for Vala Panel Extras (netspeed applet) - Vala Panel Extras is small programs that can be used with - any StatusNotifierWatcher. It may not be useful in Ubuntu, - but very good in other environments - -Package: vala-panel-extras-weather -Architecture: any -Enhances: vala-panel -Depends: ${shlibs:Depends}, ${misc:Depends}, vala-panel-extras-common -Description: This is Vala Panel Extras weather applet. - Vala Panel Extras is small programs that can be used with - any StatusNotifierWatcher. It may not be useful in Ubuntu, - but very good in other environments - -Package: vala-panel-extras-weather-dbg -Architecture: any -Section: debug -Priority: extra -Depends: ${misc:Depends}, vala-panel-extras-weather (= ${binary:Version}) -Description: This is debug information for Vala Panel Extras (volume applet) - Vala Panel Extras is small programs that can be used with - any StatusNotifierWatcher. It may not be useful in Ubuntu, - but very good in other environments - -Package: vala-panel-extras-battery -Architecture: any -Enhances: vala-panel -Depends: ${shlibs:Depends}, ${misc:Depends}, vala-panel-extras-common, upower -Description: This is Vala Panel Extras battery applet. - Vala Panel Extras is small programs that can be used with - any StatusNotifierWatcher. It may not be useful in Ubuntu, - but very good in other environments - -Package: vala-panel-extras-battery-dbg -Architecture: any -Section: debug -Priority: extra -Depends: ${misc:Depends}, vala-panel-extras-battery (= ${binary:Version}) -Description: This is debug information for Vala Panel Extras (volume applet) - Vala Panel Extras is small programs that can be used with - any StatusNotifierWatcher. It may not be useful in Ubuntu, - but very good in other environments \ No newline at end of file diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index 0249fe9..0000000 --- a/debian/copyright +++ /dev/null @@ -1,28 +0,0 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: vala-panel-extras -Source: - -Files: * -Copyright: <2014-2015> > -License: LGPL-3.0+ - -Files: debian/* -Copyright: 2015 Konstantin P. -License: LGPL-3.0+ - -License: LGPL-3.0+ - This package is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 3 of the License, or (at your option) any later version. - . - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program. If not, see . - . - On Debian systems, the complete text of the GNU Lesser General - Public License can be found in "/usr/share/common-licenses/LGPL-3". diff --git a/debian/docs b/debian/docs deleted file mode 100644 index b43bf86..0000000 --- a/debian/docs +++ /dev/null @@ -1 +0,0 @@ -README.md diff --git a/debian/patches/install-all-schemas-at-once.patch b/debian/patches/install-all-schemas-at-once.patch deleted file mode 100644 index b8c9cd1..0000000 --- a/debian/patches/install-all-schemas-at-once.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/data/gschemas/CMakeLists.txt b/data/gschemas/CMakeLists.txt -index 185562c..1c15898 100644 ---- a/data/gschemas/CMakeLists.txt -+++ b/data/gschemas/CMakeLists.txt -@@ -1,16 +1,6 @@ - include(GSettings) --if (ENABLE_ALSA) -- add_schema("org.valapanel.volume.gschema.xml") --endif() --if (ENABLE_WEATHER) -- add_schema("org.valapanel.weather.gschema.xml") --endif() --if (ENABLE_XKB) -- add_schema("org.valapanel.xkb.gschema.xml") --endif() --if (ENABLE_BATTERY) -- add_schema("org.valapanel.battery.gschema.xml") --endif() --if (ENABLE_LIBGTOP) -- add_schema("org.valapanel.gtop.gschema.xml") --endif() -+add_schema("org.valapanel.volume.gschema.xml") -+add_schema("org.valapanel.weather.gschema.xml") -+add_schema("org.valapanel.xkb.gschema.xml") -+add_schema("org.valapanel.battery.gschema.xml") -+add_schema("org.valapanel.gtop.gschema.xml") diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 6f79d1e..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -install-all-schemas-at-once.patch diff --git a/debian/rules b/debian/rules deleted file mode 100755 index 0f093ef..0000000 --- a/debian/rules +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/make -f -# See debhelper(7) (uncomment to enable) -# output every command that modifies files on the build system. -#DH_VERBOSE = 1 - -# see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/* -DPKG_EXPORT_BUILDFLAGS = 1 -include /usr/share/dpkg/default.mk - -# see FEATURE AREAS in dpkg-buildflags(1) -#export DEB_BUILD_MAINT_OPTIONS = hardening=+all - -# see ENVIRONMENT in dpkg-buildflags(1) -# package maintainers to append CFLAGS -#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic -# package maintainers to append LDFLAGS -#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed - - -# main packaging script based on dh7 syntax -%: - dh $@ - -override_dh_auto_clean: - dh_auto_clean --buildsystem=cmake - -override_dh_auto_build: - dh_auto_build --buildsystem=cmake - -# consider using -DUSE_VERSIONED_DIR=ON if backporting -override_dh_auto_configure: - dh_auto_configure --buildsystem=cmake -- -DCMAKE_BUILD_TYPE=RelWithDebInfo - -override_dh_strip: - dh_strip --package=vala-panel-extras-volume --dbg-package=vala-panel-extras-volume-dbg - dh_strip --package=vala-panel-extras-weather --dbg-package=vala-panel-extras-weather-dbg - dh_strip --package=vala-panel-extras-gtop --dbg-package=vala-panel-extras-gtop-dbg - dh_strip --package=vala-panel-extras-xkb --dbg-package=vala-panel-extras-xkb-dbg - dh_strip --package=vala-panel-extras-battery --dbg-package=vala-panel-extras-battery-dbg - -# debmake generated override targets -# This is example for Cmake (See http://bugs.debian.org/641051 ) -#override_dh_auto_configure: -# dh_auto_configure -- \ -# -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) - - - - diff --git a/debian/source/format b/debian/source/format deleted file mode 100644 index 163aaf8..0000000 --- a/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/debian/vala-panel-extras-battery.1 b/debian/vala-panel-extras-battery.1 deleted file mode 100644 index 04a3fde..0000000 --- a/debian/vala-panel-extras-battery.1 +++ /dev/null @@ -1,16 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.4. -.TH VALA-PANEL-EXTRAS-BATTERY "1" "April 2015" "vala-panel-extras-battery - Version 0.1.3" "User Commands" -.SH NAME -vala-panel-extras-battery \- Vala Panel Extras Battery Applet -.SH DESCRIPTION -.SS "Usage:" -.IP -vala\-panel\-extras\-battery [OPTION...] -.SS "Help Options:" -.TP -\fB\-h\fR, \fB\-\-help\fR -Show help options -.SS "Application Options:" -.TP -\fB\-v\fR, \fB\-\-version\fR -Print version and exit diff --git a/debian/vala-panel-extras-battery.install b/debian/vala-panel-extras-battery.install deleted file mode 100644 index 591b587..0000000 --- a/debian/vala-panel-extras-battery.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/bin/vala-panel-extras-battery -usr/share/applications/org.valapanel.battery.desktop -usr/share/glib-2.0/schemas/org.valapanel.battery.gschema.xml diff --git a/debian/vala-panel-extras-battery.manpages b/debian/vala-panel-extras-battery.manpages deleted file mode 100644 index ef8b6ea..0000000 --- a/debian/vala-panel-extras-battery.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/vala-panel-extras-battery.1 \ No newline at end of file diff --git a/debian/vala-panel-extras-common.install b/debian/vala-panel-extras-common.install deleted file mode 100644 index 5c41d9b..0000000 --- a/debian/vala-panel-extras-common.install +++ /dev/null @@ -1 +0,0 @@ -usr/share/locale/* \ No newline at end of file diff --git a/debian/vala-panel-extras-gtop.1 b/debian/vala-panel-extras-gtop.1 deleted file mode 100644 index a35e2c1..0000000 --- a/debian/vala-panel-extras-gtop.1 +++ /dev/null @@ -1,16 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.4. -.TH VALA-PANEL-EXTRAS-GTOP "1" "April 2015" "vala-panel-extras-gtop - Version 0.1.3" "User Commands" -.SH NAME -vala-panel-extras-gtop \- Vala Panel Extras Network Speed Applet -.SH DESCRIPTION -.SS "Usage:" -.IP -vala\-panel\-extras\-gtop [OPTION...] -.SS "Help Options:" -.TP -\fB\-h\fR, \fB\-\-help\fR -Show help options -.SS "Application Options:" -.TP -\fB\-v\fR, \fB\-\-version\fR -Print version and exit diff --git a/debian/vala-panel-extras-gtop.install b/debian/vala-panel-extras-gtop.install deleted file mode 100644 index 314199e..0000000 --- a/debian/vala-panel-extras-gtop.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/bin/vala-panel-extras-gtop -usr/share/applications/org.valapanel.gtop.desktop -usr/share/glib-2.0/schemas/org.valapanel.gtop.gschema.xml diff --git a/debian/vala-panel-extras-gtop.manpages b/debian/vala-panel-extras-gtop.manpages deleted file mode 100644 index 075ec67..0000000 --- a/debian/vala-panel-extras-gtop.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/vala-panel-extras-gtop.1 \ No newline at end of file diff --git a/debian/vala-panel-extras-volume.1 b/debian/vala-panel-extras-volume.1 deleted file mode 100644 index 3895409..0000000 --- a/debian/vala-panel-extras-volume.1 +++ /dev/null @@ -1,16 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.4. -.TH VALA-PANEL-EXTRAS-VOLUME "1" "April 2015" "vala-panel-extras-volume - Version 0.1.3" "User Commands" -.SH NAME -vala-panel-extras-volume \- Vala Panel Extras Volume Applet -.SH DESCRIPTION -.SS "Usage:" -.IP -vala\-panel\-extras\-volume [OPTION...] -.SS "Help Options:" -.TP -\fB\-h\fR, \fB\-\-help\fR -Show help options -.SS "Application Options:" -.TP -\fB\-v\fR, \fB\-\-version\fR -Print version and exit diff --git a/debian/vala-panel-extras-volume.install b/debian/vala-panel-extras-volume.install deleted file mode 100644 index 3d8aca5..0000000 --- a/debian/vala-panel-extras-volume.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/bin/vala-panel-extras-volume -usr/share/applications/org.valapanel.volume.desktop -usr/share/glib-2.0/schemas/org.valapanel.volume.gschema.xml diff --git a/debian/vala-panel-extras-volume.manpages b/debian/vala-panel-extras-volume.manpages deleted file mode 100644 index 2f45c1b..0000000 --- a/debian/vala-panel-extras-volume.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/vala-panel-extras-volume.1 \ No newline at end of file diff --git a/debian/vala-panel-extras-weather.1 b/debian/vala-panel-extras-weather.1 deleted file mode 100644 index 84857f8..0000000 --- a/debian/vala-panel-extras-weather.1 +++ /dev/null @@ -1,16 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.4. -.TH VALA-PANEL-EXTRAS-WEATHER "1" "April 2015" "vala-panel-extras-weather - Version 0.1.3" "User Commands" -.SH NAME -vala-panel-extras-weather \- Vala Panel Extras Weather Applet -.SH DESCRIPTION -.SS "Usage:" -.IP -vala\-panel\-extras\-weather [OPTION...] -.SS "Help Options:" -.TP -\fB\-h\fR, \fB\-\-help\fR -Show help options -.SS "Application Options:" -.TP -\fB\-v\fR, \fB\-\-version\fR -Print version and exit diff --git a/debian/vala-panel-extras-weather.install b/debian/vala-panel-extras-weather.install deleted file mode 100644 index c8ec9af..0000000 --- a/debian/vala-panel-extras-weather.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/bin/vala-panel-extras-weather -usr/share/applications/org.valapanel.weather.desktop -usr/share/glib-2.0/schemas/org.valapanel.weather.gschema.xml diff --git a/debian/vala-panel-extras-weather.manpages b/debian/vala-panel-extras-weather.manpages deleted file mode 100644 index bde984e..0000000 --- a/debian/vala-panel-extras-weather.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/vala-panel-extras-weather.1 \ No newline at end of file diff --git a/debian/vala-panel-extras-xkb-flags.install b/debian/vala-panel-extras-xkb-flags.install deleted file mode 100644 index 9370255..0000000 --- a/debian/vala-panel-extras-xkb-flags.install +++ /dev/null @@ -1 +0,0 @@ -usr/share/vala-panel-extras/xkb/icons/* \ No newline at end of file diff --git a/debian/vala-panel-extras-xkb.1 b/debian/vala-panel-extras-xkb.1 deleted file mode 100644 index 8ab5301..0000000 --- a/debian/vala-panel-extras-xkb.1 +++ /dev/null @@ -1,16 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.4. -.TH VALA-PANEL-EXTRAS-XKB "1" "April 2015" "vala-panel-extras-xkb - Version 0.1.3" "User Commands" -.SH NAME -vala-panel-extras-xkb \- Vala Panel Extras Keyboard Layout Applet -.SH DESCRIPTION -.SS "Usage:" -.IP -vala\-panel\-extras\-xkb [OPTION...] -.SS "Help Options:" -.TP -\fB\-h\fR, \fB\-\-help\fR -Show help options -.SS "Application Options:" -.TP -\fB\-v\fR, \fB\-\-version\fR -Print version and exit diff --git a/debian/vala-panel-extras-xkb.install b/debian/vala-panel-extras-xkb.install deleted file mode 100644 index 8257058..0000000 --- a/debian/vala-panel-extras-xkb.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/bin/vala-panel-extras-xkb -usr/share/applications/org.valapanel.xkb.desktop -usr/share/glib-2.0/schemas/org.valapanel.xkb.gschema.xml diff --git a/debian/vala-panel-extras-xkb.manpages b/debian/vala-panel-extras-xkb.manpages deleted file mode 100644 index ec63760..0000000 --- a/debian/vala-panel-extras-xkb.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/vala-panel-extras-xkb.1 \ No newline at end of file From c429a203fceea535b9770803e50d4601a82c4412 Mon Sep 17 00:00:00 2001 From: Konstantin Date: Tue, 4 Apr 2017 00:52:22 +0300 Subject: [PATCH 5/5] Fixed warnings --- applets/batt/battery.vala | 14 +++++++------- applets/gtop/gtop.vala | 2 +- applets/volume/volume.vala | 6 +++--- applets/weather/weather.vala | 8 ++++---- lib/application.vala | 6 +++--- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/applets/batt/battery.vala b/applets/batt/battery.vala index b164c6f..fe9b7f9 100644 --- a/applets/batt/battery.vala +++ b/applets/batt/battery.vala @@ -36,13 +36,13 @@ private class DeviceData [DBus (name = "org.kde.StatusNotifierItem")] public class BatteryIconExporter : ItemExporter { - private static const string UPOWER_PATH = "/org/freedesktop/UPower"; - internal static const string UPOWER_NAME = "org.freedesktop.UPower"; - private static const string NOTIFY = "use-notifications"; - private static const string PERCENT = "show-percentage"; - private static const string TIME = "show-time-remaining"; - private static const string COMMAND = "pm-command"; - private static const string PATH = "display-device-path"; + private const string UPOWER_PATH = "/org/freedesktop/UPower"; + internal const string UPOWER_NAME = "org.freedesktop.UPower"; + private const string NOTIFY = "use-notifications"; + private const string PERCENT = "show-percentage"; + private const string TIME = "show-time-remaining"; + private const string COMMAND = "pm-command"; + private const string PATH = "display-device-path"; public bool use_notifications {get; internal set;} public bool show_percentage {get; internal set;} public bool show_time_remaining {get; internal set;} diff --git a/applets/gtop/gtop.vala b/applets/gtop/gtop.vala index 3a6cf52..c25d7fc 100644 --- a/applets/gtop/gtop.vala +++ b/applets/gtop/gtop.vala @@ -15,7 +15,7 @@ public static int main(string[] args) [DBus (name = "org.kde.StatusNotifierItem")] public class NetloadIconExporter : ItemExporter { - private static const string IFACE = "network-interface"; + private const string IFACE = "network-interface"; public string network_interface {get; internal set;} public bool reload {get; internal set;} private uint64 bytes_in_old; diff --git a/applets/volume/volume.vala b/applets/volume/volume.vala index 6256c37..3523e38 100644 --- a/applets/volume/volume.vala +++ b/applets/volume/volume.vala @@ -15,9 +15,9 @@ public static int main(string[] args) [DBus (name = "org.kde.StatusNotifierItem")] public class VolumeIconExporter : ItemExporter { - private static const string KEY_CHANNEL = "channel-id"; - private static const string KEY_CARD_ID = "card-id"; - private static const string KEY_MIXER = "mixer"; + private const string KEY_CHANNEL = "channel-id"; + private const string KEY_CARD_ID = "card-id"; + private const string KEY_MIXER = "mixer"; bool asound_find_element(string ename) { for ( diff --git a/applets/weather/weather.vala b/applets/weather/weather.vala index 3e62737..614cd31 100644 --- a/applets/weather/weather.vala +++ b/applets/weather/weather.vala @@ -16,10 +16,10 @@ namespace Weather [DBus (name = "org.kde.StatusNotifierItem")] public class WeatherIconExporter : ItemExporter { - internal static const string LOCATIONS = "locations"; - internal static const string CURRENT_LOC = "current-location"; - internal static const string UPDATE = "update-interval"; - internal static const string SHOW_LABEL = "show-temperature"; + internal const string LOCATIONS = "locations"; + internal const string CURRENT_LOC = "current-location"; + internal const string UPDATE = "update-interval"; + internal const string SHOW_LABEL = "show-temperature"; private uint update_source; internal GWeather.Location[] locations {get; set;} internal bool show_temperature {get; set;} diff --git a/lib/application.vala b/lib/application.vala index 9d04a44..c536a9b 100644 --- a/lib/application.vala +++ b/lib/application.vala @@ -6,15 +6,15 @@ namespace StatusNotifier { public class App: GLib.Application { - protected static const OptionEntry[] options = + protected const OptionEntry[] options = { { "version", 'v', 0, OptionArg.NONE, null, N_("Print version and exit"), null }, { null } }; [CCode (has_target = true)] public delegate Gtk.Dialog CreatePreferencesDialog(); - private static const string NAME = "options"; - private static const string PATH = "/org/vala-panel/"; + private const string NAME = "options"; + private const string PATH = "/org/vala-panel/"; public ItemExporter icon {get; construct;} public unowned CreatePreferencesDialog preferences {get; set;} public Gtk.AboutDialog? about {get; private set;}