[Tux4kids-commits] r1678 - tuxtype/people/holger

[Holger Levsen]

Author: holger
Date: 2009-11-25 12:35:55 +0000 (Wed, 25 Nov 2009)
New Revision: 1678

Removed:
   tuxtype/people/holger/split_tarball
   tuxtype/people/holger/tuxtype-data-nonfree/
Modified:
   tuxtype/people/holger/README
   tuxtype/people/holger/todo
Log:
tuxtype-data-nonfree is no more

Modified: tuxtype/people/holger/README
===================================================================
--- tuxtype/people/holger/README	2009-11-25 12:33:03 UTC (rev 1677)
+++ tuxtype/people/holger/README	2009-11-25 12:35:55 UTC (rev 1678)
@@ -5,9 +5,8 @@
 == 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
+svn co svn://svn.debian.org/svn/tux4kids/tuxtype/people/holger/tuxtype
+cd tuxtype/trunk
 dpkg-checkbuilddeps
 svn-buildpackage
 ----
@@ -19,6 +18,3 @@
 
 Use at your own risk.
 
-== about tuxtype and tuxtype-nonfree
-
-to be written, check the BTS!

Deleted: tuxtype/people/holger/split_tarball
===================================================================
--- tuxtype/people/holger/split_tarball	2009-11-25 12:33:03 UTC (rev 1677)
+++ tuxtype/people/holger/split_tarball	2009-11-25 12:35:55 UTC (rev 1678)
@@ -1,65 +0,0 @@
-#!/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 ] && [ ! -f tuxtype/tarballs/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
-
-	# generate hash
-        for i in tuxtype_${1}.dfsg1.orig.tar.gz tuxtype-data-nonfree_${1}.dfsgnonfree1.orig.tar.gz ; do
-		sha1sum $i > $i.sha1
-		md5sum $i > $i.md5      
-		gpg -b -a $i.sha1
-		gpg -b -a $i.md5
-	done
-
-	# place in svn 
-	mv -v tuxtype_${1}.dfsg1.orig.tar.gz* tuxtype/tarballs/
-	mv -v tuxtype-data-nonfree_${1}.dfsgnonfree1.orig.tar.gz* tuxtype-data-nonfree/tarballs/
-	svn add tuxtype/tarballs/tuxtype_${1}.dfsg1.orig.tar.gz*
-	svn add tuxtype-data-nonfree/tarballs/tuxtype-data-nonfree_${1}.dfsgnonfree1.orig.tar.gz*
-        svn status tuxtype/tarballs/ tuxtype-data-nonfree/tarballs/
-  
-fi

Modified: tuxtype/people/holger/todo
===================================================================
--- tuxtype/people/holger/todo	2009-11-25 12:33:03 UTC (rev 1677)
+++ tuxtype/people/holger/todo	2009-11-25 12:35:55 UTC (rev 1678)
@@ -1,12 +1,21 @@
+Similarly, we are going to
+put tuxtype's global settings in the proper location under /etc which will
+be "/etc/tuxtype". This requires a configure flag of "--sysconfdir=/etc".  I
+use the following args in the specfile to build the rpms:
+
+%configure --disable-rpath \
+           --prefix=%_prefix \
+           --localstatedir=%_localstatedir \
+           --sysconfdir=%_sysconfdir
+
+However, tuxtype does not yet actually use either of these new locations.
+
+
 known issues
 
 
-.16
----
-fonts muessen weg ausm source paket
 
 
-
 /usr/mhare/tuxtype/data/themes/malayalam/images/keyboard/key.png
 /usr/share/tuxtype/data/themes/malayalam/images/splat0.png
 /usr/share/tuxtype/data/themes/malayalam/images/status/score.png