[kernel] r22810 - in dists/trunk/linux/debian: . patches patches/bugfix/all

[Ben Hutchings]

Author: benh
Date: Tue Jul  7 16:25:17 2015
New Revision: 22810

Log:
DocBook: generate consistent IDs

Added:
   dists/trunk/linux/debian/patches/bugfix/all/docbook-generate-consistent-ids.patch
Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/patches/series

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Tue Jul  7 12:13:51 2015	(r22809)
+++ dists/trunk/linux/debian/changelog	Tue Jul  7 16:25:17 2015	(r22810)
@@ -1,3 +1,10 @@
+linux (4.1.1-1~exp2) UNRELEASED; urgency=medium
+
+  * Fix more issues that prevent a reproducible build:
+    - linux-doc: DocBook: generate consistent IDs
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Tue, 07 Jul 2015 16:25:05 +0100
+
 linux (4.1.1-1~exp1) experimental; urgency=medium
 
   * New upstream release: http://kernelnewbies.org/Linux_4.1

Added: dists/trunk/linux/debian/patches/bugfix/all/docbook-generate-consistent-ids.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux/debian/patches/bugfix/all/docbook-generate-consistent-ids.patch	Tue Jul  7 16:25:17 2015	(r22810)
@@ -0,0 +1,17 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Tue, 07 Jul 2015 17:23:54 +0100
+Subject: DocBook: generate consistent IDs
+Bug-Debian: https://bugs.debian.org/769844
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
+--- a/Documentation/DocBook/Makefile
++++ b/Documentation/DocBook/Makefile
+@@ -69,6 +69,7 @@ DOCPROC   = $(objtree)/scripts/docproc
+ 
+ XMLTOFLAGS = -m $(srctree)/$(src)/stylesheet.xsl
+ XMLTOFLAGS += --skip-validation
++XMLTOFLAGS += --stringparam generate.consistent.ids=1
+ 
+ ###
+ # DOCPROC is used for two purposes:

Modified: dists/trunk/linux/debian/patches/series
==============================================================================
--- dists/trunk/linux/debian/patches/series	Tue Jul  7 12:13:51 2015	(r22809)
+++ dists/trunk/linux/debian/patches/series	Tue Jul  7 16:25:17 2015	(r22810)
@@ -70,6 +70,7 @@
 debian/emmc-don-t-initialize-partitions-on-rpmb-flagged-areas.patch
 bugfix/all/make-highlights-deterministic-in-kernel-doc.patch
 bugfix/all/remove-timestamps-from-compressed-man-pages.patch
+bugfix/all/docbook-generate-consistent-ids.patch
 
 # Miscellaneous features
 features/all/efi-autoload-efi-pstore.patch