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

[abe at alioth.debian.org]

Author: abe
Date: 2014-09-24 19:02:55 +0000 (Wed, 24 Sep 2014)
New Revision: 5568

Modified:
   trunk/freebsd-manpages/debian/changelog
   trunk/freebsd-manpages/debian/rules
   trunk/freebsd-manpages/debian/watch
Log:
Add get-orig-source-beta to debian/rules and support beta versions in debian/watch

Modified: trunk/freebsd-manpages/debian/changelog
===================================================================
--- trunk/freebsd-manpages/debian/changelog	2014-09-24 18:30:51 UTC (rev 5567)
+++ trunk/freebsd-manpages/debian/changelog	2014-09-24 19:02:55 UTC (rev 5568)
@@ -5,6 +5,8 @@
   * Switch debian/watch to use HTTP instead of FTP
   * Switch from perl's deprecated prename to (file-)rename
     + Update build-dependency from perl to rename.
+  * Add get-orig-source-beta to debian/rules and support beta versions in
+    debian/watch.
 
  -- Axel Beckert <abe at debian.org>  Wed, 05 Feb 2014 21:23:02 +0100
 

Modified: trunk/freebsd-manpages/debian/rules
===================================================================
--- trunk/freebsd-manpages/debian/rules	2014-09-24 18:30:51 UTC (rev 5567)
+++ trunk/freebsd-manpages/debian/rules	2014-09-24 19:02:55 UTC (rev 5568)
@@ -3,7 +3,8 @@
 #export DH_VERBOSE=1
 
 DESTDIR=$(CURDIR)/debian/freebsd-manpages
-VER=9.2
+VER=10.1
+BETA=BETA2
 
 b% i% c%:
 	dh $@
@@ -19,6 +20,22 @@
 	dh_installman
 	hardlink -m -t $(DESTDIR)/usr/share/man
 
+# 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/repack
+	# Extract more than necessary because tar as well as bsdtar
+	# bail out if there are hardlinks to directories which are not
+	# extracted
+	cd debian/repack; tar xvJ --no-xattrs -f ../../../base-$(VER)-$(BETA).txz ./usr/share/man/man2 ./usr/share/man/man3 ./usr/share/man/man4 ./usr/share/man/man5 ./usr/share/man/man8 ./usr/share/man/man9
+	# ... and remove that stuff again.
+	rm -rvf debian/repack/usr/share/man/man5 ./usr/share/man/man8
+	cd debian/repack; tar cvJf ../../../freebsd-manpages_$(VER)~$(BETA).orig.tar.xz ./usr/share/man
+	rm -rf debian/repack
+
+../base-$(VER)-$(BETA).txz:
+	wget -O $@ http://ftp.freebsd.org/pub/FreeBSD/releases/i386/$(VER)-$(BETA)/base.txz
+
 # 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

Modified: trunk/freebsd-manpages/debian/watch
===================================================================
--- trunk/freebsd-manpages/debian/watch	2014-09-24 18:30:51 UTC (rev 5567)
+++ trunk/freebsd-manpages/debian/watch	2014-09-24 19:02:55 UTC (rev 5568)
@@ -4,3 +4,4 @@
 # doesn't seem to work with FTP while directory links with trailing
 # slash don't seem to work with HTTP. *sigh*
 http://ftp.freebsd.org/pub/FreeBSD/releases/i386/ (\d+.\d+)-RELEASE/
+http://ftp.freebsd.org/pub/FreeBSD/releases/i386/ (\d+.\d+-BETA\d*)/