Apologies for the incomplete debdiff, this one attached here has the
needed build-depend on autoconf to actually succeed.
diff -Nru gltron-0.70final/debian/changelog gltron-0.70final/debian/changelog
--- gltron-0.70final/debian/changelog   2011-12-15 22:45:04.000000000 +0100
+++ gltron-0.70final/debian/changelog   2013-08-11 16:26:49.000000000 +0200
@@ -1,3 +1,12 @@
+gltron (0.70final-11) UNRELEASED; urgency=low
+
+  * Run autoconf to fix build with newer GCC versions. (Closes: #701289)
+    - Add autoconf to build-depends for this.
+  * debian/patches/fix-prototypes.patch: Match function calls with the 
prototype
+    declarations.
+
+ -- Andreas Moog <am...@ubuntu.com>  Sun, 11 Aug 2013 16:26:26 +0200
+
 gltron (0.70final-10) unstable; urgency=low
 
   [ Ari Pollak ]
diff -Nru gltron-0.70final/debian/control gltron-0.70final/debian/control
--- gltron-0.70final/debian/control     2010-04-06 23:58:14.000000000 +0200
+++ gltron-0.70final/debian/control     2013-08-11 16:26:20.000000000 +0200
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Ari Pollak <a...@debian.org>
 Standards-Version: 3.8.4
-Build-Depends: debhelper (>= 7), autotools-dev, zlib1g-dev, libpng12-dev, 
libgl1-mesa-dev | libgl-dev, libsdl-sound1.2-dev, libsdl1.2-dev, libx11-dev
+Build-Depends: debhelper (>= 7), autotools-dev, autoconf, zlib1g-dev, 
libpng12-dev, libgl1-mesa-dev | libgl-dev, libsdl-sound1.2-dev, libsdl1.2-dev, 
libx11-dev
 
 Package: gltron
 Architecture: any
diff -Nru gltron-0.70final/debian/patches/fix-prototypes.patch 
gltron-0.70final/debian/patches/fix-prototypes.patch
--- gltron-0.70final/debian/patches/fix-prototypes.patch        1970-01-01 
01:00:00.000000000 +0100
+++ gltron-0.70final/debian/patches/fix-prototypes.patch        2013-08-11 
15:26:34.000000000 +0200
@@ -0,0 +1,41 @@
+Description: The parameters for some prototypes are defined as const so the 
functions 
+ should use that too.
+Author: Andreas Moog <am...@ubuntu.com>
+
+Index: gltron/nebu/scripting/scripting.c
+===================================================================
+--- gltron.orig/nebu/scripting/scripting.c     2013-08-11 13:26:14.895792715 
+0000
++++ gltron/nebu/scripting/scripting.c  2013-08-11 13:26:14.887792716 +0000
+@@ -168,16 +168,16 @@
+   return status;
+ }    
+ 
+-void scripting_RunFile(char *name) {
++void scripting_RunFile(const char *name) {
+   lua_dofile(L, name);
+ }
+ 
+-void scripting_Run(char *command) {
++void scripting_Run(const char *command) {
+   /* fprintf(stderr, "[command] %s\n", command); */
+   lua_dostring(L, command);
+ }
+ 
+-void scripting_RunFormat(char *format, ... ) {
++void scripting_RunFormat(const char *format, ... ) {
+   char buf[4096];
+   va_list ap;
+   va_start(ap, format);
+Index: gltron/src/gltron.c
+===================================================================
+--- gltron.orig/src/gltron.c   2013-08-11 13:26:11.543792589 +0000
++++ gltron/src/gltron.c        2013-08-11 13:26:29.863793144 +0000
+@@ -9,7 +9,7 @@
+ #include "base/util.h"
+ #include "SDL.h"
+ 
+-int main(int argc, char *argv[] ) {
++int main(int argc, const char *argv[] ) {
+       initSubsystems(argc, argv);
+       runScript(PATH_SCRIPTS, "main.lua");
+   return 0;
diff -Nru gltron-0.70final/debian/patches/series 
gltron-0.70final/debian/patches/series
--- gltron-0.70final/debian/patches/series      2011-12-15 22:39:57.000000000 
+0100
+++ gltron-0.70final/debian/patches/series      2013-08-11 16:05:59.000000000 
+0200
@@ -5,3 +5,4 @@
 disable-screenmenu.patch
 gcc30.patch
 gcc-4.6.patch
+fix-prototypes.patch
diff -Nru gltron-0.70final/debian/rules gltron-0.70final/debian/rules
--- gltron-0.70final/debian/rules       2010-04-06 23:55:35.000000000 +0200
+++ gltron-0.70final/debian/rules       2013-08-11 16:01:54.000000000 +0200
@@ -24,7 +24,7 @@
 
 config.status: configure
        dh_testdir
-
+       autoconf
        cp -f /usr/share/misc/config.sub config.sub
        cp -f /usr/share/misc/config.guess config.guess
 
@@ -53,7 +53,6 @@
        [ ! -f Makefile ] || $(MAKE) distclean
 
        rm -f config.sub config.guess
-
        dh_clean
 
 

Attachment: signature.asc
Description: OpenPGP digital signature



Reply via email to