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

[abe at alioth.debian.org]

Author: abe
Date: 2016-09-17 21:41:35 +0000 (Sat, 17 Sep 2016)
New Revision: 6103

Modified:
   trunk/freebsd-manpages/debian/changelog
   trunk/freebsd-manpages/debian/rules
Log:
Update get-orig-source* target to work with 10.3 and current GNU tar

Modified: trunk/freebsd-manpages/debian/changelog
===================================================================
--- trunk/freebsd-manpages/debian/changelog	2016-09-05 21:31:30 UTC (rev 6102)
+++ trunk/freebsd-manpages/debian/changelog	2016-09-17 21:41:35 UTC (rev 6103)
@@ -1,3 +1,10 @@
+freebsd-manpages (10.3-1) UNRELEASED; urgency=medium
+
+  * debian/rules: Update get-orig-source* target to cover recent tar
+    hardlink issues which caused a non-zero exit code.
+
+ -- Axel Beckert <abe at debian.org>  Sat, 17 Sep 2016 23:38:41 +0200
+
 freebsd-manpages (10.1~RC1-1) unstable; urgency=medium
 
   * New upstream release candidate

Modified: trunk/freebsd-manpages/debian/rules
===================================================================
--- trunk/freebsd-manpages/debian/rules	2016-09-05 21:31:30 UTC (rev 6102)
+++ trunk/freebsd-manpages/debian/rules	2016-09-17 21:41:35 UTC (rev 6103)
@@ -3,8 +3,8 @@
 #export DH_VERBOSE=1
 
 DESTDIR=$(CURDIR)/debian/freebsd-manpages
-VER=10.1
-BETA=RC1
+VER=10.3
+#BETA=RC1
 
 b% i% c%:
 	dh $@
@@ -23,15 +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/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
+	mkdir -pv debian/repack1 debian/repack2/usr/share/man/
+	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/
+	cd debian/repack2; 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
@@ -39,10 +35,11 @@
 # 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/repack
-	cd debian/repack; tar xvJ --no-xattrs -f ../../../base-$(VER).txz ./usr/share/man/man2 ./usr/share/man/man3 ./usr/share/man/man4 ./usr/share/man/man9
-	cd debian/repack; tar cvJf ../../../freebsd-manpages_$(VER).orig.tar.xz ./usr/share/man
-	rm -rf debian/repack
+	mkdir -pv debian/repack1 debian/repack2/usr/share/man/
+	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/
+	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