Author: fuddl-guest
Date: 2008-01-26 23:15:20 +0000 (Sat, 26 Jan 2008)
New Revision: 5505
Modified:
packages/trunk/scorched3d/debian/changelog
packages/trunk/scorched3d/debian/patches/gcc-4.3.diff
packages/trunk/scorched3d/debian/rules
Log:
+ new upstream release (41.3)
- remove rejects from debian gcc-4.3 patch (upstream apperantly changed the
target file very much)
+ add more gcc 4.3 things to gcc-4.3 patch (hopefully closes reopened #417691)
Modified: packages/trunk/scorched3d/debian/changelog
===================================================================
--- packages/trunk/scorched3d/debian/changelog 2008-01-26 01:03:16 UTC (rev
5504)
+++ packages/trunk/scorched3d/debian/changelog 2008-01-26 23:15:20 UTC (rev
5505)
@@ -1,3 +1,13 @@
+scorched3d (41.3dfsg-1) UNRELEASED; urgency=low
+
+ * New upstream release (Closes: #461816)
+ * Updated gcc-4.3 patch (Closes: #417691)
+ * Removed reject in src/net/NetServerTCP2Destination.cpp
+ * Add missing header in src/common/LoggerI.cpp
+ * Remove several empty directories. Found by lintian
+
+ -- Bruno "Fuddl" Kleinert <[EMAIL PROTECTED]> Sun, 27 Jan 2008 00:11:27 +0100
+
scorched3d (41.2dfsg-1) unstable; urgency=low
[ Gonéri Le Bouder ]
Modified: packages/trunk/scorched3d/debian/patches/gcc-4.3.diff
===================================================================
--- packages/trunk/scorched3d/debian/patches/gcc-4.3.diff 2008-01-26
01:03:16 UTC (rev 5504)
+++ packages/trunk/scorched3d/debian/patches/gcc-4.3.diff 2008-01-26
23:15:20 UTC (rev 5505)
@@ -1,7 +1,7 @@
-Index: scorched3d-41.2dfsg/src/common/main.h
+Index: scorched3d-41.3dfsg/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
+--- scorched3d-41.3dfsg.orig/src/common/main.h 2008-01-26 20:41:37.000000000
+0100
++++ scorched3d-41.3dfsg/src/common/main.h 2008-01-26 20:45:15.000000000
+0100
@@ -21,6 +21,8 @@
#define WIN32_LEAN_AND_MEAN
@@ -11,10 +11,10 @@
#ifdef HAVE_UNISTD_H
#include <unistd.h>
-Index: scorched3d-41.2dfsg/src/common/sha2.h
+Index: scorched3d-41.3dfsg/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
+--- scorched3d-41.3dfsg.orig/src/common/sha2.h 2008-01-26 20:41:37.000000000
+0100
++++ scorched3d-41.3dfsg/src/common/sha2.h 2008-01-26 20:45:15.000000000
+0100
@@ -46,6 +46,7 @@
#include <string>
@@ -23,23 +23,10 @@
// 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
+Index: scorched3d-41.3dfsg/src/common/DefinesFile.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
+--- scorched3d-41.3dfsg.orig/src/common/DefinesFile.cpp 2008-01-26
20:41:37.000000000 +0100
++++ scorched3d-41.3dfsg/src/common/DefinesFile.cpp 2008-01-26
20:45:15.000000000 +0100
@@ -21,6 +21,7 @@
#include <stdio.h>
#include <stdlib.h>
@@ -48,3 +35,15 @@
#include <common/DefinesFile.h>
#include <sys/types.h>
#include <sys/stat.h>
+Index: scorched3d-41.3dfsg/src/common/LoggerI.cpp
+===================================================================
+--- scorched3d-41.3dfsg.orig/src/common/LoggerI.cpp 2008-01-26
20:45:33.000000000 +0100
++++ scorched3d-41.3dfsg/src/common/LoggerI.cpp 2008-01-26 20:46:03.000000000
+0100
+@@ -20,6 +20,7 @@
+
+ #include <common/LoggerI.h>
+ #include <time.h>
++#include <cstring>
+
+ LoggerInfo::LoggerInfo(
+ const char *message,
Modified: packages/trunk/scorched3d/debian/rules
===================================================================
--- packages/trunk/scorched3d/debian/rules 2008-01-26 01:03:16 UTC (rev
5504)
+++ packages/trunk/scorched3d/debian/rules 2008-01-26 23:15:20 UTC (rev
5505)
@@ -71,6 +71,40 @@
debian/tmp/usr/share/games/scorched3d/data/globalmods/apoc/readme.txt \
debian/tmp/usr/share/games/scorched3d/data/fonts/VERA-COPYRIGHT.TXT \
debian/tmp/usr/share/games/scorched3d/data/shaders/water.license
+ rmdir \
+ debian/tmp/usr/share/games/scorched3d/data/tanks/CannonTower \
+
debian/tmp/usr/share/games/scorched3d/data/globalmods/apoc/data/accessories/cactus
\
+
debian/tmp/usr/share/games/scorched3d/data/globalmods/apoc/data/accessories/m7a3grenade
\
+
debian/tmp/usr/share/games/scorched3d/data/globalmods/apoc/data/accessories/cityoffice
\
+
debian/tmp/usr/share/games/scorched3d/data/globalmods/apoc/data/accessories/deer
\
+
debian/tmp/usr/share/games/scorched3d/data/globalmods/apoc/data/accessories/brownboulders
\
+
debian/tmp/usr/share/games/scorched3d/data/globalmods/apoc/data/accessories/smalloak
\
+
debian/tmp/usr/share/games/scorched3d/data/globalmods/apoc/data/accessories/boulders
\
+
debian/tmp/usr/share/games/scorched3d/data/globalmods/apoc/data/accessories/napalm
\
+
debian/tmp/usr/share/games/scorched3d/data/globalmods/apoc/data/accessories/church1
\
+
debian/tmp/usr/share/games/scorched3d/data/globalmods/apoc/data/accessories/skyscraper1
\
+
debian/tmp/usr/share/games/scorched3d/data/globalmods/apoc/data/accessories/shotgun
\
+
debian/tmp/usr/share/games/scorched3d/data/globalmods/apoc/data/accessories/office3
\
+
debian/tmp/usr/share/games/scorched3d/data/globalmods/apoc/data/accessories/logcabin1
\
+ debian/tmp/usr/share/games/scorched3d/data/acessories \
+
debian/tmp/usr/share/games/scorched3d/data/globalmods/apoc/data/accessories/farm1
\
+ debian/tmp/usr/share/games/scorched3d/data/tanks/sonicring \
+
debian/tmp/usr/share/games/scorched3d/data/globalmods/apoc/data/accessories/shockrocket
\
+
debian/tmp/usr/share/games/scorched3d/data/globalmods/apoc/data/accessories/fusionbarrel
\
+
debian/tmp/usr/share/games/scorched3d/data/globalmods/apoc/data/accessories/bullet
\
+
debian/tmp/usr/share/games/scorched3d/data/globalmods/apoc/data/accessories/store1
\
+
debian/tmp/usr/share/games/scorched3d/data/globalmods/apoc/data/accessories/officeplaza1
\
+
debian/tmp/usr/share/games/scorched3d/data/globalmods/apoc/data/accessories/house1
\
+
debian/tmp/usr/share/games/scorched3d/data/globalmods/apoc/data/accessories/remorcebomblet
\
+
debian/tmp/usr/share/games/scorched3d/data/globalmods/apoc/data/accessories/redhornet
\
+
debian/tmp/usr/share/games/scorched3d/data/globalmods/apoc/data/accessories/grenade
\
+ debian/tmp/usr/share/games/scorched3d/data/tanks/cannontower \
+
debian/tmp/usr/share/games/scorched3d/data/globalmods/apoc/data/accessories/common
\
+
debian/tmp/usr/share/games/scorched3d/data/globalmods/apoc/data/accessories/shockbomblet
\
+
debian/tmp/usr/share/games/scorched3d/data/globalmods/apoc/data/accessories/factory1
\
+
debian/tmp/usr/share/games/scorched3d/data/globalmods/apoc/data/accessories/50cal
\
+
debian/tmp/usr/share/games/scorched3d/data/globalmods/apoc/data/accessories/trailorhouse1
\
+
debian/tmp/usr/share/games/scorched3d/data/globalmods/apoc/data/accessories/gasstation1
binary-indep: build install
dh_testdir -i
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
