r5676 - in glibc-package/trunk/debian: . debhelper.in rules.d
Author: adconrad
Date: 2013-07-29 23:10:02 +0000 (Mon, 29 Jul 2013)
New Revision: 5676
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/debhelper.in/libc-bin.manpages
glibc-package/trunk/debian/rules.d/debhelper.mk
Log:
debian/*: Remove ldd.1, ldconfig.8, ld.so.8, gai.conf.5, zic.8,
and zdump.1, and let them move to manpages (Reference: #556173)
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2013-07-28 18:53:56 UTC (rev 5675)
+++ glibc-package/trunk/debian/changelog 2013-07-29 23:10:02 UTC (rev 5676)
@@ -25,6 +25,8 @@
[ Adam Conrad ]
* debian/control.in/main: Drop build-conflicts on binutils-gold to
make us buildable again with the new binutils that provides it.
+ * debian/*: Remove ldd.1, ldconfig.8, ld.so.8, gai.conf.5, zic.8,
+ and zdump.1, and let them move to manpages (Reference: #556173)
-- Aurelien Jarno <aurel32@debian.org> Thu, 25 Jul 2013 08:45:35 +0200
Modified: glibc-package/trunk/debian/debhelper.in/libc-bin.manpages
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc-bin.manpages 2013-07-28 18:53:56 UTC (rev 5675)
+++ glibc-package/trunk/debian/debhelper.in/libc-bin.manpages 2013-07-29 23:10:02 UTC (rev 5676)
@@ -1,13 +1,8 @@
debian/local/manpages/catchsegv.1
-debian/local/manpages/gai.conf.5
debian/local/manpages/getconf.1
debian/local/manpages/iconv.1
debian/local/manpages/iconvconfig.8
-debian/local/manpages/ldconfig.8
-debian/local/manpages/ldd.1
debian/local/manpages/locale.1
debian/local/manpages/localedef.1
debian/local/manpages/pldd.1
debian/local/manpages/tzselect.1
-debian/local/manpages/zdump.1
-debian/local/manpages/zic.8
Modified: glibc-package/trunk/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/debhelper.mk 2013-07-28 18:53:56 UTC (rev 5675)
+++ glibc-package/trunk/debian/rules.d/debhelper.mk 2013-07-29 23:10:02 UTC (rev 5676)
@@ -1,9 +1,3 @@
-# Some per-package extra files to install.
-define libc-bin_extra_debhelper_pkg_install
- # dh_installmanpages thinks that .so is a language.
- install --mode=0644 debian/local/manpages/ld.so.8 debian/libc-bin/usr/share/man/man8/ld.so.8
-endef
-
# Should each of these have per-package options?
$(patsubst %,binaryinst_%,$(DEB_ARCH_REGULAR_PACKAGES) $(DEB_INDEP_REGULAR_PACKAGES)) :: binaryinst_% : $(stamp)binaryinst_%
Reply to: