r4146 - in packages/trunk/desmume/debian: . patches

[Pascal Giard]

Author: pascal
Date: 2007-09-09 22:33:28 +0000 (Sun, 09 Sep 2007)
New Revision: 4146

Added:
   packages/trunk/desmume/debian/patches/
   packages/trunk/desmume/debian/patches/fix-64bit-segfault.diff
   packages/trunk/desmume/debian/patches/series
Modified:
   packages/trunk/desmume/debian/changelog
   packages/trunk/desmume/debian/control
   packages/trunk/desmume/debian/rules
Log:
Fix possible segfault on 64bit CPUs.


Modified: packages/trunk/desmume/debian/changelog
===================================================================
--- packages/trunk/desmume/debian/changelog	2007-09-09 22:27:06 UTC (rev 4145)
+++ packages/trunk/desmume/debian/changelog	2007-09-09 22:33:28 UTC (rev 4146)
@@ -1,3 +1,12 @@
+desmume (0.7.3-3) unstable; urgency=low
+
+  * [debian/control]: Added Build-Dep on quilt.
+  * [debian/rules]: Apply/unapply patches using quilt.
+  * [debian/patches/fix-64bit-segfault.diff]:
+    - Fix possible segfault on 64bit CPUs (closes: #435763).
+
+ -- Pascal Giard <pascal at debian.org>  Sun, 09 Sep 2007 18:07:02 -0400
+
 desmume (0.7.3-2) unstable; urgency=low
 
   * [debian/control]:

Modified: packages/trunk/desmume/debian/control
===================================================================
--- packages/trunk/desmume/debian/control	2007-09-09 22:27:06 UTC (rev 4145)
+++ packages/trunk/desmume/debian/control	2007-09-09 22:33:28 UTC (rev 4146)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Reinhard Tartler <siretart at tauware.de>, Pascal Giard <pascal at debian.org>, Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>
-Build-Depends: debhelper (>= 5), libglade2-dev, libgtk2.0-dev, libsdl1.2-dev, libgtkglext1-dev, intltool
+Build-Depends: debhelper (>= 5), libglade2-dev, libgtk2.0-dev, libsdl1.2-dev, libgtkglext1-dev, intltool, quilt
 Standards-Version: 3.7.2
 
 Package: desmume

Added: packages/trunk/desmume/debian/patches/fix-64bit-segfault.diff
===================================================================
--- packages/trunk/desmume/debian/patches/fix-64bit-segfault.diff	                        (rev 0)
+++ packages/trunk/desmume/debian/patches/fix-64bit-segfault.diff	2007-09-09 22:33:28 UTC (rev 4146)
@@ -0,0 +1,16 @@
+Index: desmume-0.7.3/src/ROMReader.h
+===================================================================
+--- desmume-0.7.3.orig/src/ROMReader.h	2007-09-09 17:59:43.000000000 -0400
++++ desmume-0.7.3/src/ROMReader.h	2007-09-09 18:00:04.000000000 -0400
+@@ -17,6 +17,11 @@
+     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+ 
++#ifdef HAVE_LIBZ
++#include <zlib.h>
++#endif
++#include <string.h>
++
+ #include "types.h"
+ 
+ #define ROMREADER_DEFAULT -1

Added: packages/trunk/desmume/debian/patches/series
===================================================================
--- packages/trunk/desmume/debian/patches/series	                        (rev 0)
+++ packages/trunk/desmume/debian/patches/series	2007-09-09 22:33:28 UTC (rev 4146)
@@ -0,0 +1 @@
+fix-64bit-segfault.diff

Modified: packages/trunk/desmume/debian/rules
===================================================================
--- packages/trunk/desmume/debian/rules	2007-09-09 22:27:06 UTC (rev 4145)
+++ packages/trunk/desmume/debian/rules	2007-09-09 22:33:28 UTC (rev 4146)
@@ -1,6 +1,8 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+include /usr/share/quilt/quilt.make
+
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
@@ -26,14 +28,14 @@
 		--localedir=/usr/share/locale \
 		CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
 
-build: build-stamp
+build: patch build-stamp
 
 build-stamp:  config.status
 	dh_testdir
 	$(MAKE)
 	touch $@
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp