Stop using brace expansion to install man pages

The reason for using brace expansion in the first place was due to
debhelper starting to abort on empty glob expansion, needed because
translated man pages might not be present if not complete enough.

The installation is now handled by dh_installman which does not abort
on empty glob expansion (and in fairness should have been handling
the installation from the beginning). While the result is clearly a
regression in readability and maintainability it's certainly less ugly
than an executable debhelper config file, it also does not require
bumping debhelper Build-Depends to 8.9.12.

debian/changelog

@@ -39,6 +39,8 @@ dpkg (1.16.2) UNRELEASED; urgency=low
     compressors except gzip.
   * Add new dpkg-deb -S option to specify the compression strategy. The only
     currently supported value is “extreme” for xz. Closes: #647915
+  * Stop using brace expansion to install man pages by using dh_installman
+    instead of dh_install, the former does not abort on empty glob expansion.
 
   [ Raphaël Hertzog ]
   * Update Dpkg::Shlibs to look into multiarch paths when cross-building

debian/dpkg-dev.install

@@ -18,31 +18,3 @@ usr/bin/dpkg-shlibdeps
 usr/bin/dpkg-source
 usr/bin/dpkg-vendor
 usr/share/dpkg/*.mk
-usr/share/man/{*/*,*}/deb-control.5
-usr/share/man/{*/*,*}/deb-src-control.5
-usr/share/man/{*/*,*}/deb-version.5
-usr/share/man/{*/*,*}/deb-substvars.5
-usr/share/man/{*/*,*}/deb-override.5
-usr/share/man/{*/*,*}/deb-extra-override.5
-usr/share/man/{*/*,*}/deb-shlibs.5
-usr/share/man/{*/*,*}/deb-split.5
-usr/share/man/{*/*,*}/deb-symbols.5
-usr/share/man/{*/*,*}/deb-triggers.5
-usr/share/man/{*/*,*}/deb-old.5
-usr/share/man/{*/*,*}/deb.5
-usr/share/man/{*/*,*}/dpkg-architecture.1
-usr/share/man/{*/*,*}/dpkg-buildflags.1
-usr/share/man/{*/*,*}/dpkg-buildpackage.1
-usr/share/man/{*/*,*}/dpkg-checkbuilddeps.1
-usr/share/man/{*/*,*}/dpkg-distaddfile.1
-usr/share/man/{*/*,*}/dpkg-genchanges.1
-usr/share/man/{*/*,*}/dpkg-gencontrol.1
-usr/share/man/{*/*,*}/dpkg-gensymbols.1
-usr/share/man/{*/*,*}/dpkg-mergechangelogs.1
-usr/share/man/{*/*,*}/dpkg-name.1
-usr/share/man/{*/*,*}/dpkg-parsechangelog.1
-usr/share/man/{*/*,*}/dpkg-scanpackages.1
-usr/share/man/{*/*,*}/dpkg-scansources.1
-usr/share/man/{*/*,*}/dpkg-shlibdeps.1
-usr/share/man/{*/*,*}/dpkg-source.1
-usr/share/man/{*/*,*}/dpkg-vendor.1

debian/dpkg-dev.manpages

@@ -0,0 +1,56 @@
+debian/tmp/usr/share/man/*/*/deb-control.5
+debian/tmp/usr/share/man/*/deb-control.5
+debian/tmp/usr/share/man/*/*/deb-src-control.5
+debian/tmp/usr/share/man/*/deb-src-control.5
+debian/tmp/usr/share/man/*/*/deb-version.5
+debian/tmp/usr/share/man/*/deb-version.5
+debian/tmp/usr/share/man/*/*/deb-substvars.5
+debian/tmp/usr/share/man/*/deb-substvars.5
+debian/tmp/usr/share/man/*/*/deb-override.5
+debian/tmp/usr/share/man/*/deb-override.5
+debian/tmp/usr/share/man/*/*/deb-extra-override.5
+debian/tmp/usr/share/man/*/deb-extra-override.5
+debian/tmp/usr/share/man/*/*/deb-shlibs.5
+debian/tmp/usr/share/man/*/deb-shlibs.5
+debian/tmp/usr/share/man/*/*/deb-split.5
+debian/tmp/usr/share/man/*/deb-split.5
+debian/tmp/usr/share/man/*/*/deb-symbols.5
+debian/tmp/usr/share/man/*/deb-symbols.5
+debian/tmp/usr/share/man/*/*/deb-triggers.5
+debian/tmp/usr/share/man/*/deb-triggers.5
+debian/tmp/usr/share/man/*/*/deb-old.5
+debian/tmp/usr/share/man/*/deb-old.5
+debian/tmp/usr/share/man/*/*/deb.5
+debian/tmp/usr/share/man/*/deb.5
+debian/tmp/usr/share/man/*/*/dpkg-architecture.1
+debian/tmp/usr/share/man/*/dpkg-architecture.1
+debian/tmp/usr/share/man/*/*/dpkg-buildflags.1
+debian/tmp/usr/share/man/*/dpkg-buildflags.1
+debian/tmp/usr/share/man/*/*/dpkg-buildpackage.1
+debian/tmp/usr/share/man/*/dpkg-buildpackage.1
+debian/tmp/usr/share/man/*/*/dpkg-checkbuilddeps.1
+debian/tmp/usr/share/man/*/dpkg-checkbuilddeps.1
+debian/tmp/usr/share/man/*/*/dpkg-distaddfile.1
+debian/tmp/usr/share/man/*/dpkg-distaddfile.1
+debian/tmp/usr/share/man/*/*/dpkg-genchanges.1
+debian/tmp/usr/share/man/*/dpkg-genchanges.1
+debian/tmp/usr/share/man/*/*/dpkg-gencontrol.1
+debian/tmp/usr/share/man/*/dpkg-gencontrol.1
+debian/tmp/usr/share/man/*/*/dpkg-gensymbols.1
+debian/tmp/usr/share/man/*/dpkg-gensymbols.1
+debian/tmp/usr/share/man/*/*/dpkg-mergechangelogs.1
+debian/tmp/usr/share/man/*/dpkg-mergechangelogs.1
+debian/tmp/usr/share/man/*/*/dpkg-name.1
+debian/tmp/usr/share/man/*/dpkg-name.1
+debian/tmp/usr/share/man/*/*/dpkg-parsechangelog.1
+debian/tmp/usr/share/man/*/dpkg-parsechangelog.1
+debian/tmp/usr/share/man/*/*/dpkg-scanpackages.1
+debian/tmp/usr/share/man/*/dpkg-scanpackages.1
+debian/tmp/usr/share/man/*/*/dpkg-scansources.1
+debian/tmp/usr/share/man/*/dpkg-scansources.1
+debian/tmp/usr/share/man/*/*/dpkg-shlibdeps.1
+debian/tmp/usr/share/man/*/dpkg-shlibdeps.1
+debian/tmp/usr/share/man/*/*/dpkg-source.1
+debian/tmp/usr/share/man/*/dpkg-source.1
+debian/tmp/usr/share/man/*/*/dpkg-vendor.1
+debian/tmp/usr/share/man/*/dpkg-vendor.1

debian/dpkg.install

@@ -15,17 +15,6 @@ usr/bin/update-alternatives
 usr/sbin
 usr/share/dpkg/*table
 usr/share/locale/*/LC_MESSAGES/dpkg.mo
-usr/share/man/{*/*,*}/dpkg-deb.1
-usr/share/man/{*/*,*}/dpkg-divert.8
-usr/share/man/{*/*,*}/dpkg-maintscript-helper.1
-usr/share/man/{*/*,*}/dpkg-query.1
-usr/share/man/{*/*,*}/dpkg-split.1
-usr/share/man/{*/*,*}/dpkg-statoverride.8
-usr/share/man/{*/*,*}/dpkg-trigger.1
-usr/share/man/{*/*,*}/dpkg.cfg.5
-usr/share/man/{*/*,*}/dpkg.1
-usr/share/man/{*/*,*}/start-stop-daemon.8
-usr/share/man/{*/*,*}/update-alternatives.8
 var/lib/dpkg/alternatives
 var/lib/dpkg/info
 var/lib/dpkg/parts

debian/dpkg.manpages

@@ -0,0 +1,22 @@
+debian/tmp/usr/share/man/*/*/dpkg-deb.1
+debian/tmp/usr/share/man/*/dpkg-deb.1
+debian/tmp/usr/share/man/*/*/dpkg-divert.8
+debian/tmp/usr/share/man/*/dpkg-divert.8
+debian/tmp/usr/share/man/*/*/dpkg-maintscript-helper.1
+debian/tmp/usr/share/man/*/dpkg-maintscript-helper.1
+debian/tmp/usr/share/man/*/*/dpkg-query.1
+debian/tmp/usr/share/man/*/dpkg-query.1
+debian/tmp/usr/share/man/*/*/dpkg-split.1
+debian/tmp/usr/share/man/*/dpkg-split.1
+debian/tmp/usr/share/man/*/*/dpkg-statoverride.8
+debian/tmp/usr/share/man/*/dpkg-statoverride.8
+debian/tmp/usr/share/man/*/*/dpkg-trigger.1
+debian/tmp/usr/share/man/*/dpkg-trigger.1
+debian/tmp/usr/share/man/*/*/dpkg.cfg.5
+debian/tmp/usr/share/man/*/dpkg.cfg.5
+debian/tmp/usr/share/man/*/*/dpkg.1
+debian/tmp/usr/share/man/*/dpkg.1
+debian/tmp/usr/share/man/*/*/start-stop-daemon.8
+debian/tmp/usr/share/man/*/start-stop-daemon.8
+debian/tmp/usr/share/man/*/*/update-alternatives.8
+debian/tmp/usr/share/man/*/update-alternatives.8

debian/dselect.install

@@ -4,7 +4,5 @@ etc/dpkg/dselect.cfg.d
 usr/bin/dselect
 usr/lib/dpkg/methods
 usr/share/locale/*/LC_MESSAGES/dselect.mo
-usr/share/man/{*/*,*}/dselect.cfg.5
-usr/share/man/{*/*,*}/dselect.1
 usr/share/perl5/Debian
 var/lib/dpkg/methods

debian/dselect.manpages

@@ -0,0 +1,4 @@
+debian/tmp/usr/share/man/*/*/dselect.cfg.5
+debian/tmp/usr/share/man/*/dselect.cfg.5
+debian/tmp/usr/share/man/*/*/dselect.1
+debian/tmp/usr/share/man/*/dselect.1

debian/rules

@@ -92,6 +92,7 @@ binary-arch: install
 
 	dh_installchangelogs -a ChangeLog*
 	dh_installdocs -a
+	dh_installman -a
 	dh_link -a
 	dh_lintian -a
 	dh_strip -a
@@ -111,6 +112,7 @@ binary-indep: install
 	dh_installcron -i
 	dh_installchangelogs -i ChangeLog*
 	dh_installdocs -i
+	dh_installman -i
 	dh_link -i
 	dh_lintian -i
 	dh_strip -i