[SCM] C Bindings for the SFML Library branch, sfml-ng, updated. upstream/1.3-32-gd35846c

[Christoph Egger]

The following commit has been merged in the sfml-ng branch:
commit d35846c50c0bcf7d887fbe869befc242b915171e
Author: Christoph Egger <Christoph.Egger at gmx.de>
Date:   Sat Dec 13 13:44:02 2008 +0100

    Successfull topgit conversion

diff --git a/debian/patches/debian/correct-destdir.diff b/debian/patches/debian/correct-destdir.diff
index e997a7d..7575491 100644
--- a/debian/patches/debian/correct-destdir.diff
+++ b/debian/patches/debian/correct-destdir.diff
@@ -5,7 +5,10 @@ Subject: [PATCH] debian/correct-destdir
 for the soname-free devlibs pointing to the Destdir breaking two-step
 installs.
 
- This patch fixes this issue
+ Also, as Debian's SFML is linked internally we don't need to link against
+some of the SFML libs in some of the CSFML libs
+
+ This patch fixes these issues
 
 Signed-off-by: Christoph Egger <Christoph.Egger at gmx.de>
 
@@ -77,4 +80,4 @@ index 3bd276a..c5918b0 100644
 -	@($(CP) $(LIBNAME) $(DESTLIBDIR) && $(LN) $(LNFLAGS) $(DESTLIBDIR)/$(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB))
 +	@($(CP) $(LIBNAME) $(DESTLIBDIR) && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB))
 -- 
-tg: (7c0ebfc..) debian/correct-destdir (depends on: sfml-ng)
+tg: (5c3e225..) debian/correct-destdir (depends on: sfml-ng)
diff --git a/debian/patches/debian/gcc4.3.diff b/debian/patches/debian/gcc4.3.diff
new file mode 100644
index 0000000..fd1d4c4
--- /dev/null
+++ b/debian/patches/debian/gcc4.3.diff
@@ -0,0 +1,54 @@
+From: Christoph Egger <Christoph.Egger at gmx.de>
+Subject: [PATCH] debian/gcc4.3
+
+ Fix build problems caused by reduced dependency in gcc's include files
+
+Signed-off-by: Christoph Egger <Christoph.Egger at gmx.de>
+
+---
+ CSFML/src/SFML/Network/IPAddress.cpp |    2 ++
+ CSFML/src/SFML/Network/SocketTCP.cpp |    2 ++
+ CSFML/src/SFML/Network/SocketUDP.cpp |    2 ++
+ 3 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/CSFML/src/SFML/Network/IPAddress.cpp b/CSFML/src/SFML/Network/IPAddress.cpp
+index 553218a..ae49034 100644
+--- a/CSFML/src/SFML/Network/IPAddress.cpp
++++ b/CSFML/src/SFML/Network/IPAddress.cpp
+@@ -28,6 +28,8 @@
+ #include <SFML/Network/IPAddress.h>
+ #include <SFML/Network/IPAddress.hpp>
+ 
++#include <cstring>
++using std::strncpy;
+ 
+ namespace
+ {
+diff --git a/CSFML/src/SFML/Network/SocketTCP.cpp b/CSFML/src/SFML/Network/SocketTCP.cpp
+index 48bd1ab..c603475 100644
+--- a/CSFML/src/SFML/Network/SocketTCP.cpp
++++ b/CSFML/src/SFML/Network/SocketTCP.cpp
+@@ -31,6 +31,8 @@
+ #include <SFML/Network/Packet.hpp>
+ #include <SFML/Internal.h>
+ 
++#include <cstring>
++using std::strncpy;
+ 
+ // WARNING : this structure must always be the SAME as in Network/Packet.h
+ struct sfPacket
+diff --git a/CSFML/src/SFML/Network/SocketUDP.cpp b/CSFML/src/SFML/Network/SocketUDP.cpp
+index 174db18..08eb027 100644
+--- a/CSFML/src/SFML/Network/SocketUDP.cpp
++++ b/CSFML/src/SFML/Network/SocketUDP.cpp
+@@ -31,6 +31,8 @@
+ #include <SFML/Network/Packet.hpp>
+ #include <SFML/Internal.h>
+ 
++#include <cstring>
++using std::strncpy;
+ 
+ // WARNING : this structure must always be the SAME as in Network/Packet.h
+ struct sfPacket
+-- 
+tg: (5c3e225..) debian/gcc4.3 (depends on: sfml-ng)
diff --git a/debian/patches/series b/debian/patches/series
index f3cdb28..3806f9f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 debian/correct-destdir.diff -p1
+debian/gcc4.3.diff -p1
diff --git a/debian/rules b/debian/rules
index b087a46..553d642 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,7 @@
 #export DH_VERBOSE=1
 
 include /usr/share/quilt/quilt.make 
-include /usr/share/topgit/tg2quilt.mk
+-include /usr/share/topgit/tg2quilt.mk
 
 # shared library versions, option 1
 version=1.2.0
@@ -53,7 +53,7 @@ install: build
 	# Add here commands to install the package into debian/tmp
 	mkdir -p $(CURDIR)/debian/tmp/usr/lib
 	mkdir -p $(CURDIR)/debian/tmp/usr/include
-	cd CSFML && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+	cd CSFML && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp/usr install
 
 
 # Build architecture-independent files here.

-- 
C Bindings for the SFML Library