[linux-latest] 01/04: linux-doc: Add symlinks to current documentation

[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-latest.

commit 2e853d18f2ea0ba21134b030886d8324b67b388e
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Fri Nov 24 17:57:59 2017 +0000

    linux-doc: Add symlinks to current documentation
---
 debian/bin/gencontrol.py | 1 +
 debian/changelog         | 1 +
 debian/rules.real        | 5 +++++
 3 files changed, 7 insertions(+)

diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index d2f87b9..086ceee 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -29,6 +29,7 @@ class Gencontrol(Base):
 
     def do_main_setup(self, vars, makeflags, extra):
         makeflags['GENCONTROL_ARGS'] = '-v%s' % self.package_version
+        makeflags['VERSION'] = self.version.linux_version
 
         # A line will be appended to this for each image-dbg package.
         # Start with an empty file.
diff --git a/debian/changelog b/debian/changelog
index 9faca82..ef49ab1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 linux-latest (87) UNRELEASED; urgency=medium
 
   * linux-image: Add back-dated NEWS for vsyscall change in Linux 4.10
+  * linux-doc: Add symlinks to current documentation
 
  -- Ben Hutchings <ben at decadent.org.uk>  Thu, 16 Nov 2017 02:43:31 +0000
 
diff --git a/debian/rules.real b/debian/rules.real
index 5f17a23..7efdac5 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -34,9 +34,14 @@ install-dummy:
 	$(MAKE) -f debian/rules.real install-base
 
 install-doc: PACKAGE_NAME = linux-doc
+install-doc: PACKAGE_DIR = debian/$(PACKAGE_NAME)
 install-doc: DH_OPTIONS = -p$(PACKAGE_NAME)
 install-doc:
 	dh_prep
+	mkdir -p $(PACKAGE_DIR)/usr/share/doc/$(PACKAGE_NAME)
+	for file in CREDITS.gz Documentation html MAINTAINERS.gz; do \
+		ln -sf ../linux-doc-$(VERSION)/$$file $(PACKAGE_DIR)/usr/share/doc/$(PACKAGE_NAME)/ || exit; \
+	done
 	$(MAKE) -f debian/rules.real install-base
 
 install-source: PACKAGE_NAME = linux-source

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