[Glibc-bsd-commits] r4923 - trunk/freebsd-manpages/debian

[Axel Beckert]

Author: abe
Date: 2013-08-30 23:54:15 +0000 (Fri, 30 Aug 2013)
New Revision: 4923

Modified:
   trunk/freebsd-manpages/debian/changelog
   trunk/freebsd-manpages/debian/rules
Log:
manpages: Handle multiple architecture subdirectories properly

Modified: trunk/freebsd-manpages/debian/changelog
===================================================================
--- trunk/freebsd-manpages/debian/changelog	2013-08-30 23:40:09 UTC (rev 4922)
+++ trunk/freebsd-manpages/debian/changelog	2013-08-30 23:54:15 UTC (rev 4923)
@@ -1,6 +1,7 @@
 freebsd-manpages (9.1-1) UNRELEASED; urgency=low
 
   * New upstream version.
+    + Handle multiple architecture subdirectories properly
   * Rename update target to the more common name get-orig-source
   * Rework get-orig-source target to support FreeBSD releases which don't
     offer manpages for download separately.

Modified: trunk/freebsd-manpages/debian/rules
===================================================================
--- trunk/freebsd-manpages/debian/rules	2013-08-30 23:40:09 UTC (rev 4922)
+++ trunk/freebsd-manpages/debian/rules	2013-08-30 23:54:15 UTC (rev 4923)
@@ -36,8 +36,9 @@
 	dh_testroot
 	dh_prep
 	dh_install
+	# Use i386 directory for architecture-dependent man pages
 	mv $(DESTDIR)/usr/share/man/man4/i386/* $(DESTDIR)/usr/share/man/man4/
-	rm -rf $(DESTDIR)/usr/share/man/man4/i386/
+	rm -rf $(DESTDIR)/usr/share/man/man4/*/
 	for section in 2 4 9; do \
 	    for path in $(DESTDIR)/usr/share/man/man$${section}/*; do \
 	        file=`basename $${path}`; \