diff --git a/debian/changelog b/debian/changelog index 6b5237e..5b5baf8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +qps (1.10.16+20151210-2) unstable; urgency=medium + + * Bump Standards to 3.9.7 + * Secured VCS-Fields + * Fix years in copyright + * Add hardening=+all + * Fix new grep behaviour in LXQtTranslateDesktop.cmake + + -- Alf Gaida Thu, 25 Feb 2016 23:37:08 +0100 + qps (1.10.16+20151210-1) unstable; urgency=medium * Cherry-picking upstream version 1.10.16+20151210. diff --git a/debian/control b/debian/control index cfca35b..8ac9dc2 100644 --- a/debian/control +++ b/debian/control @@ -11,9 +11,9 @@ Build-Depends: cmake (>= 3.0.2), libqt5x11extras5-dev, qttools5-dev, qttools5-dev-tools -Standards-Version: 3.9.6 -Vcs-Browser: http://anonscm.debian.org/cgit/pkg-lxqt/qps.git/?h=debian/sid -Vcs-Git: git://anonscm.debian.org/pkg-lxqt/qps.git -b debian/sid +Standards-Version: 3.9.7 +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/qps.git/?h=debian/sid +Vcs-Git: https://anonscm.debian.org/cgit/pkg-lxqt/qps.git -b debian/sid Homepage: https://github.com/qtdesktop/qps Package: qps diff --git a/debian/copyright b/debian/copyright index 972cc38..83ae11e 100644 --- a/debian/copyright +++ b/debian/copyright @@ -35,8 +35,8 @@ Copyright: 2003 Justin Karneges License: LGPL-2.1+ Files: debian/* -Copyright: 2015 Alf Gaida - 2015 ChangZhuo Chen (陳昌倬) +Copyright: 2015-2016 Alf Gaida + 2015-2016 ChangZhuo Chen (陳昌倬) License: GPL-2.0+ License: GPL-2.0 diff --git a/debian/patches/fix-grep-behaviour.patch b/debian/patches/fix-grep-behaviour.patch new file mode 100644 index 0000000..0b0fb76 --- /dev/null +++ b/debian/patches/fix-grep-behaviour.patch @@ -0,0 +1,23 @@ +Description: fix the new grep behaviour + No need to care about upstream, i fixed it in upstream some days ago +Author: Alf Gaida + +--- qps-1.10.16+20151210.orig/cmake/LXQtTranslateDesktop.cmake ++++ qps-1.10.16+20151210/cmake/LXQtTranslateDesktop.cmake +@@ -71,13 +71,13 @@ function(lxqt_translate_desktop _RESULT) + if (_translations) + list(SORT _translations) + add_custom_command(OUTPUT ${_outFile} +- COMMAND grep -v "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile} +- COMMAND grep -h ${_pattern} ${_translations} >> ${_outFile} ++ COMMAND grep -a -v "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile} ++ COMMAND grep -a -h ${_pattern} ${_translations} >> ${_outFile} + COMMENT "Generating ${_fileName}${_fileExt}" + ) + else() + add_custom_command(OUTPUT ${_outFile} +- COMMAND grep -v "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile} ++ COMMAND grep -a -v "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile} + COMMENT "Generating ${_fileName}${_fileExt}" + ) + endif() diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..daed377 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +fix-grep-behaviour.patch diff --git a/debian/rules b/debian/rules index 98091cc..a49e602 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,7 @@ #!/usr/bin/make -f #export DH_VERBOSE=1 +export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed %: