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

[Axel Beckert]

Author: abe
Date: 2013-10-19 22:55:42 +0000 (Sat, 19 Oct 2013)
New Revision: 5075

Modified:
   trunk/freebsd-manpages/debian/changelog
   trunk/freebsd-manpages/debian/rules
Log:
Fix get-orig-source target and reupload with fixed orig.tar.xz

* Fix get-orig-source target to use versioned file names for the
  downloaded base.txz file. Avoids reusing the previous release's
  base.txz file.
* Restrict targets for "dh $@" to not match get-orig-source
* Use tar option --no-xattrs instead of ignoring tar's exit code due to
  unknown extended header keywords as present in FreeBSD's tar balls.
* Reupload with correctly generated orig.tar.xz



Modified: trunk/freebsd-manpages/debian/changelog
===================================================================
--- trunk/freebsd-manpages/debian/changelog	2013-10-19 21:30:09 UTC (rev 5074)
+++ trunk/freebsd-manpages/debian/changelog	2013-10-19 22:55:42 UTC (rev 5075)
@@ -1,3 +1,15 @@
+freebsd-manpages (9.2+1-1) unstable; urgency=low
+
+  * Fix get-orig-source target to use versioned file names for the
+    downloaded base.txz file. Avoids reusing the previous release's
+    base.txz file.
+  * Restrict targets for "dh $@" to not match get-orig-source
+  * Use tar option --no-xattrs instead of ignoring tar's exit code due to
+    unknown extended header keywords as present in FreeBSD's tar balls.
+  * Reupload with correctly generated orig.tar.xz
+
+ -- Axel Beckert <abe at debian.org>  Sun, 20 Oct 2013 00:41:52 +0200
+
 freebsd-manpages (9.2-1) unstable; urgency=low
 
   * New upstream version.

Modified: trunk/freebsd-manpages/debian/rules
===================================================================
--- trunk/freebsd-manpages/debian/rules	2013-10-19 21:30:09 UTC (rev 5074)
+++ trunk/freebsd-manpages/debian/rules	2013-10-19 22:55:42 UTC (rev 5075)
@@ -5,7 +5,7 @@
 DESTDIR=$(CURDIR)/debian/freebsd-manpages
 VER=9.2
 
-%:
+b% i% c%:
 	dh $@
 
 override_dh_install:
@@ -21,13 +21,11 @@
 
 # make -f debian/rules get-orig-source
 get-orig-source: ../freebsd-manpages_$(VER).orig.tar.xz
-../freebsd-manpages_$(VER).orig.tar.xz: ../base.txz
+../freebsd-manpages_$(VER).orig.tar.xz: ../base-$(VER).txz
 	mkdir -pv debian/repack
-	# Ignore tar's exit code as both, BSD and GNU tar errors out
-	# on unknown extended header keywords as present in FreeBSD's
-	# tar balls.
-	cd debian/repack; tar xvJf ../../../base.txz ./usr/share/man/man2 ./usr/share/man/man3 ./usr/share/man/man4 ./usr/share/man/man9 || exit 0
+	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
-../base.txz:
-	cd ../;wget http://ftp.freebsd.org/pub/FreeBSD/releases/i386/$(VER)-RELEASE/base.txz
+
+../base-$(VER).txz:
+	wget -O $@ http://ftp.freebsd.org/pub/FreeBSD/releases/i386/$(VER)-RELEASE/base.txz