[SCM] InfiniMiner/Minecraft-inspired open game world branch, master, updated. upstream/0.2.20110731.3-29-g29f7114

[Michael Gilbert]

The following commit has been merged in the master branch:
commit 37543c5f2c3bd069f834311cb36f245db562adad
Author: Michael Gilbert <michael.s.gilbert at gmail.com>
Date:   Sun Nov 27 03:04:19 2011 -0500

    dfsg-free get-orig-source

diff --git a/debian/changelog b/debian/changelog
index 9e81b98..991d066 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 minetest (0.3.1-2) unstable; urgency=low
 
   * Update homepage.
+  * Build against jthread 1.3.1.
+  * Implement get-orig-source to generate dfsg-free upstream tarball.
 
  -- Michael Gilbert <michael.s.gilbert at gmail.com>  Sat, 26 Nov 2011 22:27:53 -0500
 
diff --git a/debian/rules b/debian/rules
index 6b1437e..38e6d27 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,10 @@
 #!/usr/bin/make -f
 
+# upstream version
+version=$(shell uscan --report-status | head -2 | tail -1 | cut -d' ' -f7 | cut -d, -f1)
+tmpdir:=$(shell mktemp -d)
+wrkdir:=$(shell pwd)
+
 # parallel building
 parallel=$(shell echo $$DEB_BUILD_OPTIONS | grep parallel > /dev/null && echo -j$$(test -f /proc/cpuinfo && cat /proc/cpuinfo | grep ^processor | wc -l || echo 1))
 
@@ -10,36 +15,38 @@ LDFLAGS=$(shell DEB_BUILD_MAINT_OPTIONS="hardening=${options}" dpkg-buildflags -
 CXXFLAGS=$(shell DEB_BUILD_MAINT_OPTIONS="hardening=${options}" dpkg-buildflags --get CXXFLAGS)
 CPPFLAGS=$(shell DEB_BUILD_MAINT_OPTIONS="hardening=${options}" dpkg-buildflags --get CPPFLAGS)
 
+# file names
 sources=$(shell find . -name *.cpp)
 headers=$(shell find . -name *.h)
+dfsgremovals=.gitignore \
+	     .gitattributes \
+	     .hg_archival \
+	     .hg_archival.txt \
+	     .hgignore \
+	     .hgtags \
+	     fontlucida.png \
+	     jthread \
+	     sqlite
+cleanremovals= bin \
+	       CMakeFiles \
+	       src/CMakeFiles \
+	       CMakeCache.txt \
+	       CPackConfig.cmake \
+	       CPackSourceConfig.cmake \
+	       Makefile \
+	       cmake_install.cmake \
+	       old/Makefile.bak \
+	       src/Makefile \
+	       src/cmake_config.h \
+	       src/cmake_install.cmake \
+	       locale \
+	       install_manifest.txt
 
 override_dh_auto_clean:
 	dh_clean
 	sed -e s/jthread\:\:JMutex/JMutex/g -e s/jthread\:\:JThread/JThread/g \
 	    -i ${sources} ${headers}
-	rm -rf bin \
-	    .gitignore \
-	    .hg_archival \
-	    .hg_archival.txt \
-	    .hgignore \
-	    .hgtags \
-	    CMakeFiles \
-	    src/CMakeFiles \
-	    CMakeCache.txt \
-	    CPackConfig.cmake \
-	    CPackSourceConfig.cmake \
-	    Makefile \
-	    cmake_install.cmake \
-	    old/Makefile.bak \
-	    src/Makefile \
-	    src/cmake_config.h \
-	    src/cmake_install.cmake \
-	    src/jthread \
-	    src/sqlite \
-	    locale \
-	    install_manifest.txt \
-	    data/menulogo.png \
-	    data/fontlucida.png
+	rm -rf ${cleanremovals}
 
 override_dh_auto_configure:
 	CFLAGS="${CFLAGS}" \
@@ -52,5 +59,15 @@ override_dh_auto_build:
 	    -i ${sources} ${headers}
 	make VERBOSE=1 ${parallel}
 
+get-orig-source:
+	uscan && mv ../${version} ../minetest_${version}.orig.tar.gz || true
+	cd ${tmpdir} && \
+	    tar xf ${wrkdir}/../minetest_${version}.orig.tar.gz && \
+	    for file in ${dfsgremovals}; do \
+	        find . -name $$file -execdir rm -rf {} \; 2>/dev/null || true; \
+		done && \
+	    tar czf ${wrkdir}/../minetest_${version}+dfsg.orig.tar.gz *
+	rm -rf ${tmpdir}
+
 %:
 	dh ${@} 

-- 
InfiniMiner/Minecraft-inspired open game world