diff --git a/data/ui/icontasklist.glade~ b/data/ui/icontasklist.glade~
deleted file mode 100644
index 31c55f9f..00000000
--- a/data/ui/icontasklist.glade~
+++ /dev/null
@@ -1,578 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/debian/changelog b/debian/changelog
index 65f91b22..a662f430 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-vala-panel (0.2.6-1) unstable; urgency=low
+vala-panel (0.2.6.1-1) unstable; urgency=low
* Initial release
diff --git a/debian/control b/debian/control
index 2bb1f3c4..0cf6dfe3 100644
--- a/debian/control
+++ b/debian/control
@@ -2,132 +2,157 @@ Source: vala-panel
Section: x11
Priority: optional
Maintainer: Konstantin P.
-Build-Depends: debhelper (>= 9), cmake (>= 2.8.0), libpeas-dev (>= 1.2.0), libgtk-3-dev (>= 3.12.0), libwnck-3-dev (>= 3.4.0),
-Standards-Version: 3.9.5
+Build-Depends: debhelper (>= 9), cmake (>= 2.8.0), libpeas-dev (>= 1.2.0), libgtk-3-dev (>= 3.12.0), libwnck-3-dev (>= 3.4.0), docbook-xsl, docbook-xml, xsltproc
+Standards-Version: 3.9.6
Homepage: https://github.com/rilian-la-te/vala-panel
Vcs-Git: https://github.com/rilian-la-te/vala-panel.git
Vcs-Browser: https://github.com/rilian-la-te/vala-panel
Package: vala-panel
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libvalapanel (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libvalapanel0 (= ${binary:Version})
Description: Vala Panel is GTK+ 3 desktop panel. It is based on Vala and some LXPanel ideas.
Vala Panel is GTK+ 3 desktop panel. It is based on Vala and LXPanel ideas.
- In fact, it was be a fork of LXPanel in version 0.1.0, but in 0.2.0 it completery rewritten in Vala.
- It offers same functionality as LXPanel, but:
+ It was be a fork of LXPanel in version 0.1.0, but in 0.2.0 it is
+ completely rewritten in Vala. It offers same functionality as LXPanel, but:
1. It has slightly more memory usage.
- 2. X11 dependency is stripped from panel core (but it is not tested on Wayland right now)
- 3. Some of former LXPanel plugins is separate binaries now, and lives in another packages.
+ 2. X11 dependency is stripped from panel core (but it is not tested on
+ another display servers, such as Wayland or Mir, right now).
+ 3. Some of former LXPanel plugins is separate binaries now
+ and lives in another packages (Example is volume applet).
Package: vala-panel-dbg
Architecture: any
Section: debug
Priority: extra
Depends: ${misc:Depends}, vala-panel (= ${binary:Version})
-Description: Vala Panel is GTK+ 3 desktop panel. It is based on Vala and some LXPanel ideas.
+Description: Vala Panel - debug info.
Vala Panel is GTK+ 3 desktop panel. It is based on Vala and LXPanel ideas.
- In fact, it was be a fork of LXPanel in version 0.1.0, but in 0.2.0 it completery rewritten in Vala.
- It offers same functionality as LXPanel, but:
+ It was be a fork of LXPanel in version 0.1.0, but in 0.2.0 it is
+ completely rewritten in Vala. It offers same functionality as LXPanel, but:
1. It has slightly more memory usage.
- 2. X11 dependency is stripped from panel core (but it is not tested on Wayland right now)
- 3. Some of former LXPanel plugins is separate binaries now, and lives in another packages.
+ 2. X11 dependency is stripped from panel core (but it is not tested on
+ another display servers, such as Wayland or Mir, right now).
+ 3. Some of former LXPanel plugins is separate binaries now
+ and lives in another packages (Example is volume applet).
.
This package contains debug information for vala-panel binary.
Package: libvalapanel0-dev
Section: libdevel
Architecture: any
-Depends: libvalapanel (= ${binary:Version}), ${misc:Depends}
+Depends: libvalapanel0 (= ${binary:Version}), ${misc:Depends}
Description: Shared library for vala-panel - development files
Vala Panel is GTK+ 3 desktop panel. It is based on Vala and LXPanel ideas.
- In fact, it was be a fork of LXPanel in version 0.1.0, but in 0.2.0 it completery rewritten in Vala.
- It offers same functionality as LXPanel, but:
+ It was be a fork of LXPanel in version 0.1.0, but in 0.2.0 it is
+ completely rewritten in Vala. It offers same functionality as LXPanel, but:
1. It has slightly more memory usage.
- 2. X11 dependency is stripped from panel core (but it is not tested on Wayland right now)
- 3. Some of former LXPanel plugins is separate binaries now, and lives in another packages.
+ 2. X11 dependency is stripped from panel core (but it is not tested on
+ another display servers, such as Wayland or Mir, right now).
+ 3. Some of former LXPanel plugins is separate binaries now
+ and lives in another packages (Example is volume applet).
.
- This package contains header files for building plugins or window managers with vala-panel support.
+ This package contains header files for building plugins
+ or window managers with vala-panel support.
Package: libvalapanel0
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Shared library for vala-panel - binary files
Vala Panel is GTK+ 3 desktop panel. It is based on Vala and LXPanel ideas.
- In fact, it was be a fork of LXPanel in version 0.1.0, but in 0.2.0 it completery rewritten in Vala.
- It offers same functionality as LXPanel, but:
+ It was be a fork of LXPanel in version 0.1.0, but in 0.2.0 it is
+ completely rewritten in Vala. It offers same functionality as LXPanel, but:
1. It has slightly more memory usage.
- 2. X11 dependency is stripped from panel core (but it is not tested on Wayland right now)
- 3. Some of former LXPanel plugins is separate binaries now, and lives in another packages.
+ 2. X11 dependency is stripped from panel core (but it is not tested on
+ another display servers, such as Wayland or Mir, right now).
+ 3. Some of former LXPanel plugins is separate binaries now
+ and lives in another packages (Example is volume applet).
.
- This package contains main library for vala-panel. It is required to run vala-panel application.
+ This package contains main library for vala-panel.
+ It is required to run vala-panel application.
Package: libvalapanel0-dbg
Architecture: any
Section: debug
Priority: extra
Depends: ${misc:Depends}, vala-panel (= ${binary:Version})
-Description: Vala Panel is GTK+ 3 desktop panel. It is based on Vala and some LXPanel ideas.
+Description: Shared library for vala-panel - debug info
Vala Panel is GTK+ 3 desktop panel. It is based on Vala and LXPanel ideas.
- In fact, it was be a fork of LXPanel in version 0.1.0, but in 0.2.0 it completery rewritten in Vala.
- It offers same functionality as LXPanel, but:
+ It was be a fork of LXPanel in version 0.1.0, but in 0.2.0 it is
+ completely rewritten in Vala. It offers same functionality as LXPanel, but:
1. It has slightly more memory usage.
- 2. X11 dependency is stripped from panel core (but it is not tested on Wayland right now)
- 3. Some of former LXPanel plugins is separate binaries now, and lives in another packages.
+ 2. X11 dependency is stripped from panel core (but it is not tested on
+ another display servers, such as Wayland or Mir, right now).
+ 3. Some of former LXPanel plugins is separate binaries now
+ and lives in another packages (Example is volume applet).
.
This package contains debug information for vala-panel library.
Package: vala-panel-plugins-base
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Plugins for vala-panel - non X11 plugins.
Vala Panel is GTK+ 3 desktop panel. It is based on Vala and LXPanel ideas.
- In fact, it was be a fork of LXPanel in version 0.1.0, but in 0.2.0 it completery rewritten in Vala.
- It offers same functionality as LXPanel, but:
+ It was be a fork of LXPanel in version 0.1.0, but in 0.2.0 it is
+ completely rewritten in Vala. It offers same functionality as LXPanel, but:
1. It has slightly more memory usage.
- 2. X11 dependency is stripped from panel core (but it is not tested on Wayland right now)
- 3. Some of former LXPanel plugins is separate binaries now, and lives in another packages.
+ 2. X11 dependency is stripped from panel core (but it is not tested on
+ another display servers, such as Wayland or Mir, right now).
+ 3. Some of former LXPanel plugins is separate binaries now
+ and lives in another packages (Example is volume applet).
.
- This package contains main plugins for vala-panel: clock, launchbar, applications menu and so on.
+ This package contains main plugins for vala-panel:
+ clock, launchbar, applications menu and so on.
Package: vala-panel-plugins-base-dbg
Architecture: any
Section: debug
Priority: extra
Depends: ${misc:Depends}, vala-panel-plugins-base (= ${binary:Version})
-Description: Vala Panel is GTK+ 3 desktop panel. It is based on Vala and some LXPanel ideas.
+Description: Plugins for vala-panel - non-X11 plugins - debug info.
Vala Panel is GTK+ 3 desktop panel. It is based on Vala and LXPanel ideas.
- In fact, it was be a fork of LXPanel in version 0.1.0, but in 0.2.0 it completery rewritten in Vala.
- It offers same functionality as LXPanel, but:
+ It was be a fork of LXPanel in version 0.1.0, but in 0.2.0 it is
+ completely rewritten in Vala. It offers same functionality as LXPanel, but:
1. It has slightly more memory usage.
- 2. X11 dependency is stripped from panel core (but it is not tested on Wayland right now)
- 3. Some of former LXPanel plugins is separate binaries now, and lives in another packages.
+ 2. X11 dependency is stripped from panel core (but it is not tested on
+ another display servers, such as Wayland or Mir, right now).
+ 3. Some of former LXPanel plugins is separate binaries now
+ and lives in another packages (Example is volume applet).
.
This package contains debug information for vala-panel base plugins.
Package: vala-panel-plugins-wnck
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}, libx11-6
Description: Plugins for vala-panel - X11 plugins.
Vala Panel is GTK+ 3 desktop panel. It is based on Vala and LXPanel ideas.
- In fact, it was be a fork of LXPanel in version 0.1.0, but in 0.2.0 it completery rewritten in Vala.
- It offers same functionality as LXPanel, but:
+ It was be a fork of LXPanel in version 0.1.0, but in 0.2.0 it is
+ completely rewritten in Vala. It offers same functionality as LXPanel, but:
1. It has slightly more memory usage.
- 2. X11 dependency is stripped from panel core (but it is not tested on Wayland right now)
- 3. Some of former LXPanel plugins is separate binaries now, and lives in another packages.
+ 2. X11 dependency is stripped from panel core (but it is not tested on
+ another display servers, such as Wayland or Mir, right now).
+ 3. Some of former LXPanel plugins is separate binaries now
+ and lives in another packages (Example is volume applet).
.
- This package contains X11 plugins for vala-panel: tasklist, system tray, and others.
+ This package contains X11 plugins for vala-panel:
+ tasklist, system tray, and others.
Package: vala-panel-plugins-wnck-dbg
Architecture: any
Section: debug
Priority: extra
Depends: ${misc:Depends}, vala-panel-plugins-wnck (= ${binary:Version})
-Description: Vala Panel is GTK+ 3 desktop panel. It is based on Vala and some LXPanel ideas.
+Description: Plugins for vala-panel - X11 plugins - debug info.
Vala Panel is GTK+ 3 desktop panel. It is based on Vala and LXPanel ideas.
- In fact, it was be a fork of LXPanel in version 0.1.0, but in 0.2.0 it completery rewritten in Vala.
- It offers same functionality as LXPanel, but:
+ It was be a fork of LXPanel in version 0.1.0, but in 0.2.0 it is
+ completely rewritten in Vala. It offers same functionality as LXPanel, but:
1. It has slightly more memory usage.
- 2. X11 dependency is stripped from panel core (but it is not tested on Wayland right now)
- 3. Some of former LXPanel plugins is separate binaries now, and lives in another packages.
+ 2. X11 dependency is stripped from panel core (but it is not tested on
+ another display servers, such as Wayland or Mir, right now).
+ 3. Some of former LXPanel plugins is separate binaries now
+ and lives in another packages (Example is volume applet).
.
This package contains debug information for vala-panel X11 plugins.
\ No newline at end of file
diff --git a/debian/libvalapanel0-dev.install b/debian/libvalapanel0-dev.install
index fbf31149..6f3a3017 100644
--- a/debian/libvalapanel0-dev.install
+++ b/debian/libvalapanel0-dev.install
@@ -1,3 +1,4 @@
+usr/lib/*/libvalapanel.so
usr/share/vala/*
usr/include/vala-panel/*
usr/lib/pkgconfig/*
\ No newline at end of file
diff --git a/debian/libvalapanel0.install b/debian/libvalapanel0.install
index a849cab0..ade6cd87 100644
--- a/debian/libvalapanel0.install
+++ b/debian/libvalapanel0.install
@@ -1,4 +1,3 @@
-usr/lib/*/libvalapanel.so
usr/lib/*/libvalapanel.so.*
usr/share/glib-2.0/schemas/org.valapanel.toplevel.gschema.xml
usr/share/glib-2.0/schemas/org.valapanel.toplevel.plugin.gschema.xml
diff --git a/debian/rules b/debian/rules
index 630798d3..178331ac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,6 +25,13 @@ override_dh_auto_clean:
dh_auto_clean --buildsystem=cmake
override_dh_auto_build:
+ xsltproc --nonet \
+ --param make.year.ranges 1 \
+ --param make.single.year.ranges 1 \
+ --param man.charmap.use.subset 0 \
+ -o debian/ \
+http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl\
+ debian/vala-panel.1.xml
dh_auto_build --buildsystem=cmake
# consider using -DUSE_VERSIONED_DIR=ON if backporting
diff --git a/debian/manpage.xml b/debian/vala-panel.1.xml
similarity index 100%
rename from debian/manpage.xml
rename to debian/vala-panel.1.xml
diff --git a/debian/vala-panel.doc-base.EX b/debian/vala-panel.doc-base.EX
deleted file mode 100644
index e2cb74cb..00000000
--- a/debian/vala-panel.doc-base.EX
+++ /dev/null
@@ -1,20 +0,0 @@
-Document: vala-panel
-Title: Debian vala-panel Manual
-Author:
-Abstract: This manual describes what vala-panel is
- and how it can be used to
- manage online manuals on Debian systems.
-Section: unknown
-
-Format: debiandoc-sgml
-Files: /usr/share/doc/vala-panel/vala-panel.sgml.gz
-
-Format: postscript
-Files: /usr/share/doc/vala-panel/vala-panel.ps.gz
-
-Format: text
-Files: /usr/share/doc/vala-panel/vala-panel.text.gz
-
-Format: HTML
-Index: /usr/share/doc/vala-panel/html/index.html
-Files: /usr/share/doc/vala-panel/html/*.html
diff --git a/debian/vala-panel.manpages b/debian/vala-panel.manpages
new file mode 100644
index 00000000..9e4b8959
--- /dev/null
+++ b/debian/vala-panel.manpages
@@ -0,0 +1 @@
+docs/vala-panel.1
\ No newline at end of file