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

[Dmitry E. Oboukhov]

The following commit has been merged in the master branch:
commit b05536d75341e9a3cd7d82bf0f5f5b804a323c5f
Author: Dmitry E. Oboukhov <unera at debian.org>
Date:   Wed Jul 21 16:24:48 2010 +0400

    don't use ccache

diff --git a/Makefile b/Makefile
index f4b963a..1a3327c 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ wml_schema_test_objects = filesystem.o string_utils.o wml_node.o wml_parser.o wm
 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/changelog b/debian/changelog
index fdc813f..28b7795 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+frogatto (1.0+dfsg1-4) unstable; urgency=low
+
+  * removed ccache from b-d, closes FTBFS with our buildds.
+
+ -- Dmitry E. Oboukhov <unera at debian.org>  Wed, 21 Jul 2010 16:21:45 +0400
+
 frogatto (1.0+dfsg1-3) unstable; urgency=low
 
   * Added menuitem and menuicon.
diff --git a/debian/patches/dont-use-ccache b/debian/patches/dont-use-ccache
new file mode 100644
index 0000000..f5690ad
--- /dev/null
+++ b/debian/patches/dont-use-ccache
@@ -0,0 +1,36 @@
+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
new file mode 100644
index 0000000..26153f8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+dont-use-ccache

-- 
2D platformer game starring a quixotic frog