diff -u supertux-0.3.1d/debian/rules supertux-0.3.1d/debian/rules --- supertux-0.3.1d/debian/rules +++ supertux-0.3.1d/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. + +include /usr/share/dpatch/dpatch.make # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 @@ -23,7 +22,7 @@ INSTALL_PROGRAM += -s endif -config.status: configure +config.status: patch-stamp configure dh_testdir CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) \ @@ -43,7 +42,7 @@ jam touch build-stamp -clean: +clean: unpatch dh_testdir dh_testroot rm -f build-stamp diff -u supertux-0.3.1d/debian/control supertux-0.3.1d/debian/control --- supertux-0.3.1d/debian/control +++ supertux-0.3.1d/debian/control @@ -4,9 +4,10 @@ Maintainer: Ubuntu MOTU Developers XSBC-Original-Maintainer: Gürkan Sengün Uploaders: Bartosz Fenski -Build-Depends: debhelper (>= 5.0.0), jam, libsdl1.2-dev, libsdl-image1.2-dev, libopenal-dev (>= 0.0.8), libphysfs-dev (>= 1.0.0), libvorbis-dev +Build-Depends: debhelper (>= 5.0.0), jam, libsdl1.2-dev, libsdl-image1.2-dev, libopenal-dev (>= 0.0.8), libphysfs-dev (>= 1.0.0), libvorbis-dev, dpatch Build-Conflicts: nvidia-glx -Standards-Version: 3.7.3 +Standards-Version: 3.8.0 +Homepage: http://supertux.berlios.de/ Package: supertux Architecture: any @@ -21,8 +22,6 @@ This is a development snapshot of SuperTux. It may suffer from critical bugs and has not been fully tested. Use `supertux-stable', instead, if you want a more stable gameplay experience. - . - Homepage: http://supertux.berlios.de/ Package: supertux-data Architecture: all diff -u supertux-0.3.1d/debian/changelog supertux-0.3.1d/debian/changelog --- supertux-0.3.1d/debian/changelog +++ supertux-0.3.1d/debian/changelog @@ -1,3 +1,13 @@ +supertux (0.3.1d-0ubuntu2) intrepid; urgency=low + + * Add dpatch patch system + - Add 01_supertux-0.3.1-gcc43.dpatch (LP: #249195) + * Bump Standards-Version to 3.8.0 + - Move Homepage from debian/control Description to its own field + - Add debian/README.source + + -- Nathan Handler Sat, 26 Jul 2008 09:11:38 -0500 + supertux (0.3.1d-0ubuntu1) hardy; urgency=low * New upstream release only in patch2: unchanged: --- supertux-0.3.1d.orig/debian/README.source +++ supertux-0.3.1d/debian/README.source @@ -0,0 +1,31 @@ +This package uses dpatch in order to apply patches to the upstream source. +Patches are stored in debian/patches and their filenames usually end in .dpatch . +For further details, see the man pages for dpatch and dpatch-edit-patch. + +All commands described below should be run from the top directory of the +package source tree, unless otherwise stated. + + * To generate the fully patched source, in a form ready for + editing, that would be built to create Debian packages, run: + + dpatch apply-all + + Note: This should happen automatically when you run + dpkg-source -x on a dpatch source package. + + * To modify the source and save those modifications so that + they will be applied when building the package, pick a + suitably informative patch file name, for example + 01_add_README.source_file.dpatch, and then run: + + dpatch-edit-patch 01_add_README.source_file.dpatch + + This will place you in a new shell in a temporary copy of the + source tree. Make your desired modifications to it, and then + exit the shell to create the patch file containing them (this + file will appear in debian/patches). + + * To remove source modifications that are currently being + applied when building the package, run: + + dpatch unapply-all only in patch2: unchanged: --- supertux-0.3.1d.orig/debian/patches/00list +++ supertux-0.3.1d/debian/patches/00list @@ -0,0 +1 @@ +01_supertux-0.3.1-gcc43.dpatch only in patch2: unchanged: --- supertux-0.3.1d.orig/debian/patches/01_supertux-0.3.1-gcc43.dpatch +++ supertux-0.3.1d/debian/patches/01_supertux-0.3.1-gcc43.dpatch @@ -0,0 +1,84 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_supertux-0.3.1-gcc43.dpatch by Nathan Handler +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Patch from Fedora to fix building with gcc-4.3 + +@DPATCH@ +diff -urNad supertux-0.3.1d~/src/addon_manager.cpp supertux-0.3.1d/src/addon_manager.cpp +--- supertux-0.3.1d~/src/addon_manager.cpp 2008-01-03 14:59:28.000000000 -0600 ++++ supertux-0.3.1d/src/addon_manager.cpp 2008-07-26 09:08:29.000000000 -0500 +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + #include "addon_manager.hpp" + #include "config.h" + #include "log.hpp" +diff -urNad supertux-0.3.1d~/src/console.hpp supertux-0.3.1d/src/console.hpp +--- supertux-0.3.1d~/src/console.hpp 2008-01-03 14:59:27.000000000 -0600 ++++ supertux-0.3.1d/src/console.hpp 2008-07-26 09:09:19.000000000 -0500 +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + #include + + class Console; +diff -urNad supertux-0.3.1d~/src/lisp/lexer.cpp supertux-0.3.1d/src/lisp/lexer.cpp +--- supertux-0.3.1d~/src/lisp/lexer.cpp 2008-01-03 14:59:26.000000000 -0600 ++++ supertux-0.3.1d/src/lisp/lexer.cpp 2008-07-26 09:10:22.000000000 -0500 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #include "lexer.hpp" + +diff -urNad supertux-0.3.1d~/src/sprite/sprite_manager.hpp supertux-0.3.1d/src/sprite/sprite_manager.hpp +--- supertux-0.3.1d~/src/sprite/sprite_manager.hpp 2008-01-03 14:59:26.000000000 -0600 ++++ supertux-0.3.1d/src/sprite/sprite_manager.hpp 2008-07-26 09:10:40.000000000 -0500 +@@ -21,6 +21,7 @@ + #define SUPERTUX_SPRITE_MANAGER_H + + #include ++#include + + class SpriteData; + class Sprite; +diff -urNad supertux-0.3.1d~/src/textscroller.hpp supertux-0.3.1d/src/textscroller.hpp +--- supertux-0.3.1d~/src/textscroller.hpp 2008-01-03 14:59:27.000000000 -0600 ++++ supertux-0.3.1d/src/textscroller.hpp 2008-07-26 09:09:37.000000000 -0500 +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + + #include "screen.hpp" + #include "math/vector.hpp" +diff -urNad supertux-0.3.1d~/src/title.cpp supertux-0.3.1d/src/title.cpp +--- supertux-0.3.1d~/src/title.cpp 2008-01-03 14:59:28.000000000 -0600 ++++ supertux-0.3.1d/src/title.cpp 2008-07-26 09:08:59.000000000 -0500 +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff -urNad supertux-0.3.1d~/src/video/sdl_texture.hpp supertux-0.3.1d/src/video/sdl_texture.hpp +--- supertux-0.3.1d~/src/video/sdl_texture.hpp 2008-01-03 14:59:22.000000000 -0600 ++++ supertux-0.3.1d/src/video/sdl_texture.hpp 2008-07-26 09:10:03.000000000 -0500 +@@ -22,6 +22,7 @@ + + #include + ++#include + #include + + #include "texture.hpp"