From 8def506cd0a53083b5eca717302d91c969776f19 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Sun, 15 Feb 2015 14:01:41 +0100 Subject: [PATCH] new release 0.9.0 drop patches fix debian $foo add source/options --- debian/changelog | 21 +-------- debian/control | 44 ++++++++++++++----- debian/copyright | 4 +- debian/lintian-overrides | 6 +-- .../lxqt-config-powermanagement.desktop.patch | 14 ------ debian/patches/series | 1 - debian/rules | 6 +-- debian/source/options | 2 + 8 files changed, 44 insertions(+), 54 deletions(-) delete mode 100644 debian/patches/lxqt-config-powermanagement.desktop.patch delete mode 100644 debian/patches/series create mode 100644 debian/source/options diff --git a/debian/changelog b/debian/changelog index 294c293..0c3c703 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,22 +1,5 @@ -lxqt-powermanagement (0.8.0-1) unstable; urgency=medium - - * Upstream version 0.8.0 - * Min liblxqt-qt5-0-dev version 0.8.0 - * Min Qt version 5.3.2 - * bump standards to 3.9.6 - * lintian overrides for missed manpages and invalid category - * patched desktop file, OnlyShowIn=LXQt - - -- Alf Gaida Sun, 19 Oct 2014 02:35:41 +0200 - -lxqt-powermanagement (0.7.96-2) unstable; urgency=low - - * Rebuild only; no source changes. - - -- Alf Gaida Mon, 22 Sep 2014 22:18:51 +0200 - -lxqt-powermanagement (0.7.96-1) unstable; urgency=low +lxqt-powermanagement (0.9.0-1) experimental; urgency=low * Initial release (Closes: #747611) - -- Alf Gaida Wed, 10 Sep 2014 19:46:25 +0200 + -- Alf Gaida Sun, 15 Feb 2015 14:00:15 +0100 diff --git a/debian/control b/debian/control index 1656674..94dda5d 100644 --- a/debian/control +++ b/debian/control @@ -1,19 +1,23 @@ Source: lxqt-powermanagement Section: x11 Priority: optional -Maintainer: Alf Gaida +Maintainer: Debian LXQt Maintainers +Uploaders: + Alf Gaida Build-Depends: - cmake, + cmake (>= 3.0.2), debhelper (>= 9), libx11-dev, libx11-xcb-dev, libxcb-dpms0-dev, - libxcb-screensaver0-dev, + libxcb-screensaver0-dev, pkg-config, - liblxqt-qt5-0-dev (>= 0.8.0), + libkf5windowsystem-dev (>= 5.5.0), + liblxqt0-dev (>= 0.9.0), libqt5svg5-dev (>= 5.3.2), libqt5x11extras5-dev (>= 5.3.2), libqt5xdg-dev (>= 1.0.0), + qtbase5-private-dev (>= 5.3.2), qttools5-dev (>= 5.3.2), qttools5-dev-tools (>= 5.3.2), Standards-Version: 3.9.6 @@ -21,12 +25,10 @@ Homepage: https://github.com/lxde/lxqt-powermanagement #Vcs-Git: git://anonscm.debian.org/collab-maint/lxqt-powermanagement.git #Vcs-Browser: http://anonscm.debian.org/?p=collab-maint/lxqt-powermanagement.git;a=summary -Package: lxqt-powermanagement-qt5 +Package: lxqt-powermanagement Architecture: any -Breaks: - lxqt-powermanagement, -Replaces: - lxqt-powermanagement, +Breaks: lxqt-powermanagement-qt5 (<< 0.9.0) +Replaces: lxqt-powermanagement-qt5 (<< 0.9.0) Depends: ${misc:Depends}, ${shlibs:Depends}, @@ -35,14 +37,34 @@ Description: Power management module for LXQt . This package contain power management module for LXQt. -Package: lxqt-powermanagement-qt5-dbg +Package: lxqt-powermanagement-dbg Architecture: any Section: debug Priority: extra +Breaks: lxqt-powermanagement-qt5-dbg (<< 0.9.0) +Replaces: lxqt-powermanagement-qt5-dbg (<< 0.9.0) Depends: ${misc:Depends}, - lxqt-powermanagement-qt5 (= ${binary:Version}), + lxqt-powermanagement (= ${binary:Version}), Description: Power management module for LXQt (debug symbols) The Power management module for LXQt . This package contain debugging symbols. + +# ---- to be removed in 2016 ---- + +Package: lxqt-powermanagement-qt5 +Depends: lxqt-powermanagement, ${misc:Depends} +Priority: extra +Section: oldlibs +Architecture: all +Description: lxqt-powermanagement transitional package + Empty package to facilitate upgrades, can be safely removed. + +Package: lxqt-powermanagement-qt5-dbg +Depends: lxqt-powermanagement-dbg, ${misc:Depends} +Priority: extra +Section: oldlibs +Architecture: all +Description: lxqt-powermanagement transitional package (dbg) + Empty package to facilitate upgrades, can be safely removed. diff --git a/debian/copyright b/debian/copyright index fc3bc4a..e64cdb1 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,11 +3,11 @@ Upstream-Name: lxqt-powermanagement Source: https://github.com/lxde/lxqt-openssh-askpass Files: * -Copyright: 2013-2014 LXQt team +Copyright: 2013-2015 LXQt team License: GPL-2.0+ Files: debian/* -Copyright: 2014 Alf Gaida +Copyright: 2014-2015 Alf Gaida License: LGPL-2.1+ License: GPL-2.0+ diff --git a/debian/lintian-overrides b/debian/lintian-overrides index df00576..86a50eb 100644 --- a/debian/lintian-overrides +++ b/debian/lintian-overrides @@ -1,7 +1,7 @@ # there will be no manpages in a foreseable future -lxqt-powermanagement-qt5: binary-without-manpage usr/bin/lxqt-config-powermanagement -lxqt-powermanagement-qt5: binary-without-manpage usr/bin/lxqt-powermanagement +lxqt-powermanagement: binary-without-manpage usr/bin/lxqt-config-powermanagement +lxqt-powermanagement: binary-without-manpage usr/bin/lxqt-powermanagement # category LXQt in not yet in freedesktop specs - no bug -lxqt-powermanagement-qt5: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-config-powermanagement.desktop +lxqt-powermanagement: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-config-powermanagement.desktop diff --git a/debian/patches/lxqt-config-powermanagement.desktop.patch b/debian/patches/lxqt-config-powermanagement.desktop.patch deleted file mode 100644 index 5b9e7bd..0000000 --- a/debian/patches/lxqt-config-powermanagement.desktop.patch +++ /dev/null @@ -1,14 +0,0 @@ -Description: Fix OnlyShowIn=LXQt; -Author: Alf Gaida -Last-Update: 2014-10-19 - ---- lxqt-powermanagement-0.8.0.orig/config/lxqt-config-powermanagement.desktop.in -+++ lxqt-powermanagement-0.8.0/config/lxqt-config-powermanagement.desktop.in -@@ -5,6 +5,6 @@ GenericName=Power Management Settings - Exec=lxqt-config-powermanagement - Icon=preferences-system-power-management - Categories=Settings;DesktopSettings;Qt;LXQt; --OnlyShowIn=LXQt;LXDE; -+OnlyShowIn=LXQt; - - #TRANSLATIONS_DIR=translations diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 9b55c2b..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -lxqt-config-powermanagement.desktop.patch diff --git a/debian/rules b/debian/rules index a892ec5..add55cf 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,5 @@ #!/usr/bin/make -f - #export DH_VERBOSE=1 -export USE_QT5=1 %: @@ -9,7 +7,7 @@ export USE_QT5=1 override_dh_auto_install: - dh_auto_install -- DESTDIR=$(CURDIR)/debian/lxqt-powermanagement-qt5 + dh_auto_install -- DESTDIR=$(CURDIR)/debian/lxqt-powermanagement override_dh_strip: - dh_strip --dbg-package=lxqt-powermanagement-qt5-dbg + dh_strip --dbg-package=lxqt-powermanagement-dbg diff --git a/debian/source/options b/debian/source/options new file mode 100644 index 0000000..be5dabe --- /dev/null +++ b/debian/source/options @@ -0,0 +1,2 @@ +tar-ignore=.gitignore +