From d71a4478195cdd6a4fe46b6af671e444775a33de Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Thu, 25 Feb 2016 23:01:29 +0100 Subject: [PATCH] Add hardening=+all Bump Standards to 3.9.7 Fix LXQtTranlateDesktop - just in case Fix year in copyrights fix grep usage in cmake/LXQtTranslateDesktop.cmake - just in case --- debian/changelog | 10 ++++++++++ debian/control | 3 +-- debian/copyright | 8 ++++---- debian/patches/fix-grep-usage.patch | 22 ++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 4 +++- 6 files changed, 41 insertions(+), 7 deletions(-) create mode 100644 debian/patches/fix-grep-usage.patch create mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index 2bf9244..5ffd7b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +libfm-qt (0.10.0+20151214-3) unstable; urgency=medium + + * Add hardening=+all + * Bump Standards to 3.9.7 + * Fix LXQtTranlateDesktop - just in case + * Fix year in copyrights + * fix grep usage in cmake/LXQtTranslateDesktop.cmake - just in case + + -- Alf Gaida Thu, 25 Feb 2016 22:16:17 +0100 + libfm-qt (0.10.0+20151214-2) unstable; urgency=medium [ Alf Gaida ] diff --git a/debian/control b/debian/control index 39d77b7..7576ef2 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,7 @@ Build-Depends: cmake (>= 3.0.2), 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/libfm-qt Vcs-Git: https://anonscm.debian.org/cgit/pkg-lxqt/libfm-qt -b debian/sid Homepage: https://github.com/lxde/libfm-qt @@ -44,7 +44,6 @@ Breaks: libfm-qt5-dev Architecture: any Section: libdevel Depends: ${misc:Depends}, - ${shlibs:Depends}, libfm-qt2 (= ${binary:Version}) Description: file management support library for pcmanfm-qt (development files) This package contains development files for helper library libfm-qt. diff --git a/debian/copyright b/debian/copyright index 30327e0..43d7163 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,8 +3,8 @@ Upstream-Name: libfm-qt Source: https://github.com/lxde/libfm-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: LGPL-2.1+ @@ -19,8 +19,8 @@ License: BSD-3-Clause 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: LGPL-2.1+ diff --git a/debian/patches/fix-grep-usage.patch b/debian/patches/fix-grep-usage.patch new file mode 100644 index 0000000..f1b0eef --- /dev/null +++ b/debian/patches/fix-grep-usage.patch @@ -0,0 +1,22 @@ +Description: Fix grep usage in LXQtTranslateDesktop +Author: Alf Gaida + +--- libfm-qt-0.10.0+20151214.orig/cmake/LXQtTranslateDesktop.cmake ++++ libfm-qt-0.10.0+20151214/cmake/LXQtTranslateDesktop.cmake +@@ -71,13 +71,13 @@ function(lxqt_translate_desktop _RESULT) + 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 -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..71ed5f2 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +fix-grep-usage.patch diff --git a/debian/rules b/debian/rules index 52293ff..79e7436 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +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 + dh ${@} --buildsystem cmake \ + --parallel