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

[abe at alioth.debian.org]

Author: abe
Date: 2016-09-17 23:39:37 +0000 (Sat, 17 Sep 2016)
New Revision: 6109

Modified:
   trunk/freebsd-manpages/debian/changelog
   trunk/freebsd-manpages/debian/install
   trunk/freebsd-manpages/debian/rules
Log:
Include security(7) and securelevel(7) man pages. (Closes: #737717)

Modified: trunk/freebsd-manpages/debian/changelog
===================================================================
--- trunk/freebsd-manpages/debian/changelog	2016-09-17 22:41:55 UTC (rev 6108)
+++ trunk/freebsd-manpages/debian/changelog	2016-09-17 23:39:37 UTC (rev 6109)
@@ -9,6 +9,9 @@
   * Convert debian/copyright to machine-readable DEP5 format.
   * Update license and copyright years in debian/copyright wrt. to
     COPYRIGHT file in BASE.txz
+  * Include security(7) and securelevel(7) man pages. (Closes: #737717)
+    + Only include the man pages from section 3 and 7 in generated
+      upstream tar ball which are also shipped in the binary package.
 
  -- Axel Beckert <abe at debian.org>  Sat, 17 Sep 2016 23:38:41 +0200
 

Modified: trunk/freebsd-manpages/debian/install
===================================================================
--- trunk/freebsd-manpages/debian/install	2016-09-17 22:41:55 UTC (rev 6108)
+++ trunk/freebsd-manpages/debian/install	2016-09-17 23:39:37 UTC (rev 6109)
@@ -1,2 +1 @@
-share/man/man[249] usr/share/man
-share/man/man3/sysctl.3.gz usr/share/man/man3
+share/man/man* usr/share/man

Modified: trunk/freebsd-manpages/debian/rules
===================================================================
--- trunk/freebsd-manpages/debian/rules	2016-09-17 22:41:55 UTC (rev 6108)
+++ trunk/freebsd-manpages/debian/rules	2016-09-17 23:39:37 UTC (rev 6109)
@@ -23,9 +23,11 @@
 # make -f debian/rules get-orig-source-beta
 get-orig-source-beta: ../freebsd-manpages_$(VER)~$(BETA).orig.tar.xz
 ../freebsd-manpages_$(VER)~$(BETA).orig.tar.xz: ../base-$(VER)-$(BETA).txz
-	mkdir -pv debian/repack1 debian/repack2/usr/share/man/
+	mkdir -pv debian/repack1 debian/repack2/usr/share/man/man7 debian/repack2/usr/share/man/man3
 	cd debian/repack1; tar xvJ --no-xattrs -f ../../../base-$(VER)-$(BETA).txz
-	mv -v debian/repack1/usr/share/man/man2 debian/repack1/usr/share/man/man3 debian/repack1/usr/share/man/man4 debian/repack1/usr/share/man/man9 debian/repack2/usr/share/man/
+	mv -v debian/repack1/usr/share/man/man2 debian/repack1/usr/share/man/man4 debian/repack1/usr/share/man/man9 debian/repack2/usr/share/man/
+	mv -v debian/repack1/usr/share/man/man3/sysctl.3.gz debian/repack2/usr/share/man/man3/
+	mv -v debian/repack1/usr/share/man/man7/secur*.7.gz debian/repack2/usr/share/man/man7/
 	cd debian/repack2; tar cvJf ../../../freebsd-manpages_$(VER)~$(BETA).orig.tar.xz ./usr/share/man
 	rm -rf debian/repack?
 
@@ -35,11 +37,14 @@
 # make -f debian/rules get-orig-source
 get-orig-source: ../freebsd-manpages_$(VER).orig.tar.xz
 ../freebsd-manpages_$(VER).orig.tar.xz: ../base-$(VER).txz
-	mkdir -pv debian/repack1 debian/repack2/usr/share/man/
+	mkdir -pv debian/repack1 debian/repack2/usr/share/man/man7 debian/repack2/usr/share/man/man3
 	cd debian/repack1; tar xvJ --no-xattrs -f ../../../base-$(VER).txz
-	mv -v debian/repack1/usr/share/man/man2 debian/repack1/usr/share/man/man3 debian/repack1/usr/share/man/man4 debian/repack1/usr/share/man/man9 debian/repack2/usr/share/man/
+	mv -v debian/repack1/usr/share/man/man2 debian/repack1/usr/share/man/man4 debian/repack1/usr/share/man/man9 debian/repack2/usr/share/man/
+	mv -v debian/repack1/usr/share/man/man3/sysctl.3.gz debian/repack2/usr/share/man/man3/
+	mv -v debian/repack1/usr/share/man/man7/secur*.7.gz debian/repack2/usr/share/man/man7/
 	cd debian/repack2; tar cvJf ../../../freebsd-manpages_$(VER).orig.tar.xz ./usr/share/man
 	rm -rf debian/repack?
 
 ../base-$(VER).txz:
 	wget -O $@ http://ftp.freebsd.org/pub/FreeBSD/releases/i386/$(VER)-RELEASE/base.txz
+1