make build reproducible again (Closes: 815900), thanks to Eduard Sanou

for the bug and the patch, but i already fixed this upstream
Bump Standards to 3.9.7
Secure VCS-fields
Fix years in copyright
This commit is contained in:
Alf Gaida 2016-02-25 21:23:06 +01:00
parent 13e7da6e5d
commit 2f8e9ef0be
5 changed files with 40 additions and 5 deletions

10
debian/changelog vendored
View File

@ -1,3 +1,13 @@
obconf-qt (0.9.0+20151227-2) unstable; urgency=medium
* make build reproducible again (Closes: 815900), thanks to Eduard Sanou
for the bug and the patch, but i already fixed this upstream
* Bump Standards to 3.9.7
* Secure VCS-fields
* Fix years in copyright
-- Alf Gaida <agaida@siduction.org> Thu, 25 Feb 2016 21:21:57 +0100
obconf-qt (0.9.0+20151227-1) unstable; urgency=medium
* Cherry-picked upstream version 0.9.0+20151227.

6
debian/control vendored
View File

@ -12,9 +12,9 @@ Build-Depends: cmake (>= 3.0.2),
pkg-config,
qttools5-dev,
qttools5-dev-tools
Standards-Version: 3.9.6
Vcs-Browser: http://anonscm.debian.org/cgit/pkg-lxqt/obconf-qt.git/?h=debian/sid
Vcs-Git: git://anonscm.debian.org/pkg-lxqt/obconf-qt.git -b debian/sid
Standards-Version: 3.9.7
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/obconf-qt.git/?h=debian/sid
Vcs-Git: https://anonscm.debian.org/cgit/pkg-lxqt/obconf-qt.git -b debian/sid
Homepage: https://github.com/lxde/obconf-qt
Package: obconf-qt

4
debian/copyright vendored
View File

@ -3,11 +3,11 @@ Upstream-Name: obconf-qt
Source: https://github.com/lxde/obconf-qt
Files: *
Copyright: 2012-2015 LXQt team
Copyright: 2012-2016 LXQt team
License: GPL-2.0+
Files: debian/*
Copyright: 2013-2015 Alf Gaida <agaida@siduction.org>
Copyright: 2013-2016 Alf Gaida <agaida@siduction.org>
2015 Andrew Lee (李健秋) <ajqlee@debian.org>
License: LGPL-2.1+

View File

@ -0,0 +1,24 @@
Description: Make builds reproducible again
Fixed upstream, so no need to send the patch upstream
Author: Alf Gaida <agaida@siduction.org>
Bug-Debian: https://bugs.debian.org/815900
--- obconf-qt-0.9.0+20151227.orig/cmake/LXQtTranslateDesktop.cmake
+++ obconf-qt-0.9.0+20151227/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()

1
debian/patches/series vendored Normal file
View File

@ -0,0 +1 @@
reproducible-builds.patch