[Tux4kids-commits] r349 - in tuxtype/people/holger: . tuxtype/debian tuxtype-data-nonfree/debian

[h01ger-guest at alioth.debian.org]

Author: h01ger-guest
Date: 2007-12-01 01:29:54 +0000 (Sat, 01 Dec 2007)
New Revision: 349

Modified:
   tuxtype/people/holger/make_debian_packages
   tuxtype/people/holger/tuxtype-data-nonfree/debian/changelog
   tuxtype/people/holger/tuxtype/debian/changelog
Log:
preparing 1.5.16

Modified: tuxtype/people/holger/make_debian_packages
===================================================================
--- tuxtype/people/holger/make_debian_packages	2007-11-29 11:05:49 UTC (rev 348)
+++ tuxtype/people/holger/make_debian_packages	2007-12-01 01:29:54 UTC (rev 349)
@@ -30,28 +30,33 @@
 mkdir results
 cd results
 
-tar xzf tuxtype-$1.tar.gz
+if [ ! -f tuxtype_${1}.dfsg1.orig.tar.gz ] ; then
+	# untar orig tar
+	tar xzf tuxtype-$1.tar.gz
 
-# split into dfsg-free and dfsg-nonfree tarballs
-mkdir -p tuxtype-data-nonfree-$1.dfsgnonfree1/usr/share/tuxtype/data/sounds
-mv tuxtype-$1 tuxtype-$1.dfsg1
-mv ./tuxtype-$1.dfsg1/tuxtype/data/sounds/kmus?.wav tuxtype-data-nonfree-$1.dfsgnonfree1/usr/share/tuxtype/data/sounds
-mv ./tuxtype-$1.dfsg1/tuxtype/data/sounds/click.wav tuxtype-data-nonfree-$1.dfsgnonfree1/usr/share/tuxtype/data/sounds
-cd tuxtype-$1.dfsg1/tuxtype/data/sounds
-cat Makefile.am | grep -v click.wav | grep -v kmus > Makefile.am.new
-rm Makefile.am
-mv Makefile.am.new Makefile.am
-cat Makefile.in | grep -v click.wav | grep -v kmus > Makefile.in.new
-rm Makefile.in
-mv Makefile.in.new Makefile.in
-cd ../../../..
+	# split into dfsg-free and dfsg-nonfree tarballs
+	mkdir -p tuxtype-data-nonfree-$1.dfsgnonfree1/usr/share/tuxtype/data/sounds
+	mv tuxtype-$1 tuxtype-$1.dfsg1
+	mv ./tuxtype-$1.dfsg1/tuxtype/data/sounds/kmus?.wav tuxtype-data-nonfree-$1.dfsgnonfree1/usr/share/tuxtype/data/sounds
+	mv ./tuxtype-$1.dfsg1/tuxtype/data/sounds/click.wav tuxtype-data-nonfree-$1.dfsgnonfree1/usr/share/tuxtype/data/sounds
+	cd tuxtype-$1.dfsg1/tuxtype/data/sounds
+	cat Makefile.am | grep -v click.wav | grep -v kmus > Makefile.am.new
+	rm Makefile.am
+	mv Makefile.am.new Makefile.am
+	cat Makefile.in | grep -v click.wav | grep -v kmus > Makefile.in.new
+	rm Makefile.in
+	mv Makefile.in.new Makefile.in
+	cd ../../../..
 
+	# create dfsg(-nonfree) orig tars
+	tar czvf tuxtype_${1}.dfsg1.orig.tar.gz ./tuxtype-$1.dfsg1
+	tar czvf tuxtype-data-nonfree_${1}.dfsgnonfree1.orig.tar.gz ./tuxtype-data-nonfree-$1.dfsgnonfree1
+else
+	# untar orig tars
+	tar xzvf tuxtype_${1}.dfsg1.orig.tar.gz
+	tar xzvf tuxtype-data-nonfree_${1}.dfsgnonfree1.orig.tar.gz
+fi
 
-tar czvf tuxtype_${1}.dfsg1.orig.tar.gz ./tuxtype-$1.dfsg1
-tar czvf tuxtype-data-nonfree_${1}.dfsgnonfree1.orig.tar.gz ./tuxtype-data-nonfree-$1.dfsgnonfree1
-
-
-
 cd tuxtype-$1.dfsg1
 svn export  svn://svn.debian.org/svn/tux4kids/tuxtype/people/holger/tuxtype/debian
 cd ..
@@ -60,7 +65,6 @@
 cd ..
 
 cd ./tuxtype-$1.dfsg1
-# remove "-v1.0.4" once the new tuxtype version is in sid
 nice fakeroot dpkg-buildpackage  -uc -us -S
 cd ..
 

Modified: tuxtype/people/holger/tuxtype/debian/changelog
===================================================================
--- tuxtype/people/holger/tuxtype/debian/changelog	2007-11-29 11:05:49 UTC (rev 348)
+++ tuxtype/people/holger/tuxtype/debian/changelog	2007-12-01 01:29:54 UTC (rev 349)
@@ -1,3 +1,10 @@
+tuxtype (1.5.16.dfsg1-1) unstable; urgency=low
+
+  * new upstream version, containing new Wolof and Czech themes and a fixed
+    Russian theme
+
+ -- Holger Levsen <holger at debian.org>  Fri, 30 Nov 2007 01:45:18 +0100
+
 tuxtype (1.5.15.dfsg1-3) unstable; urgency=low
 
   * tuxmath.desktop: now in the category Games/KidsGame

Modified: tuxtype/people/holger/tuxtype-data-nonfree/debian/changelog
===================================================================
--- tuxtype/people/holger/tuxtype-data-nonfree/debian/changelog	2007-11-29 11:05:49 UTC (rev 348)
+++ tuxtype/people/holger/tuxtype-data-nonfree/debian/changelog	2007-12-01 01:29:54 UTC (rev 349)
@@ -1,3 +1,9 @@
+tuxtype-data-nonfree (1.5.16.dfsgnonfree1-1) unstable; urgency=low
+
+  * new upstream version 
+
+ -- Holger Levsen <holger at debian.org>  Fri, 30 Nov 2007 01:13:36 +0100
+
 tuxtype-data-nonfree (1.5.15.dfsgnonfree1-3) unstable; urgency=low
 
   * added Homepage: and Vcs-*: fields to debian/control