[tecnoballz] 05/56: import NMU changes

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository tecnoballz.

commit 3f211bc71c5e0a8017036be9a392021b96f2b7a8
Author: Ansgar Burchardt <ansgar at debian.org>
Date:   Thu May 29 18:27:55 2008 +0000

    import NMU changes
---
 debian/changelog                      |  7 +++++++
 debian/control                        |  3 +--
 debian/patches/011_gcc-4.3-fixes.diff | 11 +++++++++++
 debian/patches/series                 |  1 +
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c2bd2c0..18fc846 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tecnoballz (0.92-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fixed gcc-4.3 FTBFS, patch by KiBi (Closes: #455319)
+
+ -- Marc 'HE' Brockschmidt <he at debian.org>  Sun, 16 Mar 2008 18:20:34 +0100
+
 tecnoballz (0.92-2) unstable; urgency=low
 
   * Added a build-depends to libsdl-image1.2-dev so the package can autobuild.
diff --git a/debian/control b/debian/control
index ac9f853..9f23605 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,7 @@
 Source: tecnoballz
 Section: games
 Priority: optional
-Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Alexis Sukrieh <sukria at debian.org>
+Maintainer: Alexis Sukrieh <sukria at debian.org>
 Build-Depends: debhelper (>= 4.0.0), libsdl-mixer1.2-dev, 
                libmikmod2-dev, libxext-dev, libvorbis-dev, 
                libogg-dev, libsmpeg-dev, libxxf86dga-dev, 
diff --git a/debian/patches/011_gcc-4.3-fixes.diff b/debian/patches/011_gcc-4.3-fixes.diff
new file mode 100644
index 0000000..e77b4ef
--- /dev/null
+++ b/debian/patches/011_gcc-4.3-fixes.diff
@@ -0,0 +1,11 @@
+--- a/include/surface_sdl.h
++++ b/include/surface_sdl.h
+@@ -46,7 +46,7 @@
+   ~surface_sdl ();
+   SDL_Surface* get_surface ();
+   char* get_pixel_data ();
+-  char* get_pixel_data (Uint32 coord_x, Uint32 coord_x);
++  char* get_pixel_data (Uint32 coord_x1, Uint32 coord_x2);
+   Uint32 get_row_size ();
+   Uint32 get_offset (Uint32 xcoord, Uint32 ycoord);
+   void clear (Uint32 color = 0);
diff --git a/debian/patches/series b/debian/patches/series
index 943108f..63b3df4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 010_scorefile_path.diff
+011_gcc-4.3-fixes.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/tecnoballz.git