[linux] 01/01: linux-manual: Fix regression in reproducibility in 4.2~rc8-1~exp1

[debian-kernel at lists.debian.org]

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

benh pushed a commit to branch sid
in repository linux.

commit c8050509621461b13324fbf7090c75002cbcfdcc
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sat Oct 24 12:42:08 2015 +0900

    linux-manual: Fix regression in reproducibility in 4.2~rc8-1~exp1
---
 debian/changelog  | 1 +
 debian/rules.real | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 1cb7c5a..91281a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -270,6 +270,7 @@ linux (4.2.4-1) UNRELEASED; urgency=medium
     VIDEO_GO7007_LOADER, VIDEO_GO7007_USB_S2250_BOARD as modules
   * net: Enable LIQUIDIO as module
   * [x86] Enable X86_AMD_PLATFORM_DEVICE
+  * linux-manual: Fix regression in reproducibility in 4.2~rc8-1~exp1
 
  -- Salvatore Bonaccorso <carnil at debian.org>  Mon, 19 Oct 2015 21:23:18 +0200
 
diff --git a/debian/rules.real b/debian/rules.real
index 96bb5d3..9d4e208 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -215,8 +215,14 @@ install-manual: DIR=$(BUILD_DIR)/build-doc
 install-manual: DH_OPTIONS = -p$(PACKAGE_NAME)
 install-manual: $(STAMPS_DIR)/build-doc
 	dh_prep
+# Some manual pages are generated multiple times with different
+# metadata, and need to be de-duplicated.  This matches what the
+# upstream installmandocs target does, except that we use
+# dh_installman.
 	set -o pipefail; \
-	find $(DIR)/Documentation/DocBook/man/ -name '*.9.gz' | xargs dh_installman
+	find $(DIR)/Documentation/DocBook/man/ -name '*.9.gz' -printf '%h %f\n' | \
+		sort -k 2 -k 1 | uniq -f 1 | sed -e 's: :/:' | \
+		xargs dh_installman
 	+$(MAKE_SELF) install-base
 
 install-headers_$(ARCH): PACKAGE_NAMES = linux-headers-$(ABINAME)-all linux-headers-$(ABINAME)-all-$(ARCH)

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