From a8ed52bde7e75f4d8e4ae14a59da1d5d302c5898 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Thu, 25 Feb 2016 21:07:37 +0100 Subject: [PATCH] make builds reproducible again (Closes: #815899), thanks to Eduard Sanou for the patch, but i fixed this already upstream Bump Standard to 3.9.7 --- debian/changelog | 8 ++++++++ debian/control | 4 ++-- debian/patches/reproducible-builds.patch | 23 +++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 3 ++- 5 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 debian/patches/reproducible-builds.patch create mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index cb92af2..093e45a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +screengrab (1.95+20160128-2) unstable; urgency=medium + + * make builds reproducible again (Closes: #815899), thanks to Eduard Sanou + for the patch, but i fixed this already upstream + * Bump Standard to 3.9.7 + + -- Alf Gaida Thu, 25 Feb 2016 21:03:01 +0100 + screengrab (1.95+20160128-1) unstable; urgency=medium * Cherry-picking upstream version 1.95+20160128. diff --git a/debian/control b/debian/control index 481f6f0..00efc4d 100644 --- a/debian/control +++ b/debian/control @@ -16,8 +16,8 @@ Build-Depends: debhelper (>= 9), libxcb-xfixes0-dev [!kfreebsd-any], pkg-config, qttools5-dev, - qttools5-dev-tools, -Standards-Version: 3.9.6 + qttools5-dev-tools +Standards-Version: 3.9.7 Vcs-Browser: https://anonscm.debian.org/git/pkg-lxqt/screengrab.git/?h=debian/sid Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/screengrab.git -b debian/sid Homepage: https://github.com/QtDesktop/screengrab diff --git a/debian/patches/reproducible-builds.patch b/debian/patches/reproducible-builds.patch new file mode 100644 index 0000000..22a07c1 --- /dev/null +++ b/debian/patches/reproducible-builds.patch @@ -0,0 +1,23 @@ +Description: Make the builds reproducible again +Author: Alf Gaida +Bug-Debian: https://bugs.debian.org/815899 + +--- screengrab-1.95+20160128.orig/cmake/LXQtTranslateDesktop.cmake ++++ screengrab-1.95+20160128/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 -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..153739d --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +reproducible-builds.patch diff --git a/debian/rules b/debian/rules index c2e446f..4b4bdfb 100755 --- a/debian/rules +++ b/debian/rules @@ -5,7 +5,8 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed %: - dh $@ --buildsystem=cmake --parallel + dh ${@} --buildsystem=cmake \ + --parallel override_dh_install: rm -f $(currdir)/debian/screengrab/usr/share/doc/screengrab/LICENSE.txt