[Tux4kids-commits] r973 - in tuxtype/people/holger: . tuxtype tuxtype/trunk tuxtype/trunk/debian tuxtype-data-nonfree tuxtype-data-nonfree/trunk tuxtype-data-nonfree/trunk/debian
Holger Levsen
holger at alioth.debian.org
Sat May 9 17:38:41 UTC 2009
Author: holger
Date: 2009-05-09 17:38:41 +0000 (Sat, 09 May 2009)
New Revision: 973
Added:
tuxtype/people/holger/README
tuxtype/people/holger/split_tarball
tuxtype/people/holger/tuxtype-data-nonfree/branches/
tuxtype/people/holger/tuxtype-data-nonfree/tags/
tuxtype/people/holger/tuxtype-data-nonfree/tarballs/
tuxtype/people/holger/tuxtype-data-nonfree/trunk/
tuxtype/people/holger/tuxtype-data-nonfree/trunk/debian/
tuxtype/people/holger/tuxtype/branches/
tuxtype/people/holger/tuxtype/tags/
tuxtype/people/holger/tuxtype/tarballs/
tuxtype/people/holger/tuxtype/trunk/
tuxtype/people/holger/tuxtype/trunk/debian/
Removed:
tuxtype/people/holger/make_debian_packages
tuxtype/people/holger/tuxtype-data-nonfree/debian/
tuxtype/people/holger/tuxtype/debian/
Log:
on 2006-07-18 I initially commited make_debian_package which the commit message "(it) is a hack, i really want to use svn-buildpackage, but for now its ok" - today I finally switched to svn-buildpackage :-)
looking forward to the day switching to git-buildpackage ;-)
Copied: tuxtype/people/holger/README (from rev 968, tuxmath/people/holger/README)
===================================================================
--- tuxtype/people/holger/README (rev 0)
+++ tuxtype/people/holger/README 2009-05-09 17:38:41 UTC (rev 973)
@@ -0,0 +1,24 @@
+== Requirements:
+
+a debian system with subversion, svn-buildpackage and fakeroot installed.
+
+== Steps to build:
+
+----
+svn co svn://svn.debian.org/svn/tux4kids/tuxtype/people/holger/trunk
+svn co svn://svn.debian.org/svn/tux4kids/tuxtype/people/holger/tarballs
+cd trunk
+dpkg-checkbuilddeps
+svn-buildpackage
+----
+Building with local changes:
+
+----
+svn-buildpackage --svn-ignore
+----
+
+Use at your own risk.
+
+== about tuxtype and tuxtype-nonfree
+
+to be written, check the BTS!
Property changes on: tuxtype/people/holger/README
___________________________________________________________________
Added: svn:mergeinfo
+
Deleted: tuxtype/people/holger/make_debian_packages
===================================================================
--- tuxtype/people/holger/make_debian_packages 2009-05-09 14:55:46 UTC (rev 972)
+++ tuxtype/people/holger/make_debian_packages 2009-05-09 17:38:41 UTC (rev 973)
@@ -1,114 +0,0 @@
-#!/bin/bash
-
-# copyright 2006-2008 Holger Levsen
-# released under the GPL version2
-#
-# attack of the ugly scripts! i think i want to learn about svn-buildpackage next...
-
-
-which fakeroot > /dev/null || {
- echo error: please install the fakeroot package
- exit 1
-}
-which dpkg-source > /dev/null || {
- echo error: please install the dpkg-dev package
- exit 1
-}
-which debdiff > /dev/null || {
- echo error: please install the devscripts package
- exit 1
-}
-
-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
-if [ ! $3 ] ; then
- NFV=$2
-else
- NFV=$3
-fi
-
-mkdir results
-cd results
-
-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 ../../../..
-
- # 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
-
-cd tuxtype-$1.dfsg1
-#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
-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 -I.svn -uc -us -S || exit 1
-cd ..
-
-cd tuxtype-data-nonfree-$1.dfsgnonfree1
-nice fakeroot dpkg-buildpackage -I.svn -uc -us -S || exit 1
-cd ..
-
-rm ./tuxtype-$1.dfsg1 -r
-rm ./tuxtype-data-nonfree-$1.dfsgnonfree1 -r
-
-# temp. for developing - use pbuilder for real
-# (and make this conditional)
-dpkg-source -x tuxtype-data-nonfree_$1.dfsgnonfree1-$NFV.dsc || exit 1
-cd tuxtype-data-nonfree-$1.dfsgnonfree1/
-dpkg-buildpackage -uc -us -rfakeroot || exit 1
-cd ..
-dpkg-source -x tuxtype_$1.dfsg1-$2.dsc || exit 1
-cd tuxtype-$1.dfsg1
-dpkg-buildpackage -uc -us -rfakeroot || exit 1
-cd ..
-
-rm ./tuxtype-$1.dfsg1 -r
-rm ./tuxtype-data-nonfree-$1.dfsgnonfree1 -r
-
-for i in tuxtype_$1.dfsg1-$2.dsc tuxtype-data-nonfree_$1.dfsgnonfree1-$NFV.dsc ; do {
- echo lintian runs for $i
- lintian $i
- echo
-} ; done
-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 lintian runs for $i
- lintian $i
- echo
-} ; done
-
-echo
-echo now run
-echo pbuilder build tuxtype_$1.dfsg1-$2.dsc
-echo pbuilder build tuxtype-data-nonfree_$1.dfsgnonfree1-$NFV.dsc
-echo if you plan to upload the package
-
Copied: tuxtype/people/holger/split_tarball (from rev 961, tuxtype/people/holger/make_debian_packages)
===================================================================
--- tuxtype/people/holger/split_tarball (rev 0)
+++ tuxtype/people/holger/split_tarball 2009-05-09 17:38:41 UTC (rev 973)
@@ -0,0 +1,50 @@
+#!/bin/bash -e
+
+# copyright 2009 Holger Levsen
+# released under the GPL version2
+#
+set -x
+set -e
+
+if [ ! $1 ] ; then echo "upstream version missing, e.g. 1.5.6"; exit 1 ; fi
+
+if [ ! -f tuxtype_${1}.dfsg1.orig.tar.gz ] ; then
+ if [ -d tuxtype-$1 ] ; then
+ echo "./tuxtype-$1/ exists, aborting."
+ exit 1
+ else
+ mkdir tuxtype-$1
+ fi
+
+ # untar orig tar
+ if [ -f tuxtype-$1.tar.gz ] ; then
+ tar xzf tuxtype-$1.tar.gz -C tuxtype-$1
+ elif [ -f tuxtype_w_fonts-$1.tar.gz ] ; then
+ tar xzf tuxtype_w_fonts-$1.tar.gz -C tuxtype-$1
+ else
+ echo "Neither tuxtype-$1.tar.gz nor tuxtype_w_fonts-$1.tar.gz found, exiting."
+ exit 1
+ fi
+
+ # 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
+ rmdir tuxtype-$1
+ mv ./tuxtype-$1.dfsg1/data/sounds/kmus?.wav tuxtype-data-nonfree-$1.dfsgnonfree1/usr/share/tuxtype/data/sounds
+ mv ./tuxtype-$1.dfsg1/data/sounds/click.wav tuxtype-data-nonfree-$1.dfsgnonfree1/usr/share/tuxtype/data/sounds
+ cd tuxtype-$1.dfsg1/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
+
+ # cleanup
+ rm tuxtype-$1.dfsg1 tuxtype-data-nonfree-$1.dfsgnonfree1 -Rf
+fi
Property changes on: tuxtype/people/holger/split_tarball
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mergeinfo
+
Property changes on: tuxtype/people/holger/tuxtype/trunk/debian
___________________________________________________________________
Added: svn:mergeinfo
+
Property changes on: tuxtype/people/holger/tuxtype-data-nonfree/trunk/debian
___________________________________________________________________
Added: svn:mergeinfo
+
More information about the Tux4kids-commits
mailing list