From 9ae6dd15a47d0e90e9d626d556e3bdaf6c68ed71 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Sat, 14 Feb 2015 18:53:36 +0100 Subject: [PATCH] new release pacakges renamed introduced transitional packages debian $foo fixed --- debian/changelog | 6 +++--- debian/control | 43 ++++++++++++++++++++++++++++++---------- debian/copyright | 4 ++-- debian/lintian-overrides | 8 ++++---- debian/rules | 6 ++---- debian/source/options | 2 ++ 6 files changed, 46 insertions(+), 23 deletions(-) create mode 100644 debian/source/options diff --git a/debian/changelog b/debian/changelog index d6ece02..38943a4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -lxqt-admin (0.8.0-1) unstable; urgency=medium +lxqt-admin (0.9.0-1) experimental; urgency=low * Imported Upstream version 0.8.0 * bump to current standards 3.9.6 @@ -12,6 +12,6 @@ lxqt-admin (0.8.0-1) unstable; urgency=medium lxqt-admin (0.7.96-1) unstable; urgency=medium - * Initial release (Closes: #765773) + * Initial release (Closes: #765773) - -- Alf Gaida Wed, 21 May 2014 20:13:13 +0200 + -- Alf Gaida Sat, 14 Feb 2015 18:53:11 +0100 diff --git a/debian/control b/debian/control index 2321db3..63acaec 100644 --- a/debian/control +++ b/debian/control @@ -1,14 +1,17 @@ Source: lxqt-admin Section: x11 Priority: optional -Maintainer: Alf Gaida +Maintainer: Debian LXQt Maintainers +Uploaders: + Alf Gaida Build-Depends: - cmake, + cmake (>= 3.0.2), debhelper (>= 9), liboobs-1-dev, libx11-dev, pkg-config, - liblxqt-qt5-0-dev (>= 0.8.0), + libkf5windowsystem-dev (>= 5.4.0), + liblxqt0-dev (>= 0.9.0), libqt5x11extras5-dev (>= 5.3.2), libqt5xdg-dev (>= 1.0.0), qttools5-dev (>= 5.3.2), @@ -18,12 +21,10 @@ Homepage: https://github.com/lxde/lxqt-admin #Vcs-Git: git://anonscm.debian.org/collab-maint/lxqt-admin.git #Vcs-Browser: http://anonscm.debian.org/?p=collab-maint/lxqt-admin.git;a=summary -Package: lxqt-admin-qt5 +Package: lxqt-admin Architecture: any -Breaks: - lxqt-admin, -Replaces: - lxqt-admin, +Breaks: lxqt-admin-qt5 (<< 0.9.0) +Replaces: lxqt-admin-qt5 (<< 0.9.0) Depends: ${misc:Depends}, ${shlibs:Depends}, @@ -34,16 +35,38 @@ Description: Admin tools for LXQt . This package contain the LXQt Admin Tools. -Package: lxqt-admin-qt5-dbg +Package: lxqt-admin-dbg Architecture: any Section: debug Priority: extra +Breaks: lxqt-admin-qt5-dbg (<< 0.9.0) +Replaces: lxqt-admin-qt5-dbg (<< 0.9.0) Depends: ${misc:Depends}, - lxqt-admin-qt5 (= ${binary:Version}), + lxqt-admin (= ${binary:Version}), +Replace: lxqt-admin-qt5-dbg Description: Admin tools for LXQt (debug) Admin tools for LXQt, as of now: * lxqt-admin-time * lxqt-admin-user . This package provides the debugging symbols. + +# ---- to be removed in 2016 ---- + +Package: lxqt-admin-qt5 +Depends: lxqt-admin, ${misc:Depends} +Priority: extra +Section: oldlibs +Architecture: all +Description: lxqt-admin transitional package + Empty package to facilitate upgrades, can be safely removed. + +Package: lxqt-admin-qt5-dbg +Depends: lxqt-admin-dbg, ${misc:Depends} +Priority: extra +Section: oldlibs +Architecture: all +Description: lxqt-admin transitional package (dbg) + Empty package to facilitate upgrades, can be safely removed. + diff --git a/debian/copyright b/debian/copyright index cad3e7f..6c0ef03 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,12 +3,12 @@ Upstream-Name: lxqt-admin Source: https://github.com/lxde/lxqt-admin Files: * -Copyright: 2014 LXQt team +Copyright: 2014-2015 LXQt team 2014 Hong Jen Yee (PCMan) License: LGPL-2.1+ Files: debian/* -Copyright: 2014 Alf Gaida +Copyright: 2014-2015 Alf Gaida License: LGPL-2.1+ License: LGPL-2.1+ diff --git a/debian/lintian-overrides b/debian/lintian-overrides index e43fa73..4d336db 100644 --- a/debian/lintian-overrides +++ b/debian/lintian-overrides @@ -1,8 +1,8 @@ # there will be no manual for a foreseable time -lxqt-admin-qt5: binary-without-manpage usr/bin/lxqt-admin-time -lxqt-admin-qt5: binary-without-manpage usr/bin/lxqt-admin-user +lxqt-admin: binary-without-manpage usr/bin/lxqt-admin-time +lxqt-admin: binary-without-manpage usr/bin/lxqt-admin-user # the category is right, but not in freedesktop right now -lxqt-admin-qt5: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-admin-time.desktop -lxqt-admin-qt5: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-admin-user.desktop +lxqt-admin: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-admin-time.desktop +lxqt-admin: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-admin-user.desktop diff --git a/debian/rules b/debian/rules index 76af855..2daa22a 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,5 @@ #!/usr/bin/make -f - #export DH_VERBOSE=1 -export USE_QT5=1 %: @@ -9,8 +7,8 @@ export USE_QT5=1 override_dh_auto_install: - dh_auto_install -- DESTDIR=$(CURDIR)/debian/lxqt-admin-qt5 + dh_auto_install -- DESTDIR=$(CURDIR)/debian/lxqt-admin override_dh_strip: - dh_strip --dbg-package=lxqt-admin-qt5-dbg + dh_strip --dbg-package=lxqt-admin-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 +