[debrepatch] 01/01: patches: rm patches that were NM-Uploaded
Ximin Luo
infinity0 at debian.org
Wed Jul 19 13:03:34 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 3b714fdee0ffcd48252551108fc7606cf322613d
Author: Ximin Luo <infinity0 at debian.org>
Date: Wed Jul 19 15:03:13 2017 +0200
patches: rm patches that were NM-Uploaded
---
patches/dash_825643.patch | 48 --------------------
patches/sensible-utils_774449.patch | 90 -------------------------------------
patches/xz-utils_806331.patch | 49 --------------------
3 files changed, 187 deletions(-)
diff --git a/patches/dash_825643.patch b/patches/dash_825643.patch
deleted file mode 100644
index cabb597..0000000
--- a/patches/dash_825643.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -u dash-0.5.8/debian/changelog dash-0.5.8/debian/changelog
---- dash-0.5.8/debian/changelog
-+++ dash-0.5.8/debian/changelog
-@@ -1,3 +1,12 @@
-+dash (0.5.8-2.3.0~reproducible1) experimental; urgency=low
-+
-+ * Improve build reproducibility: set LC_ALL instead of LC_COLLATE to C.
-+ Thanks to Reiner Herrmann.
-+ * Improve build reproducibility: avoid exec call which embeds different paths
-+ between different system shells. Thanks to HW42.
-+
-+ -- Ximin Luo <infinity0 at debian.org> Fri, 16 Sep 2016 19:06:49 +0200
-+
- dash (0.5.8-2.3) unstable; urgency=medium
-
- * Non-maintainer upload.
-diff -u dash-0.5.8/debian/rules dash-0.5.8/debian/rules
---- dash-0.5.8/debian/rules
-+++ dash-0.5.8/debian/rules
-@@ -46,7 +46,7 @@
- touch configure
- (cd build-tmp && CC='$(CC)' \
- CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' \
-- exec ../configure --enable-fnmatch --disable-lineno \
-+ ../configure --enable-fnmatch --disable-lineno \
- --host='$(DEB_HOST_GNU_TYPE)')
- touch configure-stamp
-
---- dash-0.5.8.orig/src/mkbuiltins
-+++ dash-0.5.8/src/mkbuiltins
-@@ -78,7 +78,7 @@
- if ($i ~ /^-/)
- line = $(++i) "\t" line
- print line
-- }}' $temp | LC_COLLATE=C sort -k 1,1 | tee $temp2 | awk '{
-+ }}' $temp | LC_ALL=C sort -k 1,1 | tee $temp2 | awk '{
- opt = ""
- if (NF > 2) {
- opt = substr($2, 2)
-@@ -97,7 +97,7 @@
- */
-
- !
--sed 's/ -[a-z]*//' $temp2 | nl -b a -v 0 | LC_COLLATE=C sort -u -k 3,3 |
-+sed 's/ -[a-z]*//' $temp2 | nl -b a -v 0 | LC_ALL=C sort -u -k 3,3 |
- tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ |
- awk '{ printf "#define %s (builtincmd + %d)\n", $3, $1}'
- printf '\n#define NUMBUILTINS %d\n' $(wc -l < $temp2)
diff --git a/patches/sensible-utils_774449.patch b/patches/sensible-utils_774449.patch
deleted file mode 100644
index 96107b5..0000000
--- a/patches/sensible-utils_774449.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-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 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.
-+
-+ [ 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 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)
-@@ -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
-+ $(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/
- $(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 | \
-+ xargs -0r touch --no-dereference --date='$(BUILD_DATE)'
- dpkg --build debian/sensible-utils ..
-
- define checkdir
diff --git a/patches/xz-utils_806331.patch b/patches/xz-utils_806331.patch
deleted file mode 100644
index 8274795..0000000
--- a/patches/xz-utils_806331.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -Nru xz-utils-5.1.1alpha+20120614/debian/changelog xz-utils-5.1.1alpha+20120614/debian/changelog
---- xz-utils-5.1.1alpha+20120614/debian/changelog 2015-06-18 20:27:36.000000000 +0200
-+++ xz-utils-5.1.1alpha+20120614/debian/changelog 2016-07-05 23:35:36.000000000 +0200
-@@ -1,3 +1,11 @@
-+xz-utils (5.1.1alpha+20120614-2.2) UNRELEASED; urgency=medium
-+
-+ * Non-maintainer upload.
-+ * Force a constant /bin/sh for installed scripts. This helps the build
-+ be reproducible; /bin/sh on Debian is always POSIX. (Closes: #806331)
-+
-+ -- Ximin Luo <infinity0 at debian.org> Sun, 03 Jul 2016 10:42:33 +0200
-+
- xz-utils (5.1.1alpha+20120614-2.1) unstable; urgency=medium
-
- [ Helmut Grohne ]
-diff -Nru xz-utils-5.1.1alpha+20120614/debian/rules xz-utils-5.1.1alpha+20120614/debian/rules
---- xz-utils-5.1.1alpha+20120614/debian/rules 2012-10-12 00:38:38.000000000 +0200
-+++ xz-utils-5.1.1alpha+20120614/debian/rules 2016-07-03 11:01:15.000000000 +0200
-@@ -66,12 +66,14 @@
-
- debian/normal-build/Makefile debian/normal-build/Doxyfile: $(configure_input)
- dh_auto_configure --builddirectory debian/normal-build -- \
-+ $(opt_reproduce) \
- --enable-threads --disable-static \
- $(opt_optimize) $(opt_quiet) \
- --disable-xzdec --disable-lzmadec
-
- debian/static-build/Makefile: $(configure_input)
- dh_auto_configure --builddirectory debian/static-build -- \
-+ $(opt_reproduce) \
- --disable-threads --disable-shared \
- --enable-liblzma2-compat \
- $(opt_optimize) $(opt_quiet) \
-@@ -81,6 +83,7 @@
-
- debian/xzdec-build/Makefile: $(configure_input)
- dh_auto_configure --builddirectory debian/xzdec-build -- \
-+ $(opt_reproduce) \
- --disable-shared --disable-nls --disable-encoders \
- --enable-small --disable-threads \
- --disable-liblzma2-compat \
-@@ -97,6 +100,7 @@
- flags_cmd = dpkg-buildflags --export=configure
- opt_optimize = $(shell $(flags_cmd))
- opt_optimize_small = $(shell $(small_flags_env) $(flags_cmd))
-+opt_reproduce = gl_cv_posix_shell=/bin/sh
-
- opt_no_act =
- opt_quiet =
--
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