r4903 - packages/trunk/boswars/debian

[Cyril Brulebois]

Author: kibi-guest
Date: 2007-12-12 01:25:26 +0000 (Wed, 12 Dec 2007)
New Revision: 4903

Modified:
   packages/trunk/boswars/debian/changelog
   packages/trunk/boswars/debian/rules
Log:
Improve Barry's get-orig-source target

Modified: packages/trunk/boswars/debian/changelog
===================================================================
--- packages/trunk/boswars/debian/changelog	2007-12-12 00:58:39 UTC (rev 4902)
+++ packages/trunk/boswars/debian/changelog	2007-12-12 01:25:26 UTC (rev 4903)
@@ -2,12 +2,15 @@
 
   [ Cyril Brulebois]
   * Initial release (Closes: #437382).
+  * Repack because of included “.dll” files.
   * Notes:
      - Upstream says both lua5.0 and lua5.1 should be fine, hence the
        alternative in Build-Depends.
      - No menu icon yet, since upstream's .ico seems not to be representative
        of the game.
   * Add Homepage entry to debian/control, use Vcs-*.
+  * Add get-orig-source target to debian/rules, based on Barry's, and a bit
+    more generic (independent of the version number).
 
   [ Barry deFreese ]
   * New upstream release (from 2.4 to 2.4.1).
@@ -23,7 +26,6 @@
     + Fix char* -> const char* issues in lua code
   * Repack tarball to remove dll files
   * Add README.Debian-source to describe repack
-  * Add get-orig-source target to rules (Probably needs improvement)
   * Update watch file to mangle dfsg version
 
  -- Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>  Thu, 01 Nov 2007 03:31:24 +0100

Modified: packages/trunk/boswars/debian/rules
===================================================================
--- packages/trunk/boswars/debian/rules	2007-12-12 00:58:39 UTC (rev 4902)
+++ packages/trunk/boswars/debian/rules	2007-12-12 01:25:26 UTC (rev 4903)
@@ -6,6 +6,10 @@
 
 include /usr/share/quilt/quilt.make
 
+# Compute upstream version
+UPSTREAM_VERSION = $(shell dpkg-parsechangelog | grep ^Version: \
+		| awk '{print $$2}' | perl -pe 's/(?:\.dfsg)?-\d+$$//')
+
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
@@ -118,14 +122,14 @@
 
 get-orig-source:
 	dh_testdir
-	dh_testroot
-	wget http://www.boswars.org/dist/releases/boswars-2.4.1-src.tar.gz
-	tar -xzf boswars-2.4.1-src.tar.gz
-	find ./ -name *.dll |xargs rm -rf
-	mv boswars-2.4.1-src boswars-2.4.1.orig
-	tar zcf boswars_2.4.1.orig.tar.gz boswars-2.4.1.orig
-	rm -rf boswars-2.4.1-src.tar.gz
-	rm -rf boswars-2.4.1.orig
+	wget http://www.boswars.org/dist/releases/boswars-$(UPSTREAM_VERSION)-src.tar.gz
+	tar xfz boswars-$(UPSTREAM_VERSION)-src.tar.gz
+	find boswars-$(UPSTREAM_VERSION)-src -name '*.dll' -delete
+	mv boswars-$(UPSTREAM_VERSION)-src boswars-$(UPSTREAM_VERSION).orig
+	tar cfz ../boswars_$(UPSTREAM_VERSION).orig.tar.gz \
+		boswars-$(UPSTREAM_VERSION).orig
+	rm -f boswars-$(UPSTREAM_VERSION)-src.tar.gz
+	rm -rf boswars-$(UPSTREAM_VERSION).orig
 
 binary: binary-arch binary-indep
 .PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure get-orig-source