[Tux4kids-commits] r50 - in tuxmath: people/holger
people/holger/tuxmath/debian trunk trunk/docs
holger at alioth.debian.org
holger at alioth.debian.org
Thu Mar 8 21:18:41 CET 2007
Author: holger
Date: 2006-10-08 12:07:51 +0000 (Sun, 08 Oct 2006)
New Revision: 50
Added:
tuxmath/people/holger/make_orig_tar_gz
Modified:
tuxmath/people/holger/make_debian_packages
tuxmath/people/holger/tuxmath/debian/changelog
tuxmath/people/holger/tuxmath/debian/control
tuxmath/people/holger/tuxmath/debian/rules
tuxmath/trunk/Makefile.am
tuxmath/trunk/docs/changelog
Log:
- finalized Makefile.am: removed icon* as its included in data
- adapted debian/rules to new build process, added depends on stuff needed by autogen.sh
- new build-tool: make_orig_tar_gz
Modified: tuxmath/people/holger/make_debian_packages
===================================================================
--- tuxmath/people/holger/make_debian_packages 2006-10-07 20:39:00 UTC (rev 49)
+++ tuxmath/people/holger/make_debian_packages 2006-10-08 12:07:51 UTC (rev 50)
@@ -5,8 +5,7 @@
#
# attack of the ugly scripts! i think i want to learn about svn-buildpackage next...
-
-if [ "$1" == "" ] ; then echo "upstream version missing, e.g. 1.5.6"; exit 1 ; fi
+if [ "$1" == "" ] ; then echo "upstream version missing, e.g. 0.97"; exit 1 ; fi
if [ "$2" == "" ] ; then echo "debian reversion missing, e.g. 1"; exit 1 ; fi
mkdir -p results
@@ -21,7 +20,6 @@
#
# use local files
#
- cp -a ../tuxmath_${1}.orig.tar.gz .
tar xzvf tuxmath_${1}.orig.tar.gz
cp -a ../tuxmath/debian ./tuxmath-$1/
@@ -61,7 +59,11 @@
dpkg-source -x tuxmath_$1-$2.dsc
cd tuxmath-$1
dpkg-buildpackage -uc -us -rfakeroot
+# get previous version
+cd debian
+PREVIOUS_VERSION=`egrep '^[[:alnum:]]' changelog | sed -e 's/.*(\(.*\)).*/\1/' | head -n2 | tail -1`
cd ..
+cd ..
rm ./tuxmath-$1 -r
@@ -72,6 +74,12 @@
lintian $i
} ; done
+# display and preserve debdiffs
+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}_`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
+
echo
echo now run
echo pbuilder build tuxmath_$1-$2.dsc
Added: tuxmath/people/holger/make_orig_tar_gz
===================================================================
--- tuxmath/people/holger/make_orig_tar_gz 2006-10-07 20:39:00 UTC (rev 49)
+++ tuxmath/people/holger/make_orig_tar_gz 2006-10-08 12:07:51 UTC (rev 50)
@@ -0,0 +1,27 @@
+#!/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
Property changes on: tuxmath/people/holger/make_orig_tar_gz
___________________________________________________________________
Name: svn:executable
+ *
Modified: tuxmath/people/holger/tuxmath/debian/changelog
===================================================================
--- tuxmath/people/holger/tuxmath/debian/changelog 2006-10-07 20:39:00 UTC (rev 49)
+++ tuxmath/people/holger/tuxmath/debian/changelog 2006-10-08 12:07:51 UTC (rev 50)
@@ -1,3 +1,14 @@
+tuxmath (0.97-1) unstable; urgency=low
+
+ * new upstream version (new features: dynamically adjust game speed based
+ on player performance, summaries of the last ten games are saved games in
+ the player's .tuxmath directory, some buxgfixes, improved documentation)
+ * added build-depends on autotools-dev, autoconf and automake1.9 plus a
+ build-conflicts on autoconf2.13, automake1.4 to build it as intended by
+ upstream
+
+ -- Holger Levsen <debian at layer-acht.org> Sun, 8 Oct 2006 11:04:10 +0000
+
tuxmath (0.94-1) unstable; urgency=low
* new upstream version with many fixes and improvements, i.e. config files
Modified: tuxmath/people/holger/tuxmath/debian/control
===================================================================
--- tuxmath/people/holger/tuxmath/debian/control 2006-10-07 20:39:00 UTC (rev 49)
+++ tuxmath/people/holger/tuxmath/debian/control 2006-10-08 12:07:51 UTC (rev 50)
@@ -2,7 +2,8 @@
Section: games
Priority: optional
Maintainer: Holger Levsen <debian at layer-acht.org>
-Build-Depends: debhelper (>=4.0.0), libsdl1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libx11-6, libxext6
+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
Standards-Version: 3.7.2
Package: tuxmath
Modified: tuxmath/people/holger/tuxmath/debian/rules
===================================================================
--- tuxmath/people/holger/tuxmath/debian/rules 2006-10-07 20:39:00 UTC (rev 49)
+++ tuxmath/people/holger/tuxmath/debian/rules 2006-10-08 12:07:51 UTC (rev 50)
@@ -9,31 +9,50 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-configure: configure-stamp
-configure-stamp:
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+
+config.status: autogen.sh
dh_testdir
- touch configure-stamp
+ # 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
+
-
build: build-stamp
-build-stamp: configure-stamp
+build-stamp: config.status
dh_testdir
# Add here commands to compile the package.
- $(MAKE) PREFIX=/usr
+ $(MAKE)
touch build-stamp
clean:
dh_testdir
dh_testroot
- rm -f build-stamp configure-stamp
+ rm -f build-stamp
# Add here commands to clean up after the build process.
- $(MAKE) clean
-
+ -$(MAKE) distclean
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+ cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+ cp -f /usr/share/misc/config.guess config.guess
+endif
dh_clean
install: build
@@ -44,7 +63,7 @@
# Add here commands to install the package into debian/tuxmath.
$(MAKE) install DESTDIR=$(CURDIR)/debian/tuxmath PREFIX=/usr BIN_PREFIX=$(CURDIR)/debian/tuxmath/usr/games
-
+ rm $(CURDIR)/debian/tuxmath/usr/share/tuxmath/images/tuxmath.ico
# Build architecture-independent files here.
@@ -72,4 +91,4 @@
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install
Modified: tuxmath/trunk/Makefile.am
===================================================================
--- tuxmath/trunk/Makefile.am 2006-10-07 20:39:00 UTC (rev 49)
+++ tuxmath/trunk/Makefile.am 2006-10-08 12:07:51 UTC (rev 50)
@@ -33,9 +33,6 @@
fi; test -z "$$fail"
-icondir=$(datadir)/pixmaps
-icon_DATA = data/images/icon.png
-
install-data-local:
@$(NORMAL_INSTALL)
if test -d $(srcdir)/$(PACKAGE_DATA_DIR); then \
Modified: tuxmath/trunk/docs/changelog
===================================================================
--- tuxmath/trunk/docs/changelog 2006-10-07 20:39:00 UTC (rev 49)
+++ tuxmath/trunk/docs/changelog 2006-10-08 12:07:51 UTC (rev 50)
@@ -1,5 +1,13 @@
changelog for "tuxmath"
+2006.Oct.07 (https://svn.tux4kids.net/tuxmath/ - revision 48)
+ Version 0.97 final
+
+ Build:
+ * removed icon* from Makefile.am as its included in data
+
+ Holger Levsen <debian at layer-acht.org>
+
2006.Oct.07 (https://svn.tux4kids.net/tuxmath/ - revision 47)
Build:
More information about the Tux4kids-commits
mailing list