From 9cef8b615d0fe3d8f9711310c6480c277d14af90 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Thu, 5 Sep 2013 12:18:24 +0000 Subject: [PATCH] * debian/changelog: Update. * debian/rules.real: Symlink doc directory from linux-headers to linux-headers-common. svn path=/dists/trunk/linux/; revision=20566 --- debian/changelog | 3 +++ debian/rules.real | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c7c19c910..e1289276f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -43,6 +43,9 @@ linux (3.11-1~exp1) UNRELEASED; urgency=low * bluetooth: Disable BT_HCIBTUART; the serial_cs and hci_uart drivers should be used instead + [ Bastian Blank ] + * Symlink doc directory in linux-headers packages. + -- Ben Hutchings Sun, 01 Sep 2013 18:45:47 +0100 linux (3.11~rc7-1~exp1) experimental; urgency=low diff --git a/debian/rules.real b/debian/rules.real index 77dbefeb9..9f917fb3a 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -164,8 +164,8 @@ $(STAMPS_DIR)/build-doc: $(STAMPS_DIR)/source @$(stamp) install-base: + dh_installdocs $(INSTALLDOCS_ARGS) dh_installchangelogs - dh_installdocs dh_strip dh_compress dh_fixperms @@ -287,7 +287,7 @@ install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(STAMPS_DIR)/build_$(ARCH)_$( ln -s /usr/src/$(PACKAGE_NAME) $(PACKAGE_DIR)/lib/modules/$(REAL_VERSION)/build ln -s /usr/src/$(PACKAGE_NAME_COMMON) $(PACKAGE_DIR)/lib/modules/$(REAL_VERSION)/source - +$(MAKE_SELF) install-base + +$(MAKE_SELF) install-base INSTALLDOCS_ARGS="--link-doc=$(PACKAGE_NAME_COMMON)" install-libc-dev_$(ARCH): PACKAGE_NAME = linux-libc-dev install-libc-dev_$(ARCH): DH_OPTIONS = -p$(PACKAGE_NAME)