r12374 - non-free/packages/trunk/assaultcube-data/debian

[Arand Nash]

Author: arand-guest
Date: 2011-05-14 20:31:30 +0000 (Sat, 14 May 2011)
New Revision: 12374

Modified:
   non-free/packages/trunk/assaultcube-data/debian/changelog
   non-free/packages/trunk/assaultcube-data/debian/rules
Log:
update get-orig-source

Modified: non-free/packages/trunk/assaultcube-data/debian/changelog
===================================================================
--- non-free/packages/trunk/assaultcube-data/debian/changelog	2011-05-14 20:31:18 UTC (rev 12373)
+++ non-free/packages/trunk/assaultcube-data/debian/changelog	2011-05-14 20:31:30 UTC (rev 12374)
@@ -7,13 +7,12 @@
     - Note license of manpages
     - "Files:" headers pointing at directory instead of license file.
   * Update rules, install server binaries
-    - get-orig-source no longer deletes the server binaries
-      - repack2
+    - Update get-orig-source
     - Install items package-dependent
     - Install server binaries arch-dependent
   * Create a wrapper script for the server with "--help" for manpage
 
- -- Arand Nash <ienorand at gmail.com>  Sat, 14 May 2011 12:15:01 +0100
+ -- Arand Nash <ienorand at gmail.com>  Sat, 14 May 2011 18:21:40 +0100
 
 assaultcube-data (1.1.0.4+repack1-1) unstable; urgency=low
 

Modified: non-free/packages/trunk/assaultcube-data/debian/rules
===================================================================
--- non-free/packages/trunk/assaultcube-data/debian/rules	2011-05-14 20:31:18 UTC (rev 12373)
+++ non-free/packages/trunk/assaultcube-data/debian/rules	2011-05-14 20:31:30 UTC (rev 12374)
@@ -1,16 +1,18 @@
 #!/usr/bin/make -f
 
+DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-+]+).*,\1,p')
+DEB_UPSTREAM_REPACK_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
 get-orig-source:
-	mkdir ../repack
-	uscan --force-download --destdir ../repack
-	( \
-		cd ../repack ;\
-		tar xf AssaultCube_v1.1.0.4.tar.bz2 ;\
-		rm -rf AssaultCube_v1.1.0.4/bin_unix/*client ;\
-		GZIP="--best" tar -czf assaultcube-data_1.1.0.4+repack2.orig.tar.gz AssaultCube_v1.1.0.4 ;\
-		mv assaultcube-data_1.1.0.4+repack2.orig.tar.gz .. ;\
-	)
-	rm -rf ../repack
+	uscan --noconf --force-download --download-current-version --destdir=.
+	rm -rf $(DEB_UPSTREAM_VERSION)
+	tar -xf assaultcube-data_$(DEB_UPSTREAM_VERSION).orig.tar.bz2
+	rm assaultcube-data_$(DEB_UPSTREAM_VERSION).orig.tar.bz2
+	rm -rf $(DEB_UPSTREAM_VERSION)/bin_unix/*client
+	mv $(DEB_UPSTREAM_VERSION) assaultcube-data-$(DEB_UPSTREAM_REPACK_VERSION).orig
+	GZIP=--best tar -cz --owner root --group root --mode a+rX \
+		-f assaultcube-data_$(DEB_UPSTREAM_REPACK_VERSION).orig.tar.gz \
+		assaultcube-data-$(DEB_UPSTREAM_REPACK_VERSION).orig
+	rm -r assaultcube-data-$(DEB_UPSTREAM_REPACK_VERSION).orig
 
 build:
 	# nothing