diff -Nru scorched3d-43.3+dfsg/debian/changelog scorched3d-43.3+dfsg/debian/changelog --- scorched3d-43.3+dfsg/debian/changelog 2013-10-21 12:52:00.000000000 +0000 +++ scorched3d-43.3+dfsg/debian/changelog 2013-12-23 10:28:52.000000000 +0000 @@ -1,3 +1,10 @@ +scorched3d (43.3+dfsg-1+rpi1) jessie-staging; urgency=medium + + * Fix freetype includes + * Fix clean target + + -- Peter Michael Green <plugwash@raspbian.org> Mon, 23 Dec 2013 09:39:28 +0000 + scorched3d (43.3+dfsg-1) unstable; urgency=medium * Team upload. diff -Nru scorched3d-43.3+dfsg/debian/patches/fix-freetype-includes.diff scorched3d-43.3+dfsg/debian/patches/fix-freetype-includes.diff --- scorched3d-43.3+dfsg/debian/patches/fix-freetype-includes.diff 1970-01-01 00:00:00.000000000 +0000 +++ scorched3d-43.3+dfsg/debian/patches/fix-freetype-includes.diff 2013-12-23 10:32:25.000000000 +0000 @@ -0,0 +1,54 @@ +Description: Fix freetype includes +Author: Peter Michael Green <plugwash@raspbian.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> + +Index: scorched3d-43.3+dfsg/src/launcher/wxdialogs/TrueTypeFont.h +=================================================================== +--- scorched3d-43.3+dfsg.orig/src/launcher/wxdialogs/TrueTypeFont.h 2013-12-23 09:49:50.000000000 +0000 ++++ scorched3d-43.3+dfsg/src/launcher/wxdialogs/TrueTypeFont.h 2013-12-23 09:49:50.000000000 +0000 +@@ -25,10 +25,10 @@ + #include <wx/image.h> + #include <ft2build.h> + #include <string> +-#include <freetype/freetype.h> +-#include <freetype/ftglyph.h> +-#include <freetype/ftoutln.h> +-#include <freetype/fttrigon.h> ++#include <freetype.h> ++#include <ftglyph.h> ++#include <ftoutln.h> ++#include <fttrigon.h> + + class TrueTypeFont + { +Index: scorched3d-43.3+dfsg/src/client/GLEXT/GLFont2dFreeType.h +=================================================================== +--- scorched3d-43.3+dfsg.orig/src/client/GLEXT/GLFont2dFreeType.h 2013-12-23 10:30:24.000000000 +0000 ++++ scorched3d-43.3+dfsg/src/client/GLEXT/GLFont2dFreeType.h 2013-12-23 10:30:29.000000000 +0000 +@@ -23,10 +23,10 @@ + + #include <GLEXT/GLFont2dStorage.h> + #include <ft2build.h> +-#include <freetype/freetype.h> +-#include <freetype/ftglyph.h> +-#include <freetype/ftoutln.h> +-#include <freetype/fttrigon.h> ++#include <freetype.h> ++#include <ftglyph.h> ++#include <ftoutln.h> ++#include <fttrigon.h> + #include <string> + + class GLFont2dFreeType diff -Nru scorched3d-43.3+dfsg/debian/patches/series scorched3d-43.3+dfsg/debian/patches/series --- scorched3d-43.3+dfsg/debian/patches/series 2013-10-17 16:00:11.000000000 +0000 +++ scorched3d-43.3+dfsg/debian/patches/series 2013-12-23 09:49:50.000000000 +0000 @@ -3,3 +3,4 @@ 0003-remove-embedded-glew.patch 0004-ftbfs-gcc-4.7.patch 0005-append-buildflags.patch +fix-freetype-includes.diff diff -Nru scorched3d-43.3+dfsg/debian/rules scorched3d-43.3+dfsg/debian/rules --- scorched3d-43.3+dfsg/debian/rules 2013-10-16 17:57:50.000000000 +0000 +++ scorched3d-43.3+dfsg/debian/rules 2013-12-23 10:28:41.000000000 +0000 @@ -34,6 +34,7 @@ override_dh_auto_clean: rm -f data/fonts/test.ttf rm -rf data/avatars debian/avatars-svg/*.png + rm -f src/launcher/scorched/Makefile.am src/client/scorchedc/Makefile.am src/server/scorcheds/Makefile.am dh_auto_clean override_dh_builddeb: