From c4fdc65c5fc4bd530aa27c3fe2df9fa150504d29 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Sun, 15 Feb 2015 02:41:26 +0100 Subject: [PATCH] new release 0.9.0 drop not needed patches cleanup debian $foo add source/options --- debian/changelog | 17 +-------- debian/control | 42 ++++++++++++++++----- debian/copyright | 4 +- debian/lintian-overrides | 26 ++++++------- debian/menu | 2 +- debian/patches/lxqt-desktop-files.patch | 49 ------------------------- debian/patches/series | 1 - debian/rules | 8 ++-- debian/source/options | 2 + debian/symbols | 3 +- 10 files changed, 57 insertions(+), 97 deletions(-) delete mode 100644 debian/patches/lxqt-desktop-files.patch delete mode 100644 debian/patches/series create mode 100644 debian/source/options diff --git a/debian/changelog b/debian/changelog index fdb8ba8..3d003d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,18 +1,5 @@ -lxqt-config (0.8.0-1) unstable; urgency=medium - - * Imported Upstream version 0.8.0 - * bump standards to 3.9.6 - * drop build dependency libegl1-mesa-dev, bug in Qt 5.3.0 is fixed - * Min Qt version 5.3.2 - * Min liblxqt-qt5-0-dev version 0.8.0 - * mangled symbols added - * lintian-overrides added - * patch some desktop files - - -- Alf Gaida Sat, 18 Oct 2014 12:04:49 +0200 - -lxqt-config (0.7.96-1) unstable; urgency=low +lxqt-config (0.9.0-1) experimental; urgency=low * Initial release (Closes: #747597) - -- Alf Gaida Mon, 24 Feb 2014 23:41:30 +0100 + -- Alf Gaida Sun, 15 Feb 2015 00:28:07 +0100 diff --git a/debian/control b/debian/control index cfcbebf..1a33e52 100644 --- a/debian/control +++ b/debian/control @@ -1,16 +1,19 @@ Source: lxqt-config 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, libxcursor-dev, libxfixes-dev, pkg-config, zlib1g-dev, - 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), @@ -20,12 +23,10 @@ Homepage: https://github.com/lxde/lxqt-config #Vcs-Git: git://anonscm.debian.org/collab-maint/lxqt-config.git #Vcs-Browser: http://anonscm.debian.org/?p=collab-maint/lxqt-config.git;a=summary -Package: lxqt-config-qt5 +Package: lxqt-config Architecture: any -Breaks: - lxqt-config, -Replaces: - lxqt-config, +Breaks: lxqt-config-qt5 (<< 0.9.0) +Replaces: lxqt-config-qt5 (<< 0.9.0) Depends: ${misc:Depends}, ${shlibs:Depends}, @@ -34,14 +35,35 @@ Description: LXQt system settings center . This package contain the LXQt configuration ui. -Package: lxqt-config-qt5-dbg +Package: lxqt-config-dbg Architecture: any +Breaks: lxqt-config-qt5-dbg (<< 0.9.0) +Replaces: lxqt-config-qt5-dbg (<< 0.9.0) Section: debug Priority: extra Depends: ${misc:Depends}, - lxqt-config-qt5 (= ${binary:Version}), + lxqt-config (= ${binary:Version}), Description: LXQt system settings center (debug) The LXQt system settings center . This package contain the debugging symbols for LXQt config ui. + +# ---- to be removed in 2016 ---- + +Package: lxqt-config-qt5 +Depends: lxqt-config, ${misc:Depends} +Priority: extra +Section: oldlibs +Architecture: all +Description: lxqt-config transitional package + Empty package to facilitate upgrades, can be safely removed. + +Package: lxqt-config-qt5-dbg +Depends: lxqt-config-dbg, ${misc:Depends} +Priority: extra +Section: oldlibs +Architecture: all +Description: lxqt-config transitional package (dbg) + Empty package to facilitate upgrades, can be safely removed. + diff --git a/debian/copyright b/debian/copyright index 2059e8a..98d0be3 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,12 +3,12 @@ Upstream-Name: lxqt-config Source: https://github.com/lxde/lxqt-config Files: * -Copyright: 2012-2014 LXQt team +Copyright: 2012-2015 LXQt team 2010-2012 Razor team License: GPL-2.0+ and LGPL-2.1+ 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 253f112..992953f 100644 --- a/debian/lintian-overrides +++ b/debian/lintian-overrides @@ -1,20 +1,20 @@ # there will be no manpages in a foreseable future -lxqt-config-qt5: binary-without-manpage usr/bin/lxqt-config-appearance -lxqt-config-qt5: binary-without-manpage usr/bin/lxqt-config-file-associations -lxqt-config-qt5: binary-without-manpage usr/bin/lxqt-config-input -lxqt-config-qt5: binary-without-manpage usr/bin/lxqt-config-monitor -lxqt-config-qt5: binary-without-manpage usr/bin/lxqt-config +lxqt-config: binary-without-manpage usr/bin/lxqt-config-appearance +lxqt-config: binary-without-manpage usr/bin/lxqt-config-file-associations +lxqt-config: binary-without-manpage usr/bin/lxqt-config-input +lxqt-config: binary-without-manpage usr/bin/lxqt-config-monitor +lxqt-config: binary-without-manpage usr/bin/lxqt-config # not a bug, LXQt has not reached freedesktop yet -lxqt-config-qt5: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-config-appearance.desktop -lxqt-config-qt5: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-config-file-associations.desktop -lxqt-config-qt5: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-config-input.desktop -lxqt-config-qt5: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-config-monitor.desktop -lxqt-config-qt5: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-config.desktop +lxqt-config: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-config-appearance.desktop +lxqt-config: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-config-file-associations.desktop +lxqt-config: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-config-input.desktop +lxqt-config: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-config-monitor.desktop +lxqt-config: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-config.desktop # there should be no shared lib liblxqt-config-cursor, if the lib is needed the lib should be private -lxqt-config-qt5: package-name-doesnt-match-sonames liblxqt-config-cursor -lxqt-config-qt5: shlib-without-versioned-soname usr/lib/liblxqt-config-cursor.so liblxqt-config-cursor.so -lxqt-config-qt5: pkg-has-shlibs-control-file-but-no-actual-shared-libs +lxqt-config: package-name-doesnt-match-sonames liblxqt-config-cursor +lxqt-config: shlib-without-versioned-soname usr/lib/liblxqt-config-cursor.so liblxqt-config-cursor.so +lxqt-config: pkg-has-shlibs-control-file-but-no-actual-shared-libs diff --git a/debian/menu b/debian/menu index 15569a5..f69c5a1 100644 --- a/debian/menu +++ b/debian/menu @@ -1,4 +1,4 @@ -?package(lxqt-config-qt5):needs="X11" \ +?package(lxqt-config):needs="X11" \ section="Applications/System/Administration"\ title="LXQt settings center" \ command="/usr/bin/lxqt-config" diff --git a/debian/patches/lxqt-desktop-files.patch b/debian/patches/lxqt-desktop-files.patch deleted file mode 100644 index e2a9a1e..0000000 --- a/debian/patches/lxqt-desktop-files.patch +++ /dev/null @@ -1,49 +0,0 @@ -Description:Fix some misbehaviour in upstream desktop files -Author: Alf Gaida - ---- -Bug: -Forwarded: -Last-Update: 2014-10-18 - ---- a/lxqt-config-appearance/lxqt-config-appearance.desktop.in -+++ b/lxqt-config-appearance/lxqt-config-appearance.desktop.in -@@ -6,6 +6,6 @@ - Exec=lxqt-config-appearance - Icon=preferences-desktop-theme - Categories=Settings;DesktopSettings;Qt;LXQt; --OnlyShowIn=LXDE;LXQt; -+OnlyShowIn=LXQt; - - #TRANSLATIONS_DIR=translations ---- a/lxqt-config-input/lxqt-config-input.desktop.in -+++ b/lxqt-config-input/lxqt-config-input.desktop.in -@@ -6,6 +6,6 @@ - Exec=lxqt-config-input - Icon=input-keyboard - Categories=Qt;Settings;HardwareSettings;DesktopSettings;LXQt; --OnlyShowIn=LXDE;LXQt; -+OnlyShowIn=LXQt; - - #TRANSLATIONS_DIR=translations ---- a/src/lxqt-config.desktop.in -+++ b/src/lxqt-config.desktop.in -@@ -6,6 +6,6 @@ - Exec=lxqt-config - Icon=preferences-system - Categories=Settings;DesktopSettings;Qt;LXQt; --OnlyShowIn=LXDE;LXQt; -+OnlyShowIn=LXQt; - - #TRANSLATIONS_DIR=translations ---- a/lxqt-config-monitor/lxqt-config-monitor.desktop.in -+++ b/lxqt-config-monitor/lxqt-config-monitor.desktop.in -@@ -5,7 +5,7 @@ - Comment=Configure monitors - Exec=lxqt-config-monitor - Icon=preferences-desktop-display --Categories=Settings;DesktopSettings;Qt;LXQt;;HardwareSettings; -+Categories=Settings;DesktopSettings;Qt;LXQt;HardwareSettings; - OnlyShowIn=LXQt; - - #TRANSLATIONS_DIR=translations diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 691b65c..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -lxqt-desktop-files.patch diff --git a/debian/rules b/debian/rules index 185595b..cec4ab1 100755 --- a/debian/rules +++ b/debian/rules @@ -1,16 +1,14 @@ #!/usr/bin/make -f - #export DH_VERBOSE=1 -export USE_QT5=1 %: - dh ${@} --buildsystem cmake --parallel + dh ${@} --buildsystem cmake --parallel override_dh_auto_install: - dh_auto_install -- DESTDIR=$(CURDIR)/debian/lxqt-config-qt5 + dh_auto_install -- DESTDIR=$(CURDIR)/debian/lxqt-config override_dh_strip: - dh_strip --dbg-package=lxqt-config-qt5-dbg + dh_strip --dbg-package=lxqt-config-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 + diff --git a/debian/symbols b/debian/symbols index 46dfab7..c33c290 100644 --- a/debian/symbols +++ b/debian/symbols @@ -1,4 +1,4 @@ -liblxqt-config-cursor.so lxqt-config-qt5 #MINVER# +liblxqt-config-cursor.so lxqt-config #MINVER# (c++)"applyTheme(XCursorThemeData const&)@Base" 0.8.0 (c++)"haveXfixes()@Base" 0.8.0 (c++)"loadCfgFile(QString const&, bool)@Base" 0.8.0 @@ -109,6 +109,7 @@ liblxqt-config-cursor.so lxqt-config-qt5 #MINVER# (c++)"QHash::duplicateNode(QHashData::Node*, void*)@Base" 0.8.0 (c++)"QHash::~QHash()@Base" 0.8.0 (c++)"QList::~QList()@Base" 0.8.0 + (c++)"QList::setSharable(bool)@Base" 0.9.0 (c++)"QList::detach_helper(int)@Base" 0.8.0 (c++)"QList::detach_helper_grow(int, int)@Base" 0.8.0 (c++)"QList::append(QString const&)@Base" 0.8.0