r5646 - in packages/trunk/qonk/debian: . patches

[Barry deFreese]

Author: bddebian-guest
Date: 2008-02-05 19:38:33 +0000 (Tue, 05 Feb 2008)
New Revision: 5646

Added:
   packages/trunk/qonk/debian/patches/20_gcc_4.3.diff
Modified:
   packages/trunk/qonk/debian/changelog
   packages/trunk/qonk/debian/control
   packages/trunk/qonk/debian/patches/series
Log:
  * 20_gcc_4.3.diff - Build with gcc-4.3. (Closes: #462052).
  * Bump Standards Version to 3.7.3. (No changes needed).


Modified: packages/trunk/qonk/debian/changelog
===================================================================
--- packages/trunk/qonk/debian/changelog	2008-02-05 18:27:18 UTC (rev 5645)
+++ packages/trunk/qonk/debian/changelog	2008-02-05 19:38:33 UTC (rev 5646)
@@ -1,15 +1,17 @@
 qonk (0.3.1-1) UNRELEASED; urgency=low
 
   [ Barry deFreese ]
-  * New upstream release
-  * Move from simple-patch-sys to quilt
-  * 10_build_environment.diff - Fix upstream build issues
-    + Thanks to Ben Asselstine for the fix
-  * Autoreconf on build to pick up fixes from patch
-  * Add build-deps for autoconf, automake, and libtool
-  * Add myself to uploaders
-  * Add VCS fields in control
-  * Add desktop file
+  * New upstream release.
+  * Move from simple-patch-sys to quilt.
+  * 10_build_environment.diff - Fix upstream build issues.
+    + Thanks to Ben Asselstine for the fix.
+  * Autoreconf on build to pick up fixes from patch.
+  * Add build-deps for autoconf, automake, and libtool.
+  * Add myself to uploaders.
+  * Add VCS fields in control.
+  * Add desktop file.
+  * 20_gcc_4.3.diff - Build with gcc-4.3. (Closes: #462052).
+  * Bump Standards Version to 3.7.3. (No changes needed).
 
  -- Barry deFreese <bddebian at comcast.net>  Sun, 18 Nov 2007 22:59:58 -0500
 

Modified: packages/trunk/qonk/debian/control
===================================================================
--- packages/trunk/qonk/debian/control	2008-02-05 18:27:18 UTC (rev 5645)
+++ packages/trunk/qonk/debian/control	2008-02-05 19:38:33 UTC (rev 5646)
@@ -5,7 +5,7 @@
 Uploaders: Martín Ferrari <martin.ferrari at gmail.com>, Barry deFreese <bddebian at comcast.net>
 Build-Depends: cdbs, debhelper (>= 5), quilt, autoconf, automake, libtool, libsdl1.2-dev, libsdl-ttf2.0-dev,
  libsdl-gfx1.2-dev, libsdl-image1.2-dev
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
 Homepage: http://sourceforge.net/projects/qonk/
 Vcs-Svn: ssh://svn.debian.org/svn/pkg-games/packages/trunk/qonk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/qonk/?op=log

Added: packages/trunk/qonk/debian/patches/20_gcc_4.3.diff
===================================================================
--- packages/trunk/qonk/debian/patches/20_gcc_4.3.diff	                        (rev 0)
+++ packages/trunk/qonk/debian/patches/20_gcc_4.3.diff	2008-02-05 19:38:33 UTC (rev 5646)
@@ -0,0 +1,43 @@
+diff -urN qonk-0.3.1.orig/src/lisp/lexer.cpp qonk-0.3.1/src/lisp/lexer.cpp
+--- qonk-0.3.1.orig/src/lisp/lexer.cpp	2008-02-05 13:57:23.000000000 -0500
++++ qonk-0.3.1/src/lisp/lexer.cpp	2008-02-05 13:57:59.000000000 -0500
+@@ -19,6 +19,7 @@
+ //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #include <sstream>
+ #include <stdexcept>
++#include <cstring>
+ 
+ #include "lexer.hpp"
+ #include "translation.hpp"
+diff -urN qonk-0.3.1.orig/src/lisp/parser.cpp qonk-0.3.1/src/lisp/parser.cpp
+--- qonk-0.3.1.orig/src/lisp/parser.cpp	2008-02-05 13:57:23.000000000 -0500
++++ qonk-0.3.1/src/lisp/parser.cpp	2008-02-05 13:58:26.000000000 -0500
+@@ -20,6 +20,7 @@
+ #include <sstream>
+ #include <stdexcept>
+ #include <fstream>
++#include <cstring>
+ 
+ #include <cassert>
+ 
+diff -urN qonk-0.3.1.orig/src/sdl_driver.cpp qonk-0.3.1/src/sdl_driver.cpp
+--- qonk-0.3.1.orig/src/sdl_driver.cpp	2008-02-05 13:57:23.000000000 -0500
++++ qonk-0.3.1/src/sdl_driver.cpp	2008-02-05 13:58:54.000000000 -0500
+@@ -5,6 +5,7 @@
+ #include <SDL/SDL.h>
+ #include <SDL/SDL_ttf.h>
+ #include <cstdio>
++#include <cstdlib>
+ 
+ #include "sdl_driver.h"
+ #include "canvas.h"
+diff -urN qonk-0.3.1.orig/src/videooptions.cpp qonk-0.3.1/src/videooptions.cpp
+--- qonk-0.3.1.orig/src/videooptions.cpp	2008-02-05 13:57:23.000000000 -0500
++++ qonk-0.3.1/src/videooptions.cpp	2008-02-05 13:59:26.000000000 -0500
+@@ -1,5 +1,6 @@
+ #include <vector>
+ #include <sstream>
++#include <algorithm>
+ 
+ #include <SDL/SDL.h>
+ 

Modified: packages/trunk/qonk/debian/patches/series
===================================================================
--- packages/trunk/qonk/debian/patches/series	2008-02-05 18:27:18 UTC (rev 5645)
+++ packages/trunk/qonk/debian/patches/series	2008-02-05 19:38:33 UTC (rev 5646)
@@ -1 +1,2 @@
 10_build_environment.diff
+20_gcc_4.3.diff