[debrepatch] 01/01: patches: sensible-utils: update for filesystem and umask differences

Ximin Luo infinity0 at debian.org
Tue May 9 17:10:57 UTC 2017 

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository debrepatch.

commit 20a0a5ccff2cdd1e6263b180416446a18b9025a0
Author: Ximin Luo <infinity0 at debian.org>
Date:   Tue May 9 19:10:33 2017 +0200

    patches: sensible-utils: update for filesystem and umask differences
---
 patches/sensible-utils_774449.patch | 69 ++++++++++++++++++++++++++++++-------
 1 file changed, 57 insertions(+), 12 deletions(-)

diff --git a/patches/sensible-utils_774449.patch b/patches/sensible-utils_774449.patch
index d34c23c..96107b5 100644
--- a/patches/sensible-utils_774449.patch
+++ b/patches/sensible-utils_774449.patch
@@ -1,41 +1,86 @@
 diff -Nru sensible-utils-0.0.9/debian/changelog sensible-utils-0.0.9.0~reproducible1/debian/changelog
 --- sensible-utils-0.0.9/debian/changelog	2013-06-06 14:19:53.000000000 +0200
-+++ sensible-utils-0.0.9.0~reproducible1/debian/changelog	2015-01-02 22:45:58.000000000 +0100
-@@ -1,3 +1,11 @@
++++ sensible-utils-0.0.9.0~reproducible1/debian/changelog	2017-05-09 19:08:51.000000000 +0200
+@@ -1,3 +1,18 @@
 +sensible-utils (0.0.9.0~reproducible1) UNRELEASED; urgency=low
 +
++  [ Jérémy Bobbio ]
 +  * Make package build reproducibly:
 +    - Stop recording current time when creating gzip files.
 +    - Fix mtimes before creating binary packages.
 +
-+ -- J�r�my Bobbio <lunar at debian.org>  Fri, 02 Jan 2015 21:41:59 +0000
++  [ Ximin Luo ]
++  * Make package build reproducible, pt 2:
++    - Sort file list, to avoid filesystem differences.
++    - Explicitly install every language man dir, to avoid umask differences.
++    - Slightly refactoring for readability.
++
++ -- Ximin Luo <infinity0 at debian.org>  Tue, 09 May 2017 19:08:51 +0200
 +
  sensible-utils (0.0.9) unstable; urgency=low
  
    * Fix bashism in select-editor
 diff -Nru sensible-utils-0.0.9/debian/rules sensible-utils-0.0.9.0~reproducible1/debian/rules
 --- sensible-utils-0.0.9/debian/rules	2012-05-14 09:23:19.000000000 +0200
-+++ sensible-utils-0.0.9.0~reproducible1/debian/rules	2015-01-02 22:41:57.000000000 +0100
-@@ -9,6 +9,8 @@
++++ sensible-utils-0.0.9.0~reproducible1/debian/rules	2017-05-09 19:05:54.000000000 +0200
+@@ -9,6 +9,11 @@
  INSTALL_SCRIPT  = $(INSTALL) -p    -o root -g root  -m  755
  INSTALL_DIR     = $(INSTALL) -p -d -o root -g root  -m  755
  
++MAN_LANGS = de es fr it ja pl
++MAN_DIRS = $(MAN_LANGS:%=debian/sensible-utils/usr/share/man/%/man1)
++
 +BUILD_DATE := $(shell dpkg-parsechangelog | sed -n -e 's/^Date: //p')
 +
  DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
  DEB_BUILD_GNU_TYPE = $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
  DEB_HOST_GNU_TYPE = $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-@@ -78,7 +80,7 @@
- 	     debian/sensible-utils/usr/share/man/de/man1 \
- 	     debian/sensible-utils/usr/share/man/ja/man1 \
- 	     debian/sensible-utils/usr/share/man/it/man1 \
+@@ -52,41 +57,30 @@
+ 	$(INSTALL_DIR) debian/sensible-utils/DEBIAN \
+ 		       debian/sensible-utils/usr/bin \
+ 		       debian/sensible-utils/usr/share/man/man1 \
++		       $(MAN_DIRS) \
+ 		       debian/sensible-utils/usr/lib/mime/packages \
+ 		       debian/sensible-utils/usr/share/doc/$(package)
+ 	$(MAKE) install DESTDIR=$(CURDIR)/debian/sensible-utils INSTALL_PROGRAM="$(INSTALL_PROGRAM)"
+ 
+-	ln -s sensible-editor.1.gz debian/sensible-utils/usr/share/man/man1/sensible-pager.1.gz
+-	ln -s sensible-editor.1.gz debian/sensible-utils/usr/share/man/man1/sensible-browser.1.gz
+-	ln -s sensible-editor.1.gz debian/sensible-utils/usr/share/man/fr/man1/sensible-pager.1.gz
+-	ln -s sensible-editor.1.gz debian/sensible-utils/usr/share/man/fr/man1/sensible-browser.1.gz
+-	ln -s sensible-editor.1.gz debian/sensible-utils/usr/share/man/pl/man1/sensible-pager.1.gz
+-	ln -s sensible-editor.1.gz debian/sensible-utils/usr/share/man/pl/man1/sensible-browser.1.gz
+-	ln -s sensible-editor.1.gz debian/sensible-utils/usr/share/man/es/man1/sensible-pager.1.gz
+-	ln -s sensible-editor.1.gz debian/sensible-utils/usr/share/man/es/man1/sensible-browser.1.gz
+-	ln -s sensible-editor.1.gz debian/sensible-utils/usr/share/man/de/man1/sensible-pager.1.gz
+-	ln -s sensible-editor.1.gz debian/sensible-utils/usr/share/man/de/man1/sensible-browser.1.gz
+-	ln -s sensible-editor.1.gz debian/sensible-utils/usr/share/man/ja/man1/sensible-pager.1.gz
+-	ln -s sensible-editor.1.gz debian/sensible-utils/usr/share/man/ja/man1/sensible-browser.1.gz
+-	ln -s sensible-editor.1.gz debian/sensible-utils/usr/share/man/it/man1/sensible-pager.1.gz
+-	ln -s sensible-editor.1.gz debian/sensible-utils/usr/share/man/it/man1/sensible-browser.1.gz
++	set -e; for i in "" $(MAN_LANGS); do \
++		ln -s sensible-editor.1.gz debian/sensible-utils/usr/share/man/$$i/man1/sensible-pager.1.gz; \
++		ln -s sensible-editor.1.gz debian/sensible-utils/usr/share/man/$$i/man1/sensible-browser.1.gz; \
++	done
+ 	$(INSTALL_FILE) debian/changelog debian/sensible-utils/usr/share/doc/$(package)
+ 	find debian/sensible-utils/usr/share/man/man1 \
+-	     debian/sensible-utils/usr/share/man/es/man1 \
+-	     debian/sensible-utils/usr/share/man/fr/man1 \
+-	     debian/sensible-utils/usr/share/man/pl/man1 \
+-	     debian/sensible-utils/usr/share/man/de/man1 \
+-	     debian/sensible-utils/usr/share/man/ja/man1 \
+-	     debian/sensible-utils/usr/share/man/it/man1 \
 -             debian/sensible-utils/usr/share/doc/$(package) -type f | xargs gzip -9
-+             debian/sensible-utils/usr/share/doc/$(package) -type f | xargs gzip -9n
++	     $(MAN_DIRS) \
++	     debian/sensible-utils/usr/share/doc/$(package) -type f | xargs gzip -9n
  	$(INSTALL_FILE) debian/copyright debian/sensible-utils/usr/share/doc/$(package)
  	$(INSTALL_SCRIPT) debian/postinst debian/sensible-utils/DEBIAN/
  	$(INSTALL_SCRIPT) debian/postrm debian/sensible-utils/DEBIAN/
-@@ -87,6 +89,8 @@
- 	cd debian/sensible-utils && find * -type f ! -regex '^DEBIAN/.*' -print0 | xargs -r0 md5sum > DEBIAN/md5sums
+ 	$(INSTALL_FILE) debian/mime debian/sensible-utils/usr/lib/mime/packages/sensible-utils
+ 
+-	cd debian/sensible-utils && find * -type f ! -regex '^DEBIAN/.*' -print0 | xargs -r0 md5sum > DEBIAN/md5sums
++	cd debian/sensible-utils && find * -type f ! -regex '^DEBIAN/.*' -print0 | \
++	     LC_ALL=C.UTF-8 sort -z | xargs -r0 md5sum > DEBIAN/md5sums
  
  	dpkg-gencontrol -Pdebian/sensible-utils
 +	find debian/sensible-utils -depth -newermt '$(BUILD_DATE)' -print0 | \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/debrepatch.git

More information about the Reproducible-commits mailing list