From 51998610bd9d7c83fd1c4844de27384d2cfd3f87 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Sat, 29 Aug 2015 01:53:27 +0200 Subject: [PATCH] some fixes in debian $foo * some minimum versions added * drop breaks/replaces * append -Wl,--as-needed to linker flags * copyright fixed, the panel uses only LGPL2.1+, file headers fixed upstream --- debian/changelog | 7 ++++++- debian/control | 24 ++++++++++-------------- debian/copyright | 15 +-------------- debian/rules | 2 ++ 4 files changed, 19 insertions(+), 29 deletions(-) diff --git a/debian/changelog b/debian/changelog index b31deba..61349ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,11 @@ lxqt-panel (0.9.0+20150815-1) unstable; urgency=medium * Some cleanup in debian $foo * some changes in debian $foo * drop transitional packages + * some minimum versions added + * drop breaks/replaces + * append -Wl,--as-needed to linker flags + * copyright fixed, the panel uses only LGPL2.1+, file headers + fixed upstream [ Shih-Yuan Lee (FourDollars) ] * Polish debian/control by 'cme fix dpkg-control'. @@ -19,7 +24,7 @@ lxqt-panel (0.9.0+20150815-1) unstable; urgency=medium [ Shih-Yuan Lee (FourDollars) ] * Imported Upstream version 0.9.0+20150815 - -- Shih-Yuan Lee (FourDollars) Fri, 21 Aug 2015 23:01:29 +0200 + -- Alf Gaida Sat, 29 Aug 2015 01:52:37 +0200 lxqt-panel (0.9.0-1) experimental; urgency=low diff --git a/debian/control b/debian/control index 807c84a..6ba7545 100644 --- a/debian/control +++ b/debian/control @@ -11,15 +11,15 @@ Build-Depends: cmake (>= 3.0.2), libdbusmenu-qt5-dev, libglib2.0-dev, libicu-dev, - liblxqt0-dev, - liblxqt-globalkeys0-dev (>= 0.9.0), - liblxqt-globalkeys-ui0-dev (>= 0.9.0), - libkf5windowsystem-dev, - libkf5solid-dev, - libmenu-cache-dev, + liblxqt0-dev (>= 0.9), + liblxqt-globalkeys0-dev (>= 0.9), + liblxqt-globalkeys-ui0-dev (>= 0.9), + libkf5windowsystem-dev (>= 5.3), + libkf5solid-dev (>= 5.3), + libmenu-cache-dev (>= 0.5), libpulse-dev, - libqt5x11extras5-dev, - libqt5xdg-dev, + libqt5x11extras5-dev (>= 5.3), + libqt5xdg-dev (>= 1.2), libsensors4-dev, libstatgrab-dev, libsysstat-qt5-0-dev (>= 0.3.0), @@ -33,8 +33,8 @@ Build-Depends: cmake (>= 3.0.2), libxkbcommon-x11-dev, libxrender-dev, pkg-config, - qttools5-dev, - qttools5-dev-tools + qttools5-dev (>= 5.3), + qttools5-dev-tools (>=5.3) Standards-Version: 3.9.6 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-lxqt/lxqt-panel.git Vcs-Git: git://anonscm.debian.org/pkg-lxqt/lxqt-panel.git @@ -44,8 +44,6 @@ Package: lxqt-panel Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} -Breaks: lxqt-panel-qt5 (<< 0.9.0) -Replaces: lxqt-panel-qt5 (<< 0.9.0) Description: LXQt desktop panel The LXQt desktop panel . @@ -57,8 +55,6 @@ Section: debug Priority: extra Depends: ${misc:Depends}, lxqt-panel (= ${binary:Version}) -Breaks: lxqt-panel-qt5-dbg (<< 0.9.0) -Replaces: lxqt-panel-qt5-dbg (<< 0.9.0) Description: LXQt desktop panel (debug) The LXQt desktop panel . diff --git a/debian/copyright b/debian/copyright index 6372bdf..f529e5a 100644 --- a/debian/copyright +++ b/debian/copyright @@ -5,7 +5,7 @@ Source: https://github.com/lxde/lxqt-panel Files: * Copyright: 2012-2015 LXQt team 2010-2012 Razor team -License: GPL-2.0+ and LGPL-2.1+ +License: LGPL-2.1+ Files: debian/* Copyright: 2014-2015 Alf Gaida @@ -26,16 +26,3 @@ License: LGPL-2.1+ On Debian systems, the complete text of the GNU Lesser General Public License version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1". -License: GPL-2.0+ - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - . - This program 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 General Public License for more details. - . - On Debian systems, the complete text of the GNU General Public License - version 2 can be found in "/usr/share/common-licenses/GPL-2". diff --git a/debian/rules b/debian/rules index 4181c39..829d407 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,8 @@ #!/usr/bin/make -f #export DH_VERBOSE=1 +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed + %: dh ${@} --buildsystem cmake --parallel