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

h01ger-guest at alioth.debian.org h01ger-guest at alioth.debian.org
Sun Sep 2 22:52:54 UTC 2007


Author: h01ger-guest
Date: 2007-09-02 22:52:54 +0000 (Sun, 02 Sep 2007)
New Revision: 224

Removed:
   tuxmath/people/holger/make_orig_tar_gz
Modified:
   tuxmath/people/holger/README
   tuxmath/people/holger/todo
   tuxmath/people/holger/tuxmath/debian/changelog
   tuxmath/people/holger/tuxmath/debian/control
   tuxmath/people/holger/tuxmath/debian/copyright
   tuxmath/people/holger/tuxmath/debian/rules
Log:
this should become 1.5.3-1

Modified: tuxmath/people/holger/README
===================================================================
--- tuxmath/people/holger/README	2007-09-02 22:15:42 UTC (rev 223)
+++ tuxmath/people/holger/README	2007-09-02 22:52:54 UTC (rev 224)
@@ -1,11 +1,10 @@
-This directory contains my ugly scripts to build tuxmath packages from svn trunk.
+This directory contain my script to build tuxmath packages. It expects a tuxmath_x.y.z.orig.tar.gz in ./results/
 
 Execute here:
 
-sh make_orig_tar_gz 1.0.1
-sh make_debian_packages 1.0.1 1
+sh make_debian_packages 1.5.3 1
 
-to build tuxmath debian packages. Increase ./tuxmath/debian/changelog if needed.
+to build tuxmath debian 1.5.3-1 packages. Increase ./tuxmath/debian/changelog if needed.
 
 Use at your own risk.
 

Deleted: tuxmath/people/holger/make_orig_tar_gz
===================================================================
--- tuxmath/people/holger/make_orig_tar_gz	2007-09-02 22:15:42 UTC (rev 223)
+++ tuxmath/people/holger/make_orig_tar_gz	2007-09-02 22:52:54 UTC (rev 224)
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-# copyright 2006 Holger Levsen
-# released under the GPL version2
-#
-# attack of the ugly scripts! i think i want to learn about svn-buildpackage next...
-
-if [ "$1" == "" ] ; then echo "upstream version missing, e.g. 0.97"; exit 1 ; fi
-
-mkdir -p results
-cd results 
-
-#
-# checkout the code from svn if no local tuxmath_${1}.orig.tar.gz  exists
-# (this allows local modifications to the debian directory)
-#
-if [ ! -e ./tuxmath_${1}.orig.tar.gz ] ; then
-        cd ../../../
-	cp -ax trunk tuxmath-${1}
-	tar --exclude=".svn" -c -z -v -f people/holger/results/tuxmath_${1}.orig.tar.gz tuxmath-${1}/
-	rm tuxmath-${1} -rf
- 	cd people/holger
-else
-	cd ..
-	echo tuxmath_${1}.orig.tar.gz already exists, exiting
-	exit 1 
-fi

Modified: tuxmath/people/holger/todo
===================================================================
--- tuxmath/people/holger/todo	2007-09-02 22:15:42 UTC (rev 223)
+++ tuxmath/people/holger/todo	2007-09-02 22:52:54 UTC (rev 224)
@@ -1,8 +1,4 @@
 general
 -------
-- get rid of make_orig_tar_gz now that "make dist" works
 - includes one font from ttf-sil-andika instead of using the system font
 
-before uploading
-----------------
-- ship README_DATA_LICENSES.TXT and update debian/copyright (include it and update copyright of the game code to david)

Modified: tuxmath/people/holger/tuxmath/debian/changelog
===================================================================
--- tuxmath/people/holger/tuxmath/debian/changelog	2007-09-02 22:15:42 UTC (rev 223)
+++ tuxmath/people/holger/tuxmath/debian/changelog	2007-09-02 22:52:54 UTC (rev 224)
@@ -1,13 +1,17 @@
-tuxmath (1.5.1.svn.20070819-1) unstable; urgency=low
+tuxmath (1.5.3-1) unstable; urgency=low
 
-  * new upstream version
+  * new upstream version with lots of improvements and bugfixes
   * new maintainer address
   * fix pathes in debian/rules for new upstream version
   * cleanup clean target in debian/rules
+  * don't ship Makefiles in binary packages
+  * added build-dependency on libsdl-ttf2.0-dev, removed the build-dependency
+    for autotools-dev, autoconf and automake1.9
+  * updated debian/copyright
 
- -- Holger Levsen <holger at debian.org>  Sun, 19 Aug 2007 15:46:31 +0200
+ -- Holger Levsen <holger at debian.org>  Sun, 02 Sep 2007 22:33:28 +0000
 
-tuxmath (1.0.1-1i) unstable; urgency=low
+tuxmath (1.0.1-1) unstable; urgency=low
 
   * new upstream release (two simple bugfixes, documentation updates)
   * added .desktop file - thanks to Oliver Grawert

Modified: tuxmath/people/holger/tuxmath/debian/control
===================================================================
--- tuxmath/people/holger/tuxmath/debian/control	2007-09-02 22:15:42 UTC (rev 223)
+++ tuxmath/people/holger/tuxmath/debian/control	2007-09-02 22:52:54 UTC (rev 224)
@@ -2,8 +2,7 @@
 Section: games
 Priority: optional
 Maintainer: Holger Levsen <holger at debian.org>
-Build-Depends: debhelper (>=4.0.0), libsdl1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libx11-6, libxext6, autotools-dev, autoconf, automake1.9
-Build-Conflicts: autoconf2.13, automake1.4
+Build-Depends: debhelper (>=4.0.0), libsdl1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl-ttf2.0-dev, libx11-6, libxext6
 Standards-Version: 3.7.2
 
 Package: tuxmath

Modified: tuxmath/people/holger/tuxmath/debian/copyright
===================================================================
--- tuxmath/people/holger/tuxmath/debian/copyright	2007-09-02 22:15:42 UTC (rev 223)
+++ tuxmath/people/holger/tuxmath/debian/copyright	2007-09-02 22:52:54 UTC (rev 224)
@@ -6,8 +6,9 @@
 It was downloaded from http://www.newbreedsoftware.com/tuxmath/download/ 
 
 Copyright: 2001-2005 Tux4Kids  http://www.tux4kids.org/
+	   2006-2007 David Bruce
 
-Upstream Author: Bill Kendrick  <bill at newbreedsoftware.com>
+Upstream Authors: Bill Kendrick  <bill at newbreedsoftware.com>, David Bruce
 
 License:
 
@@ -15,3 +16,57 @@
 Public License.
 On Debian systems, the complete text of the GNU General Public License can be
 found in the file '/usr/share/common-licenses/GPL'.
+
+About The Images and Sounds Used In This Game
+---------------------------------------------
+
+The graphics and sounds used in tuxmath are all either licensed
+under terms that allow free redistribution, or are in the public
+domain, as summarized below to the best of my (David Bruce's)
+knowledge. Licenses are GPL except as otherwise noted:
+
+data/images/backgrounds/*:
+  0.jpg - 3.jpg: Created by Sam Hart or Bill Kendrick with the GIMP.
+  4.jpg -12.jpg: Modified by David Bruce using the GIMP from images
+                 released into the public domain by NASA:
+  http://hubblesite.org/newscenter/newsdesk/archive/releases/2005/04/
+  http://hubblesite.org/newscenter/newsdesk/archive/releases/2004/52/
+  http://spaceflight.nasa.gov/gallery/images/station/crew-7/html/iss007e16249.html
+  http://spaceflight.nasa.gov/gallery/images/apollo/apollo16/html/as16-120-19187.html
+  http://hubblesite.org/newscenter/newsdesk/archive/releases/2003/24/
+  http://hubblesite.org/newscenter/newsdesk/archive/releases/2003/11/
+  http://hubblesite.org/newscenter/newsdesk/archive/releases/1999/29/
+  http://hubblesite.org/newscenter/newsdesk/archive/releases/2003/28/
+  http://hubblesite.org/newscenter/newsdesk/archive/releases/2005/12/image/a
+
+data/images/cities/*: Sam Hart/Bill Kendrick.
+data/images/comets/*: Sam Hart/Bill Kendrick, some images modified by either
+  David Bruce or Tim Holy.
+data/images/igloos/*:
+data/images/penguins/*:
+  Images either created by Tim Holy, Linnea Holy, and Kendra Swanson or modified
+  by these authors from Creative Commons-licensed material at:
+  http://www.openclipart.org/
+  (license text: http://creativecommons.org/licenses/publicdomain/)
+data/images/sprites/*:
+  All tux* images modified by David Bruce from either Larry Ewing's Tux drawing
+  or from GPL-licensed tux_config.png file in KDEArtwork from KDE. Other images
+  brought in from GPL-licensed images in Tux Typing.
+data/imates/status/*:
+  right.png, right_gray.png, left.png, left_gray.png, stop.png modified from
+  GPL-licensed KDE icons by David Bruce using the GIMP. All other images created
+  by Sam Hart or Bill Kendrick.
+data/images/title/*:
+  menu_bkg.jpg modified by David Bruce from public domain image from NASA.
+  title1.png modified by David Bruce from earlier image by Sam Hart.
+data/images/tux/*:
+  All images either created by Sam Hart or modified from Larry Ewing's
+  Tux drawing <ltlewing at isc.tamu.edu>.
+
+data/sounds/*
+  Emmett Plant (emmett at sonivius.com) is the author of tuxi.ogg and released
+  it into the public domain.
+  The brief .wav files were either made by Sam Hart or Bill Kendrick or obtained
+  from the public-domain section of www.partnersinrhyme.com.
+  The three background music files (game*.mod) are also public domain.
+

Modified: tuxmath/people/holger/tuxmath/debian/rules
===================================================================
--- tuxmath/people/holger/tuxmath/debian/rules	2007-09-02 22:15:42 UTC (rev 223)
+++ tuxmath/people/holger/tuxmath/debian/rules	2007-09-02 22:52:54 UTC (rev 224)
@@ -23,10 +23,9 @@
 	CFLAGS += -O2
 endif
 
-config.status: autogen.sh
+config.status: 
 	dh_testdir
 	# Add here commands to configure the package.
-	./autogen.sh
 	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --bindir=\$${prefix}/games
 	
 
@@ -61,6 +60,7 @@
 	mkdir -p $(CURDIR)/debian/tuxmath/usr/share/applications
 	cp $(CURDIR)/debian/tuxmath.desktop \
 		$(CURDIR)/debian/tuxmath/usr/share/applications/tuxmath.desktop
+	find $(CURDIR)/debian/tuxmath/usr/share/tuxmath -name Makefile -exec rm \{\} \;
 
 # Build architecture-independent files here.
 binary-indep: build install




More information about the Tux4kids-commits mailing list