[Tux4kids-commits] r25 - in tuxmath/people/holger: . tuxmath/debian

[holger at alioth.debian.org]

Author: holger
Date: 2006-09-06 17:28:49 +0000 (Wed, 06 Sep 2006)
New Revision: 25

Modified:
   tuxmath/people/holger/make_debian_packages
   tuxmath/people/holger/tuxmath/debian/changelog
Log:
- make_debian_packages now supports building from local copies of source and debian diretctories,  much better for testing
- package new upstream version for debian


Modified: tuxmath/people/holger/make_debian_packages
===================================================================
--- tuxmath/people/holger/make_debian_packages	2006-09-05 20:54:36 UTC (rev 24)
+++ tuxmath/people/holger/make_debian_packages	2006-09-06 17:28:49 UTC (rev 25)
@@ -9,26 +9,51 @@
 if [ "$1" == "" ] ; then echo "upstream version missing, e.g. 1.5.6"; exit 1 ; fi
 if [ "$2" == "" ] ; then echo "debian reversion missing, e.g. 1"; exit 1 ; fi
 
-mkdir results
+mkdir -p results
 cd results
 
-# checkout and prepare source
-svn export  http://svn.tux4kids.net/tuxmath/trunk ./tuxmath-$1
-#fake  begin
-#mkdir ./tuxmath-$1
-#cd ./tuxmath-$1
-#tar xf ../fake.tar
-#cd ..
-#fake end
 
-tar czvf tuxmath_${1}.orig.tar.gz ./tuxmath-$1
+#
+# checkout the code from svn if no local tuxmath_${1}.orig.tar.gz  exists
+# (this allows local modifications to the debian directory)
+#
+if [ -e ./tuxmath_${1}.orig.tar.gz ] ; then
+	#
+	# use local files
+	#
+	cp -a ../tuxmath_${1}.orig.tar.gz .
+	tar xzvf tuxmath_${1}.orig.tar.gz
 
-cd tuxmath-$1
-svn export  http://svn.tux4kids.net/tuxmath/people/holger/tuxmath/debian
+	cp -a ../tuxmath/debian ./tuxmath-$1/
 
-nice fakeroot dpkg-buildpackage -uc -us -S
+	# why?? i use -I.svn below...
+	find ./tuxmath-$1/ -name .svn -exec rm -rf \{\} \;
+else
+	#
+	# checkout and prepare source from svn
+	#
+	svn export  http://svn.tux4kids.net/tuxmath/trunk ./tuxmath-$1
+	#fake  begin
+	#mkdir ./tuxmath-$1
+	#cd ./tuxmath-$1
+	#tar xf ../fake.tar
+	#cd ..
+	#fake end
+
+	tar czvf tuxmath_${1}.orig.tar.gz ./tuxmath-$1
+
+	cd tuxmath-$1
+	svn export  http://svn.tux4kids.net/tuxmath/people/holger/tuxmath/debian
+	cd ..
+fi
+
+#
+# build source packages
+#
+
+cd ./tuxmath-$1
+nice fakeroot dpkg-buildpackage -I.svn -uc -us -S
 cd ..
-
 rm ./tuxmath-$1 -r
 
 # temp. for developing - use pbuilder for real
@@ -40,14 +65,12 @@
 
 rm ./tuxmath-$1 -r
 
-for i in  tuxmath_$1-$2.dsc ; do {
+echo
+for i in  tuxmath_$1-$2.dsc tuxmath_$1-$2_`dpkg-architecture -qDEB_BUILD_ARCH`.deb ; do {
 	echo linda and lintian runs for $i
 	linda $i
 	lintian $i 
 } ; done
-echo linda and lintian runs for `ls *.deb`
-linda *.deb
-lintian *.deb
 
 echo
 echo now run 

Modified: tuxmath/people/holger/tuxmath/debian/changelog
===================================================================
--- tuxmath/people/holger/tuxmath/debian/changelog	2006-09-05 20:54:36 UTC (rev 24)
+++ tuxmath/people/holger/tuxmath/debian/changelog	2006-09-06 17:28:49 UTC (rev 25)
@@ -1,3 +1,10 @@
+tuxmath (0.94-1) unstable; urgency=low
+
+  * new upstream version with many fixes and improvements, i.e. config files 
+    are now supported. For full details see upstream changelog.
+
+ -- Holger Levsen <debian at layer-acht.org>  Wed,  6 Sep 2006 17:12:35 +0200
+
 tuxmath (0.8-1) unstable; urgency=low
 
   * new upstream version which has a speed parameter in option screen (Closes: