diff --git a/debian/changelog b/debian/changelog index 7e78132..dd1e60a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +pcmanfm-qt (0.10.1-2) unstable; urgency=medium + + * Bump Standards to 3.9.7 + * Fix years in copyright + * Add hardending=+all + * simplify rules + * make pcmanfm-qt reproducible again, thanks to Eduard Sanou for the + bugreport and the patch, but it was fixed before (Closes: #815818) + + -- Alf Gaida Fri, 26 Feb 2016 00:16:22 +0100 + pcmanfm-qt (0.10.1-1) unstable; urgency=medium * New upstream release. diff --git a/debian/control b/debian/control index ab54087..37068c6 100644 --- a/debian/control +++ b/debian/control @@ -19,7 +19,7 @@ Build-Depends: debhelper (>= 9.20151219), pkg-config, qttools5-dev, qttools5-dev-tools -Standards-Version: 3.9.6 +Standards-Version: 3.9.7 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/pcmanfm-qt/?h=debian/sid Vcs-Git: https://anonscm.debian.org/cgit/pkg-lxqt/pcmanfm-qt.git -b debian/sid Homepage: https://github.com/lxde/pcmanfm-qt diff --git a/debian/copyright b/debian/copyright index 3e0cb9d..80e19dc 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,16 +3,16 @@ Upstream-Name: pcmanfm-qt Source: https://github.com/lxde/pcmanfm-qt Files: * -Copyright: 2013-2015 LXQt team - 2013-2015 Hong Jen Yee (PCMan) +Copyright: 2013-2016 LXQt team + 2013-2016 Hong Jen Yee (PCMan) 2012-2013 Andriy Grytsenko (LStranger) 2014 Kuzma Shapran License: GPL-2.0+ Files: debian/* Copyright: 2014-2015 Wen Liao - 2014-2015 ChangZhuo Chen (陳昌倬) - 2013-2015 Alf Gaida + 2014-2016 ChangZhuo Chen (陳昌倬) + 2013-2016 Alf Gaida 2015 Andrew Lee (李健秋) License: GPL-2.0+ diff --git a/debian/patches/fix-new-grep-behaviour.patch b/debian/patches/fix-new-grep-behaviour.patch new file mode 100644 index 0000000..9d97b24 --- /dev/null +++ b/debian/patches/fix-new-grep-behaviour.patch @@ -0,0 +1,25 @@ +Description: to be descided upstream + no need to put this upstream, but we are not + sure how to implement the new translation + routines - time will tell, this fixes the new + behaviour until we maybe rework translation upstream. + +--- a/cmake/LXQtTranslateDesktop.cmake ++++ b/cmake/LXQtTranslateDesktop.cmake +@@ -71,13 +71,13 @@ + set(_pattern "'\\[.*]\\s*='") + if (_translations) + add_custom_command(OUTPUT ${_outFile} +- COMMAND grep -v "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile} +- COMMAND grep -h ${_pattern} ${_translations} >> ${_outFile} ++ COMMAND grep -v -a "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile} ++ COMMAND grep -h -a ${_pattern} ${_translations} >> ${_outFile} + COMMENT "Generating ${_fileName}${_fileExt}" + ) + else() + add_custom_command(OUTPUT ${_outFile} +- COMMAND grep -v "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile} ++ COMMAND grep -v -a "'#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..cfb6b79 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +fix-new-grep-behaviour.patch diff --git a/debian/rules b/debian/rules index eb9628f..bc8d6f2 100755 --- a/debian/rules +++ b/debian/rules @@ -1,13 +1,9 @@ #!/usr/bin/make -f #DH_VERBOSE = 1 +export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed %: - dh ${@} --buildsystem cmake --parallel - -override_dh_install: - dh_install --exclude=pcmanfm-qt.1 --fail-missing - -override_dh_strip: - dh_strip --ddeb-migration='pcmanfm-qt-dbg (<< 0.10.1-1~)' + dh ${@} --buildsystem cmake \ + --parallel