[linux-signed] 06/06: Copy and rename docs from unsigned packages at build time

[debian-kernel at lists.debian.org]

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

benh pushed a commit to branch master
in repository linux-signed.

commit 96cc2f2fce04b4c9a5451874f1bd5b65221099fb
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Mon Jun 6 17:59:15 2016 +0100

    Copy and rename docs from unsigned packages at build time
    
    ...and add a reference to the extra copyright file in ours.
---
 debian/TODO       | 2 --
 debian/copyright  | 4 ++++
 debian/rules.real | 6 +++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/debian/TODO b/debian/TODO
deleted file mode 100644
index 3f29f81..0000000
--- a/debian/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-Include changelog and copyright files from src:linux in the signed
-binary packages.
diff --git a/debian/copyright b/debian/copyright
index 749cb4f..8724316 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,8 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Comment:
+ This file describes only the linux-signed source package.  Its binary
+ packages are built largely from source in the linux source package,
+ which is described by the file 'copyright.linux'.
 
 Files: debian/certs/* debian/signatures/*
 License: public-domain
diff --git a/debian/rules.real b/debian/rules.real
index 748f123..2140d78 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -34,8 +34,12 @@ install-signed:
 		$(PACKAGE_DIR)/usr/share/bug/$(PACKAGE_NAME)/
 	dh_install
 	dh_installchangelogs
+	cp /usr/share/doc/$(IMAGE_PACKAGE_NAME)/changelog.Debian.gz \
+		$(PACKAGE_DIR)/usr/share/doc/$(PACKAGE_NAME)/changelog.linux.gz
 	dh_installdocs
-	dh_compress
+	cp /usr/share/doc/$(IMAGE_PACKAGE_NAME)/copyright \
+		$(PACKAGE_DIR)/usr/share/doc/$(PACKAGE_NAME)/copyright.linux
+	dh_compress -Xcopyright.linux
 	dh_fixperms
 	dh_installdeb
 # Copy package relations and description from unsigned package

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