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

[holger at alioth.debian.org]

Author: holger
Date: 2008-02-13 12:34:25 +0000 (Wed, 13 Feb 2008)
New Revision: 429

Modified:
   tuxmath/people/holger/make_debian_packages
   tuxmath/people/holger/tuxmath/debian/changelog
   tuxmath/people/holger/tuxmath/debian/rules
Log:
released as 1.6.1-1

Modified: tuxmath/people/holger/make_debian_packages
===================================================================
--- tuxmath/people/holger/make_debian_packages	2008-02-12 22:53:46 UTC (rev 428)
+++ tuxmath/people/holger/make_debian_packages	2008-02-13 12:34:25 UTC (rev 429)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 
 # copyright 2006-2007 Holger Levsen
 # released under the GPL version2
@@ -34,7 +34,7 @@
 	#
 	tar xzvf tuxmath_${1}.orig.tar.gz
 
-	cp -a ../tuxmath/debian ./tuxmath-$1/
+	cp -av ../tuxmath/debian ./tuxmath-$1/
 
 	# why?? i use -I.svn below...
 	find ./tuxmath-$1/ -name .svn -exec rm -rf \{\} \;
@@ -62,7 +62,7 @@
 #
 
 cd ./tuxmath-$1
-nice fakeroot dpkg-buildpackage -I.svn -uc -us -S
+nice dpkg-buildpackage -rfakeroot -I.svn -i\/.svn\/ -uc -us -S
 cd ..
 rm ./tuxmath-$1 -r
 
@@ -70,7 +70,7 @@
 # (and make this conditional)
 dpkg-source -x tuxmath_$1-$2.dsc 
 cd tuxmath-$1
-dpkg-buildpackage -uc -us -rfakeroot
+nice dpkg-buildpackage -uc -us -rfakeroot
 # get previous version
 cd debian
 PREVIOUS_VERSION=`egrep '^[[:alnum:]]' changelog | sed -e 's/.*(\(.*\)).*/\1/' |  head -n2 | tail -1`
@@ -81,8 +81,7 @@
 
 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
+	echo lintian run for $i
 	lintian $i 
 } ; done
 
@@ -90,6 +89,7 @@
 if [ -e tuxmath_${PREVIOUS_VERSION}.dsc ] ; then
 	debdiff tuxmath_${PREVIOUS_VERSION}.dsc tuxmath_$1-$2.dsc > tuxmath_${PREVIOUS_VERSION}--$1-$2.dsc.diff
 	debdiff tuxmath_${PREVIOUS_VERSION}.dsc tuxmath_$1-$2.dsc |less
+	debdiff tuxmath_${PREVIOUS_VERSION}.dsc tuxmath_$1-$2.dsc |diffstat
 	debdiff tuxmath_${PREVIOUS_VERSION}_`dpkg-architecture -qDEB_BUILD_ARCH`.deb tuxmath_$1-$2_`dpkg-architecture -qDEB_BUILD_ARCH`.deb > tuxmath_${PREVIOUS_VERSION}--$1-$2_`dpkg-architecture -qDEB_BUILD_ARCH`.deb.diff
 	debdiff tuxmath_${PREVIOUS_VERSION}_`dpkg-architecture -qDEB_BUILD_ARCH`.deb tuxmath_$1-$2_`dpkg-architecture -qDEB_BUILD_ARCH`.deb|less
 fi

Modified: tuxmath/people/holger/tuxmath/debian/changelog
===================================================================
--- tuxmath/people/holger/tuxmath/debian/changelog	2008-02-12 22:53:46 UTC (rev 428)
+++ tuxmath/people/holger/tuxmath/debian/changelog	2008-02-13 12:34:25 UTC (rev 429)
@@ -1,14 +1,15 @@
-tuxmath (1.5.9-1) unstable; urgency=low
+tuxmath (1.6.1-1) unstable; urgency=low
 
   * new upstream version which adds French and Dutch translations as well as a
     new login system to keep track of individual student progress
   * updated to comply with policy 3.7.3.0
   * debian/copyright: remove a bogus line and clarify GPL-2 licence
-  * increased debhelper compat level to 5 
+  * increased debhelper compat level to 5
   * use dh_install as intended (with debian/tuxmath.install)
   * use dh_installdoc as intended (with debian/tuxmath.docs)
+  * only call "make clean" if Makefile exits
 
- -- Holger Levsen <holger at debian.org>  Fri, 14 Dec 2007 15:05:22 +0000
+ -- Holger Levsen <holger at debian.org>  Mon, 11 Feb 2008 18:50:54 +0100
 
 tuxmath (1.5.8-2) unstable; urgency=low
 

Modified: tuxmath/people/holger/tuxmath/debian/rules
===================================================================
--- tuxmath/people/holger/tuxmath/debian/rules	2008-02-12 22:53:46 UTC (rev 428)
+++ tuxmath/people/holger/tuxmath/debian/rules	2008-02-13 12:34:25 UTC (rev 429)
@@ -45,7 +45,7 @@
 	rm -f build-stamp 
 
 	# Add here commands to clean up after the build process.
-	$(MAKE) distclean
+	[ ! -e Makefil ] || $(MAKE) distclean
 	dh_clean 
 
 install: build
@@ -59,6 +59,7 @@
 	mkdir -p $(CURDIR)/debian/tuxmath/usr/share/applications
 	cp $(CURDIR)/debian/tuxmath.desktop \
 		$(CURDIR)/debian/tuxmath/usr/share/applications/tuxmath.desktop
+	rm $(CURDIR)/debian/tmp/usr/share/tuxmath/fonts/AndikaDesRevG.ttf
 	rmdir $(CURDIR)/debian/tmp/usr/share/tuxmath/fonts
 
 # Build architecture-independent files here.