From a5a85a83774d93430bd764c5eb2407861df84a6d Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Fri, 15 Jul 2016 20:03:23 +0200 Subject: [PATCH] Preparing the upcoming release, switch to experimental Fixed .gititgnore, added build-stamp Added build-depenedency libqt5xdgiconloader-dev Bumped Standards to 3.9.8, no changes needed Fixed VCS fields, use https and plain /git/ Added Recommends lxqt-config-l10n Fixed copyright Format Added missed new files to copyright Bumped years in copyright Fixed lintian-overrides Added DEB_BUILD_MAINT_OPTIONS = hardening=+all Added translation control Added DCMAKE_BUILD_TYPE=RelWithDebInfo --- debian/.gitignore | 1 + debian/changelog | 18 ++++++++++++++++++ debian/control | 8 +++++--- debian/copyright | 17 ++++++++++++++--- debian/gbp.conf | 2 +- debian/lintian-overrides | 3 ++- debian/lxqt-config.manpages | 1 - debian/manpages | 3 +++ debian/rules | 7 +++++++ 9 files changed, 51 insertions(+), 9 deletions(-) delete mode 100644 debian/lxqt-config.manpages create mode 100644 debian/manpages diff --git a/debian/.gitignore b/debian/.gitignore index 5837773..e1181e5 100644 --- a/debian/.gitignore +++ b/debian/.gitignore @@ -3,6 +3,7 @@ /*.debhelper /*.log /*.substvars +/debhelper-build-stamp /files /lxqt-config/ diff --git a/debian/changelog b/debian/changelog index ef1b93f..2328c0f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,21 @@ +lxqt-config (0.10.0-4) UNRELEASED; urgency=medium + + * Preparing the upcoming release, switch to experimental + * Fixed .gititgnore, added build-stamp + * Added build-depenedency libqt5xdgiconloader-dev + * Bumped Standards to 3.9.8, no changes needed + * Fixed VCS fields, use https and plain /git/ + * Added Recommends lxqt-config-l10n + * Fixed copyright Format + * Added missed new files to copyright + * Bumped years in copyright + * Fixed lintian-overrides + * Added DEB_BUILD_MAINT_OPTIONS = hardening=+all + * Added translation control + * Added DCMAKE_BUILD_TYPE=RelWithDebInfo + + -- Alf Gaida Fri, 15 Jul 2016 19:00:33 +0200 + lxqt-config (0.10.0-3) unstable; urgency=medium * Remove dbg package in favor of dbgsym. diff --git a/debian/control b/debian/control index 4f55c88..3406569 100644 --- a/debian/control +++ b/debian/control @@ -14,6 +14,7 @@ Build-Depends: debhelper (>= 9), libqt5svg5-dev, libqt5x11extras5-dev, libqt5xdg-dev, + libqt5xdgiconloader-dev, libx11-dev, libxcursor-dev, libxfixes-dev, @@ -22,15 +23,16 @@ Build-Depends: debhelper (>= 9), qttools5-dev, qttools5-dev-tools, zlib1g-dev -Standards-Version: 3.9.6 -Vcs-Browser: http://anonscm.debian.org/cgit/pkg-lxqt/lxqt-config.git/?h=debian/sid -Vcs-Git: git://anonscm.debian.org/pkg-lxqt/lxqt-config.git -b debian/sid +Standards-Version: 3.9.8 +Vcs-Browser: https://anonscm.debian.org/git/pkg-lxqt/lxqt-config.git/?h=debian/experimental +Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/lxqt-config.git -b debian/experimental Homepage: https://github.com/lxde/lxqt-config Package: lxqt-config Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} +Recommends: lxqt-config-l10n Description: LXQt system settings center The LXQt system settings center . diff --git a/debian/copyright b/debian/copyright index 272560c..21b21b7 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,9 +1,9 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: lxqt-config Source: https://github.com/lxde/lxqt-config Files: * -Copyright: 2012-2015 LXQt team +Copyright: 2012-2016 LXQt team 2010-2012 Razor team 2013 Christian Surlykke 2014 Hong Jen Yee (PCMan) @@ -72,8 +72,19 @@ Copyright: 2014 P.L. Lucas 2014 Hong Jen Yee (PCMan) License: GPL-2.0+ +Files: lxqt-config-brightness/brightnesssettings.* + lxqt-config-brightness/main.cpp + lxqt-config-brightness/monitorinfo.* +Copyright: 2016 P.L. Lucas +License: LGPL-2.1+ + +Files: lxqt-config-brightness/xrandrbrightness.* +Copyright: 2015 Kai Uwe Broulik + 2010 Lukas Tinkl +License: LGPL-2.0+ + Files: debian/* -Copyright: 2014-2015 Alf Gaida +Copyright: 2014-2016 Alf Gaida 2015 Andrew Lee (李健秋) License: LGPL-2.1+ diff --git a/debian/gbp.conf b/debian/gbp.conf index 7a9f00a..ffe50a8 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,5 +1,5 @@ [DEFAULT] -debian-branch = debian/sid +debian-branch = debian/experimental upstream-branch = upstream/latest pristine-tar = True diff --git a/debian/lintian-overrides b/debian/lintian-overrides index 0125433..4622eb4 100644 --- a/debian/lintian-overrides +++ b/debian/lintian-overrides @@ -1,5 +1,5 @@ # there will be no man-pages in a foreseeable future -lxqt-config: binary-without-manpage usr/bin/lxqt-config-appearance +lxqt-config: binary-without-manpage usr/bin/lxqt-config-brightness 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-locale @@ -7,6 +7,7 @@ lxqt-config: binary-without-manpage usr/bin/lxqt-config-monitor # not a bug, LXQt has not reached free-desktop yet 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-brightness.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-locale.desktop diff --git a/debian/lxqt-config.manpages b/debian/lxqt-config.manpages deleted file mode 100644 index c9a4be0..0000000 --- a/debian/lxqt-config.manpages +++ /dev/null @@ -1 +0,0 @@ -man/lxqt-config.1 diff --git a/debian/manpages b/debian/manpages new file mode 100644 index 0000000..704952e --- /dev/null +++ b/debian/manpages @@ -0,0 +1,3 @@ +lxqt-config-appearance/man/lxqt-config-appearance.1 +man/lxqt-config.1 +liblxqt-config-cursor/man/lxqt-config-mouse.1 diff --git a/debian/rules b/debian/rules index 6cc048c..8c1af10 100755 --- a/debian/rules +++ b/debian/rules @@ -1,11 +1,18 @@ #!/usr/bin/make -f #export DH_VERBOSE=1 +export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed %: dh ${@} --buildsystem cmake \ --parallel +override_dh_auto_configure: + dh_auto_configure -- \ + -DPULL_TRANSLATIONS=OFF \ + -DUPDATE_TRANSLATIONS=OFF \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo + override_dh_makeshlibs: dh_makeshlibs -Xlxqt-config