Author: goneri-guest
Date: 2008-01-15 21:54:13 +0000 (Tue, 15 Jan 2008)
New Revision: 5380
Added:
packages/trunk/scorched3d/debian/patches/
packages/trunk/scorched3d/debian/patches/gcc-4.3.diff
packages/trunk/scorched3d/debian/patches/series
Modified:
packages/trunk/scorched3d/debian/changelog
packages/trunk/scorched3d/debian/control
packages/trunk/scorched3d/debian/rules
Log:
add gcc-4.3.diff and a build dependency on quilt (Closes: #417691)
Modified: packages/trunk/scorched3d/debian/changelog
===================================================================
--- packages/trunk/scorched3d/debian/changelog 2008-01-15 20:01:16 UTC (rev
5379)
+++ packages/trunk/scorched3d/debian/changelog 2008-01-15 21:54:13 UTC (rev
5380)
@@ -10,8 +10,11 @@
+ Remove path from exec line and extension from icon
* Add dh_desktop and dh_icons calls in rules (Closes: #453889)
- -- Bruno "Fuddl" Kleinert <[EMAIL PROTECTED]> Mon, 14 Jan 2008 15:13:23 +0100
+ [ Goneri Le Bouder ]
+ * add gcc-4.3.diff and a build dependency on quilt (Closes: #417691)
+ -- Gonéri Le Bouder <[EMAIL PROTECTED]> Tue, 15 Jan 2008 22:51:45 +0100
+
scorched3d (41.1dfsg-1) unstable; urgency=low
[ Bruno "Fuddl" Kleinert ]
Modified: packages/trunk/scorched3d/debian/control
===================================================================
--- packages/trunk/scorched3d/debian/control 2008-01-15 20:01:16 UTC (rev
5379)
+++ packages/trunk/scorched3d/debian/control 2008-01-15 21:54:13 UTC (rev
5380)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Games Team <[EMAIL PROTECTED]>
Uploaders: Reinhard Tartler <[EMAIL PROTECTED]>, Bruno "Fuddl" Kleinert
<[EMAIL PROTECTED]>
-Build-Depends: binutils (>= 2.14.90.0.7), debhelper (>= 5.0.0), autotools-dev,
libsdl1.2-dev, libsdl-net1.2-dev, libopenal-dev, libalut-dev, libfreetype6-dev,
libwxgtk2.6-dev, libgl1-mesa-dev, libglu1-mesa-dev, sharutils, libogg-dev,
libvorbis-dev, dpkg-dev (>= 1.13.19), libfftw3-dev, libpng-dev
+Build-Depends: binutils (>= 2.14.90.0.7), debhelper (>= 5.0.0), autotools-dev,
libsdl1.2-dev, libsdl-net1.2-dev, libopenal-dev, libalut-dev, libfreetype6-dev,
libwxgtk2.6-dev, libgl1-mesa-dev, libglu1-mesa-dev, sharutils, libogg-dev,
libvorbis-dev, dpkg-dev (>= 1.13.19), libfftw3-dev, libpng-dev, quilt
Build-Conflicts: nvidia-glx
Standards-Version: 3.7.3
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/scorched3d/
Added: packages/trunk/scorched3d/debian/patches/gcc-4.3.diff
===================================================================
--- packages/trunk/scorched3d/debian/patches/gcc-4.3.diff
(rev 0)
+++ packages/trunk/scorched3d/debian/patches/gcc-4.3.diff 2008-01-15
21:54:13 UTC (rev 5380)
@@ -0,0 +1,50 @@
+Index: scorched3d-41.2dfsg/src/common/main.h
+===================================================================
+--- scorched3d-41.2dfsg.orig/src/common/main.h 2008-01-15 22:12:00.000000000
+0100
++++ scorched3d-41.2dfsg/src/common/main.h 2008-01-15 22:15:26.000000000
+0100
+@@ -21,6 +21,8 @@
+ #define WIN32_LEAN_AND_MEAN
+
+ #include <windows.h>
++#include <cstdlib>
++#include <vector>
+
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+Index: scorched3d-41.2dfsg/src/common/sha2.h
+===================================================================
+--- scorched3d-41.2dfsg.orig/src/common/sha2.h 2008-01-15 21:52:56.000000000
+0100
++++ scorched3d-41.2dfsg/src/common/sha2.h 2008-01-15 21:54:55.000000000
+0100
+@@ -46,6 +46,7 @@
+
+ #include <string>
+ #include <stdexcept>
++#include <cstring>
+
+ // NOTE: You may need to define things by hand for your system:
+ typedef unsigned char sha_byte; // Exactly 1 byte
+Index: scorched3d-41.2dfsg/src/net/NetServerTCP2Destination.cpp
+===================================================================
+--- scorched3d-41.2dfsg.orig/src/net/NetServerTCP2Destination.cpp
2008-01-15 21:49:08.000000000 +0100
++++ scorched3d-41.2dfsg/src/net/NetServerTCP2Destination.cpp 2008-01-15
21:52:17.000000000 +0100
+@@ -308,7 +308,7 @@
+ MessagePart messagePart = messageParts.parts.front();
+ messageParts.parts.pop_front();
+
+- const char *buffer =
messagePart.message->getBuffer().getBuffer();
++ char *buffer =
messagePart.message->getBuffer().getBuffer();
+
+ // Send buffer
+ int result = SDLNet_TCP_Send(socket_,
&buffer[messagePart.offset], messagePart.length);
+Index: scorched3d-41.2dfsg/src/common/DefinesFile.cpp
+===================================================================
+--- scorched3d-41.2dfsg.orig/src/common/DefinesFile.cpp 2008-01-15
22:17:36.000000000 +0100
++++ scorched3d-41.2dfsg/src/common/DefinesFile.cpp 2008-01-15
22:31:57.000000000 +0100
+@@ -21,6 +21,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string>
++#include <cstring>
+ #include <common/DefinesFile.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
Added: packages/trunk/scorched3d/debian/patches/series
===================================================================
--- packages/trunk/scorched3d/debian/patches/series
(rev 0)
+++ packages/trunk/scorched3d/debian/patches/series 2008-01-15 21:54:13 UTC
(rev 5380)
@@ -0,0 +1 @@
+gcc-4.3.diff
Modified: packages/trunk/scorched3d/debian/rules
===================================================================
--- packages/trunk/scorched3d/debian/rules 2008-01-15 20:01:16 UTC (rev
5379)
+++ packages/trunk/scorched3d/debian/rules 2008-01-15 21:54:13 UTC (rev
5380)
@@ -4,6 +4,8 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+include /usr/share/dpatch/dpatch.make
+
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -18,7 +20,7 @@
CFLAGS += -O2
endif
-config.status:
+config.status: patch-stamp
dh_testdir
uudecode -o data/fonts/test.ttf debian/test.ttf.uu
./configure \
@@ -36,7 +38,7 @@
$(MAKE)
touch build-stamp
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
