Install copyright file when the nodoc profile is used

Revert to running dh_installdocs unconditionally, although that
currently installs more than we want (which is permitted by policy).

When we upgrade to debhelper compat level 11, dh_installdocs will
become sensitive to the profile and will install only the copyright
file in this case.  But we shouldn't do that until development of
this level is complete and supported in stretch-backports.
This commit is contained in:
Ben Hutchings 2017-09-30 13:42:12 +01:00
parent 9369849423
commit cd2b0b1742
2 changed files with 4 additions and 14 deletions

2
debian/changelog vendored
View File

@ -22,6 +22,8 @@ linux (4.13.4-1~exp1) UNRELEASED; urgency=medium
- linux-doc: Build an empty package when the nodoc profile is used
- [x86] hyperv-daemons: Create pid files under /run, not /var/run
- Change all binary packages with priority: extra to priority: optional
- Install copyright file (and some other documentation) when the nodoc
profile is used
[ Uwe Kleine-König ]
* [arm64] really enable NET_DSA_MV88E6XXX for Espressobin

16
debian/rules.real vendored
View File

@ -203,9 +203,7 @@ endif
@$(stamp)
install-base:
ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES)))
dh_installdocs $(INSTALLDOCS_ARGS)
endif
dh_installchangelogs
dh_compress
dh_fixperms
@ -552,9 +550,7 @@ install-kbuild: $(STAMPS_DIR)/build-tools
$(call make-tools,scripts) install DESTDIR=$(DIR) prefix=$(PREFIX_DIR)
dh_link $(PREFIX_DIR) /usr/src/$(PACKAGE_NAME)
dh_installchangelogs
ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES)))
dh_installdocs
endif
dh_strip
dh_compress
dh_fixperms
@ -584,8 +580,8 @@ ifneq ($(filter i386 amd64 x32,$(DEB_HOST_ARCH)),)
endif
dh_install --sourcedir=$(DIR)
dh_installchangelogs
ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES)))
dh_installdocs
ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES)))
dh_installman
endif
dh_strip
@ -609,9 +605,7 @@ install-perf: $(STAMPS_DIR)/build-tools
dh_perl /usr/share/perf_$(VERSION)-core/scripts/perl/Perf-Trace-Util/lib/
dh_python2 /usr/share/perf_$(VERSION)-core/scripts/python/Perf-Trace-Util/lib/
dh_installchangelogs
ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES)))
dh_installdocs
endif
dh_lintian
dh_strip
dh_compress
@ -631,8 +625,8 @@ install-usbip: $(STAMPS_DIR)/build-tools
$(call make-tools,tools/usb/usbip) install DESTDIR=$(DIR)
dh_install --sourcedir=$(DIR)
dh_installchangelogs
ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES)))
dh_installdocs
ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES)))
dh_installman
endif
dh_lintian
@ -662,9 +656,7 @@ install-hyperv-daemons: $(STAMPS_DIR)/build-tools
|| break; \
done
dh_installchangelogs
ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES)))
dh_installdocs
endif
dh_systemd_enable
for service in fcopy kvp vss; do \
dh_installinit --name hyperv-daemons.hv-$$service-daemon \
@ -693,9 +685,7 @@ install-liblockdep: $(STAMPS_DIR)/build-tools
'usr/lib/*/liblockdep.so.*'
dh_install --sourcedir=$(DIR)
dh_installchangelogs
ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES)))
dh_installdocs
endif
dh_strip
dh_compress
dh_fixperms
@ -720,9 +710,7 @@ install-lockdep:
> $(DIR)/usr/bin/lockdep
chmod 755 $(DIR)/usr/bin/lockdep
dh_installchangelogs
ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES)))
dh_installdocs
endif
dh_compress
dh_fixperms
dh_installdeb