[SCM] 2D platformer game starring a quixotic frog branch, master, updated. debian/1.0.3+dfsg1-1

[Dmitry E. Oboukhov]

The following commit has been merged in the master branch:
commit adb465737e3a808b122f56f62d2688dbadb425b0
Author: Dmitry E. Oboukhov <unera at debian.org>
Date:   Wed Sep 22 15:45:24 2010 +0400

    new upstream sources

diff --git a/debian/changelog b/debian/changelog
index f52e063..b0206f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+frogatto (1.0.3+dfsg1-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Dmitry E. Oboukhov <unera at debian.org>  Wed, 22 Sep 2010 15:15:26 +0400
+
 frogatto (1.0+dfsg1-8) unstable; urgency=low
 
   * Fixed russian comment in frogatto.desktop.
diff --git a/debian/download.sh b/debian/download.sh
new file mode 100644
index 0000000..368c831
--- /dev/null
+++ b/debian/download.sh
@@ -0,0 +1,67 @@
+#!/bin/sh
+
+set -e
+
+UPSTREAM_VERSION=`dpkg-parsechangelog \
+    | grep ^Version \
+    | awk '{print $2}' \
+    | sed 's/+dfsg[[:digit:]]\+//' \
+    | sed 's/-[[:digit:]]\+$//'`
+
+UPSTREAM_TARBALL=frogatto-$UPSTREAM_VERSION.tar.bz2
+UPSTREAM_URL=http://www.frogatto.com/files/frogatto-$UPSTREAM_VERSION.tar.bz2
+DEBIAN_VERSION=`dpkg-parsechangelog \
+    | grep ^Version \
+    | awk '{print $2}' \
+    | sed 's/-[[:digit:]]\+$//'`
+
+FROGATTO_TARBALL=frogatto_$DEBIAN_VERSION.orig.tar.gz
+FROGATTO_DATA_TARBALL=frogatto-data_$DEBIAN_VERSION.orig.tar.gz
+
+
+FROGATTO_OBJECTS="INSTALL LICENSE Makefile src"
+
+
+if ! test -f ../$UPSTREAM_TARBALL; then
+    if ! wget -P .. $UPSTREAM_URL; then
+    	echo "Error downloading upstream tarball"
+    	exit -1
+    fi
+fi
+
+TEMP_DIR=`mktemp -d`
+SRC_DIR=$TEMP_DIR/frogatto-$UPSTREAM_VERSION
+FROGATTO_DIR=$TEMP_DIR/frogatto-$DEBIAN_VERSION
+FROGATTO_DATA_DIR=$TEMP_DIR/frogatto-data-$DEBIAN_VERSION
+
+trap "rm -fr $TEMP_DIR" INT
+echo "Use temporary directory $TEMP_DIR"
+
+echo -n "Unpacking tarball... "
+if tar -xjf `pwd`/../$UPSTREAM_TARBALL -C $TEMP_DIR; then
+    echo done
+else
+    echo fail
+    rm -fr $TEMP_DIR
+    exit -2
+fi
+
+mkdir -v $FROGATTO_DIR $FROGATTO_DATA_DIR
+
+echo -n "Split data in directories... "
+for object in $FROGATTO_OBJECTS; do
+    mv $SRC_DIR/$object $FROGATTO_DIR
+done
+
+mv $SRC_DIR/* $FROGATTO_DATA_DIR/
+cp $FROGATTO_DIR/LICENSE $FROGATTO_DATA_DIR/
+echo done
+
+echo -n "Packing frogatto ($FROGATTO_TARBALL)... "
+tar -C $TEMP_DIR -czf `pwd`/../$FROGATTO_TARBALL frogatto-$DEBIAN_VERSION
+echo done
+echo -n "Packing frogatto-data ($FROGATTO_DATA_TARBALL)... "
+tar -C $TEMP_DIR -czf `pwd`/../$FROGATTO_DATA_TARBALL \
+    frogatto-data-$DEBIAN_VERSION
+echo done
+exec rm -fr $TEMP_DIR
diff --git a/debian/patches/dont-use-ccache b/debian/patches/dont-use-ccache
deleted file mode 100644
index f5690ad..0000000
--- a/debian/patches/dont-use-ccache
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: Upstream changes introduced in version 1.0+dfsg1-4
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- frogatto (1.0+dfsg1-4) unstable; urgency=low
- .
-   * removed ccache from b-d, closes FTBFS with our buildds.
- .
- The person named in the Author field signed this changelog entry.
-Author: Dmitry E. Oboukhov <unera at debian.org>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- frogatto-1.0+dfsg1.orig/Makefile
-+++ frogatto-1.0+dfsg1/Makefile
-@@ -10,7 +10,7 @@ wml_schema_test_objects = filesystem.o s
- OPT=-O2 -fno-inline-functions
- 
- %.o : src/%.cpp
--	ccache g++ -DIMPLEMENT_SAVE_PNG -fno-inline-functions -g $(OPT) `sdl-config --cflags` -I/usr/X11R6/include -D_GNU_SOURCE=1 -D_REENTRANT -Wnon-virtual-dtor -Wreturn-type -fthreadsafe-statics -c $<
-+	g++ -DIMPLEMENT_SAVE_PNG -fno-inline-functions -g $(OPT) `sdl-config --cflags` -I/usr/X11R6/include -D_GNU_SOURCE=1 -D_REENTRANT -Wnon-virtual-dtor -Wreturn-type -fthreadsafe-statics -c $<
- 
- game: $(objects)
- 	g++ -g $(OPT) -L. -L/sw/lib -L/usr/X11R6/lib -L. -lX11 -D_GNU_SOURCE=1 -D_REENTRANT -Wnon-virtual-dtor -Wreturn-type -L/usr/lib `sdl-config --libs` -lSDLmain -lSDL -lGL -lGLU -lGLEW -lSDL_image -lSDL_ttf -lSDL_mixer -lpng -lboost_regex-mt -lboost_system-mt -fthreadsafe-statics $(objects) -o game
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 26153f8..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-dont-use-ccache

-- 
2D platformer game starring a quixotic frog