[Tux4kids-commits] r374 - in tuxtype/people/holger: . tuxtype/debian

[holger at alioth.debian.org]

Author: holger
Date: 2007-12-14 17:18:16 +0000 (Fri, 14 Dec 2007)
New Revision: 374

Modified:
   tuxtype/people/holger/make_debian_packages
   tuxtype/people/holger/tuxtype/debian/rules
   tuxtype/people/holger/tuxtype/debian/tuxtype.install
Log:
more build fixes

Modified: tuxtype/people/holger/make_debian_packages
===================================================================
--- tuxtype/people/holger/make_debian_packages	2007-12-14 16:34:04 UTC (rev 373)
+++ tuxtype/people/holger/make_debian_packages	2007-12-14 17:18:16 UTC (rev 374)
@@ -58,18 +58,24 @@
 fi
 
 cd tuxtype-$1.dfsg1
-svn export  svn://svn.debian.org/svn/tux4kids/tuxtype/people/holger/tuxtype/debian
+#svn export  svn://svn.debian.org/svn/tux4kids/tuxtype/people/holger/tuxtype/debian
+rm debian -Rf
+cp -ax ../../tuxtype/debian .
+find ./debian -name .svn -exec rm \{\} -rf \;
 cd ..
 cd tuxtype-data-nonfree-$1.dfsgnonfree1
-svn export  svn://svn.debian.org/svn/tux4kids/tuxtype/people/holger/tuxtype-data-nonfree/debian
+#svn export  svn://svn.debian.org/svn/tux4kids/tuxtype/people/holger/tuxtype-data-nonfree/debian
+rm debian -Rf
+cp -ax ../../tuxtype-data-nonfree/debian .
+find ./debian -name .svn -exec rm \{\} -rf \;
 cd ..
 
 cd ./tuxtype-$1.dfsg1
-nice fakeroot dpkg-buildpackage  -uc -us -S
+nice fakeroot dpkg-buildpackage  -I.svn -uc -us -S
 cd ..
 
 cd tuxtype-data-nonfree-$1.dfsgnonfree1
-nice fakeroot dpkg-buildpackage  -uc -us -S
+nice fakeroot dpkg-buildpackage  -I.svn -uc -us -S
 cd ..
 
 rm ./tuxtype-$1.dfsg1 -r
@@ -95,8 +101,11 @@
 	lintian $i 
 } ; done
 echo linda and lintian runs for `ls *.deb`
-linda *.deb
-lintian *.deb
+for i in  tuxtype_$1.dfsg1-$2_i386.deb  tuxtype-data_$1.dfsg1-$2_all.deb tuxtype-data-nonfree_$1.dfsgnonfree1-${NFV}_all.deb ; do {
+	echo linda and lintian runs for $i
+	linda $i
+	lintian $i
+} ; done
 
 echo
 echo now run 

Modified: tuxtype/people/holger/tuxtype/debian/rules
===================================================================
--- tuxtype/people/holger/tuxtype/debian/rules	2007-12-14 16:34:04 UTC (rev 373)
+++ tuxtype/people/holger/tuxtype/debian/rules	2007-12-14 17:18:16 UTC (rev 374)
@@ -51,7 +51,7 @@
 	rm -f build-arch-stamp build-indep-stamp install-stamp
 
 	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
+	$(MAKE) distclean
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub
 endif
@@ -68,6 +68,7 @@
 	dh_installdirs 
 	# Add here commands to install the package into debian/tuxtype.
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+#	rmdir $(CURDIR)/debian/tmp/usr/bin
 #	rm $(CURDIR)/debian/tuxtype/usr/share/tuxtype/tuxtype.ico
 #	rm $(CURDIR)/debian/tuxtype/usr/share/tuxtype/autorun.inf
 	dh_installdirs -ptuxtype-data  usr/share/

Modified: tuxtype/people/holger/tuxtype/debian/tuxtype.install
===================================================================
--- tuxtype/people/holger/tuxtype/debian/tuxtype.install	2007-12-14 16:34:04 UTC (rev 373)
+++ tuxtype/people/holger/tuxtype/debian/tuxtype.install	2007-12-14 17:18:16 UTC (rev 374)
@@ -1,2 +1 @@
 usr/games
-usr/share/tuxtype