From 7132ac949a728e14973be25e9624e52a110906b4 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Tue, 19 Jul 2016 17:15:25 +0200 Subject: [PATCH] Cherry-picking upstream version 0.10.96~8-g411f696. Preparing the upcoming release, switch to experimental Added new build dependendies: - gcc (>= 4:6) - g++ (>= 4:6) - libqt5xdgiconloader-dev (>= 1.3.1~) Minimum versions added Bumped Standards to 3.9.8, no changes needed Fixed VCS fields, using https and plain /git/ Removed README.debian, no longer needed Fixed copyrights Format field to https Bumped years in copyrights Fixed copyrights Source field Removed outdated file and license from copyrights Added hardening options Added translation control to rules Set CMAKE_BUILD_TYPE=RelWithDebInfo Exported LC_ALL=C.UTF-8, make builds reproducible Added a basic gbp.conf --- debian/README.Debian | 4 ---- debian/changelog | 24 +++++++++++++++++--- debian/control | 13 +++++++---- debian/copyright | 54 ++++---------------------------------------- debian/gbp.conf | 4 ++++ debian/rules | 12 ++++++++-- 6 files changed, 47 insertions(+), 64 deletions(-) delete mode 100644 debian/README.Debian create mode 100644 debian/gbp.conf diff --git a/debian/README.Debian b/debian/README.Debian deleted file mode 100644 index 9cf92cc..0000000 --- a/debian/README.Debian +++ /dev/null @@ -1,4 +0,0 @@ -lxqt-qtplugin for Debian ------------------------- - -'LGPL_EXCEPTION.txt' move to debian/copyright LGPL-2.1-or-3-with-Digia-1.1-exception section. diff --git a/debian/changelog b/debian/changelog index f225d09..f18cfb6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,26 @@ -lxqt-qtplugin (0.10.96~8-g411f696-1) UNRELEASED; urgency=medium +lxqt-qtplugin (0.10.96~8-g411f696-1) experimental; urgency=medium * Cherry-picking upstream version 0.10.96~8-g411f696. - - -- Alf Gaida Tue, 19 Jul 2016 15:46:17 +0200 + * Preparing the upcoming release, switch to experimental + * Added new build dependendies: + - gcc (>= 4:6) + - g++ (>= 4:6) + - libqt5xdgiconloader-dev (>= 1.3.1~) + * Minimum versions added + * Bumped Standards to 3.9.8, no changes needed + * Fixed VCS fields, using https and plain /git/ + * Removed README.debian, no longer needed + * Fixed copyrights Format field to https + * Bumped years in copyrights + * Fixed copyrights Source field + * Removed outdated file and license from copyrights + * Added hardening options + * Added translation control to rules + * Set CMAKE_BUILD_TYPE=RelWithDebInfo + * Exported LC_ALL=C.UTF-8, make builds reproducible + * Added a basic gbp.conf + + -- Alf Gaida Tue, 19 Jul 2016 17:15:04 +0200 lxqt-qtplugin (0.10.0-3) unstable; urgency=medium diff --git a/debian/control b/debian/control index 86e291f..c6925c5 100644 --- a/debian/control +++ b/debian/control @@ -7,19 +7,22 @@ Section: x11 Priority: optional Build-Depends: debhelper (>= 9), cmake (>= 3.0.2), + gcc (>= 4:6), + g++ (>= 4:6), libdbusmenu-qt5-dev, libkf5windowsystem-dev, - liblxqt0-dev (>= 0.10.0), + liblxqt0-dev (>= 0.10.96~), libqt5x11extras5-dev, - libqt5xdg-dev (>= 1.3.0), + libqt5xdg-dev (>= 1.3.1~), + libqt5xdgiconloader-dev (>= 1.3.1~), libx11-dev, pkg-config, qtbase5-private-dev, qttools5-dev, qttools5-dev-tools, -Standards-Version: 3.9.6 -Vcs-Browser: http://anonscm.debian.org/cgit/pkg-lxqt/lxqt-qtplugin.git/?h=debian/sid -Vcs-Git: git://anonscm.debian.org/pkg-lxqt/lxqt-qtplugin.git -b debian/sid +Standards-Version: 3.9.8 +Vcs-Browser: https://anonscm.debian.org/git/pkg-lxqt/lxqt-qtplugin.git/?h=debian/experimental +Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/lxqt-qtplugin.git -b debian/experimental Homepage: https://github.com/lxde/lxqt-qtplugin Package: lxqt-qtplugin diff --git a/debian/copyright b/debian/copyright index 93ee9bb..3784852 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,20 +1,14 @@ -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-qtplugin -Source: https://github.com/lxde/lxqt-panel +Source: https://github.com/lxde/lxqt-qtplugin Files: * -Copyright: 2013-2015 LXQt team +Copyright: 2013-2016 LXQt team 2010-2012 Razor team License: LGPL-2.1+ -Files: src/qiconloader_p.h -Copyright: 2013 Digia Plc and/or its subsidiary(-ies). - 2010-2012 Razor team - 2013-2015 LXQt team -License: LGPL-2.1-or-3-with-Digia-1.1-exception - Files: debian/* -Copyright: 2014-2015 Alf Gaida +Copyright: 2014-2016 Alf Gaida 2015 ChangZhuo Chen (陳昌倬) 2015 Yukiharu YABUKI License: LGPL-2.1+ @@ -32,43 +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: LGPL-2.1-or-3-with-Digia-1.1-exception - GNU Lesser General Public License: - This file may be used under the terms of the GNU Lesser General Public - License version 2.1 or version 3 as published by the Free Software - Foundation and appearing in the file LICENSE.LGPLv21 and LICENSE.LGPLv3 - included in the packaging of this file. Please review the following - information to ensure the GNU Lesser General Public License requirements - will be met: https://www.gnu.org/licenses/lgpl.html. - . - On Debian systems, the complete text of the GNU Lesser General Public - License 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1`. - The complete text of the GNU Lesser General Public License version 3 can be - found in `/usr/share/common-licenses/LGPL-3`. - . - In addition, as a special exception, Digia gives you certain additional - rights. - . - Digia Qt LGPL Exception version 1.1: - As an additional permission to the GNU Lesser General Public License version - 2.1, the object code form of a "work that uses the Library" may incorporate - material from a header file that is part of the Library. You may distribute - such object code under terms of your choice, provided that: - . - (i) the header files of the Library have not been modified; and - (ii) the incorporated material is limited to numerical parameters, data - structure layouts, accessors, macros, inline functions and - templates; and - (iii) you comply with the terms of Section 6 of the GNU Lesser General - Public License version 2.1. - . - Moreover, you may apply this exception to a modified version of the Library, - provided that such modification does not involve copying material from the - Library into the modified Library's header files unless such material is - limited to (i) numerical parameters; (ii) data structure layouts; - (iii) accessors; and (iv) small macros, templates and inline functions of - five lines or less in length. - . - Furthermore, you are not required to apply this additional permission to a - modified version of the Library. diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..b7a5f8f --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,4 @@ +[DEFAULT] +debian-branch = debian/experimental +upstream-branch = upstream/latest +pristine-tar = True diff --git a/debian/rules b/debian/rules index e8abf41..5858ca7 100755 --- a/debian/rules +++ b/debian/rules @@ -1,8 +1,16 @@ #!/usr/bin/make -f -#export DH_VERBOSE=1 +# export DH_VERBOSE=1 +export LC_ALL=C.UTF-8 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed +export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: - dh ${@} --buildsystem cmake \ + dh ${@} --buildsystem cmake\ --parallel + +override_dh_auto_configure: + dh_auto_configure -- \ + -DPULL_TRANSLATIONS=OFF\ + -DUPDATE_TRANSLATIONS=OFF\ + -DCMAKE_BUILD_TYPE=RelWithDebInfo