[SCM] advanced 3D real time strategy game engine branch, master, updated. debian/85.0+dfsg1-3-3-g4fa6370

[Jan Dittberner]

The following commit has been merged in the master branch:
commit 4fa6370ea054a37c26adaf3c97900aec8a1a6ed7
Author: Jan Dittberner <jan at dittberner.info>
Date:   Sun Mar 11 18:22:37 2012 +0100

    New upstream version, fixes for repacking
    
    * New upstream version.
    * remove include/GL and include/SDL when repacking upstream tarball
    * debian/rules: remove unneeded repacking from get-orig-source target.
      Repacking is done in debian/new-upstream that is called by uscan

diff --git a/debian/README.source b/debian/README.source
index 8e2364e..35fd141 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -16,8 +16,14 @@ installer/nsis_plugins/FindProcDLL.dll
 installer/7za.exe
 installer/dos2unix.exe
 
+The following subdirectories have been removed because system libraries are
+used instead:
+
+include/GL
+include/SDL
+
 To get an upstream tarball with the files removed you can execute
 
 debian/rules get-orig-source
 
- -- Jan Dittberner <jandd at debian.org>, Thu, 18 Feb 2010 22:41:11 +0100
+ -- Jan Dittberner <jandd at debian.org>, Sun, 11 Mar 2012 18:09:12 +0100
diff --git a/debian/changelog b/debian/changelog
index 055c15d..459918d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+spring (87.0+dfsg1-1) UNRELEASED; urgency=low
+
+  * New upstream version.
+  * remove include/GL and include/SDL when repacking upstream tarball
+  * debian/rules: remove unneeded repacking from get-orig-source target.
+    Repacking is done in debian/new-upstream that is called by uscan
+
+ -- Jan Dittberner <jandd at debian.org>  Sun, 11 Mar 2012 18:10:59 +0100
+
 spring (85.0+dfsg1-3) unstable; urgency=low
 
   * Fixes compilation problems under boost 1.48 (Closes: #660450).
diff --git a/debian/new-upstream b/debian/new-upstream
index 53526a6..4707cc1 100755
--- a/debian/new-upstream
+++ b/debian/new-upstream
@@ -34,14 +34,16 @@ set -e
 
 cd "$dir"
 tar xzf "$filename"
-rm -f spring_$version/AI/Interfaces/Java/data/jlib/vecmath.jar \
-      spring_$version/AI/Interfaces/Java/data/jlib/jna.jar \
-      spring_$version/installer/7za.exe \
-      spring_$version/installer/dos2unix.exe \
-      spring_$version/installer/nsis_plugins/FindProcDLL.dll \
-      spring_$version/installer/nsis_plugins/inetc.dll \
-      spring_$version/installer/nsis_plugins/registry.dll \
-      spring_$version/installer/nsis_plugins/nsis7z.dll
+rm -rf spring_$version/AI/Interfaces/Java/data/jlib/vecmath.jar \
+       spring_$version/AI/Interfaces/Java/data/jlib/jna.jar \
+       spring_$version/installer/7za.exe \
+       spring_$version/installer/dos2unix.exe \
+       spring_$version/installer/nsis_plugins/FindProcDLL.dll \
+       spring_$version/installer/nsis_plugins/inetc.dll \
+       spring_$version/installer/nsis_plugins/registry.dll \
+       spring_$version/installer/nsis_plugins/nsis7z.dll \
+       spring_$version/include/SDL \
+       spring_$version/include/GL
 tar czf "$origname" spring_$version
 echo "Repacked tarball is $origname"
 cd -
diff --git a/debian/rules b/debian/rules
index 32dfb74..283e7af 100755
--- a/debian/rules
+++ b/debian/rules
@@ -63,17 +63,7 @@ get-orig-source:
 	DFSGVER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p'); \
 	VER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+).*,\1,p'); \
 	TMPDIR=`mktemp --directory`; \
-	uscan --force-download --rename --download-version=$$VER --destdir="$$TMPDIR"; \
-	cd "$$TMPDIR"; \
-	tar xzf spring_$$VER.orig.tar.gz; \
-	rm -f spring_$$VER/AI/Interfaces/Java/data/jlib/vecmath.jar \
-	      spring_$$VER/AI/Interfaces/Java/data/jlib/jna.jar \
-	      spring_$$VER/installer/7za.exe \
-	      spring_$$VER/installer/dos2unix.exe \
-	      spring_$$VER/installer/nsis_plugins/FindProcDLL.dll \
-	      spring_$$VER/installer/nsis_plugins/inetc.dll \
-	      spring_$$VER/installer/nsis_plugins/registry.dll; \
-	tar czf spring_$$DFSGVER.orig.tar.gz spring_$$VER; \
+	uscan --force-download --download-version=$$VER --destdir="$$TMPDIR"; \
 	cd "$(CURDIR)"; mv "$$TMPDIR/spring_$$DFSGVER.orig.tar.gz" .; \
 	rm -rf "$$TMPDIR"
 

-- 
advanced 3D real time strategy game engine