[SCM] Simple and fast multimedia library for C++ branch, master, updated. 58cd30a4fdc3f8ff2f0cc4fc87e09359211145fb

[Christoph Egger]

The following commit has been merged in the master branch:
commit 58cd30a4fdc3f8ff2f0cc4fc87e09359211145fb
Author: Christoph Egger <Christoph.Egger at gmx.de>
Date:   Tue Jun 10 19:10:22 2008 +0200

     * Fixing build error on g++-4.3
     * Keeping on standards 3.7.3 for this one

diff --git a/debian/changelog b/debian/changelog
index 5c0fbeb..2344fc2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,10 +2,10 @@ libsfml (1.2-2) UNRELEASED; urgency=low
 
   * Changing copyright of the packaging part
     to be identical to the Source (zlib)
-  * Changing Standards Version to 3.8.0 without changes
   * Fixing Vcs-Git Field
+  * Fixing build with g++ 4.3
 
- -- Christoph Egger <Christoph.Egger at gmx.de>  Sun, 08 Jun 2008 19:41:55 +0200
+ -- Christoph Egger <Christoph.Egger at gmx.de>  Tue, 10 Jun 2008 18:52:46 +0200
 
 libsfml (1.2-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index c7a2264..d0c73ec 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Christoph Egger <Christoph.Egger at gmx.de>
 Vcs-Git: git://git.debian.org/git/pkg-games/libsfml.git/
 Vcs-Browser: http://git.debian.org/?p=pkg-games/libsfml.git
 Build-Depends: debhelper (>= 5), libgl1-mesa-glx, mesa-common-dev, libglu1-mesa-dev, libxrandr-dev, libfreetype6-dev, libopenal-dev, libsndfile1-dev, libjpeg62-dev, libpng12-dev, libglew1.5-dev, quilt
-Standards-Version: 3.8.0
+Standards-Version: 3.7.3
 
 Package: libsfml1-dev
 Section: libdevel
diff --git a/debian/patches/cstring_ftbfs.patch b/debian/patches/cstring_ftbfs.patch
new file mode 100644
index 0000000..f94650f
--- /dev/null
+++ b/debian/patches/cstring_ftbfs.patch
@@ -0,0 +1,66 @@
+Index: libsfml/src/SFML/Network/IPAddress.cpp
+===================================================================
+--- libsfml.orig/src/SFML/Network/IPAddress.cpp	2008-06-10 18:43:37.000000000 +0200
++++ libsfml/src/SFML/Network/IPAddress.cpp	2008-06-10 18:46:25.000000000 +0200
+@@ -28,6 +28,8 @@
+ #include <SFML/Network/IPAddress.hpp>
+ #include <SFML/Network/SocketHelper.hpp>
+ 
++#include <cstring>
++using std::memset;
+ 
+ namespace sf
+ {
+Index: libsfml/src/SFML/Network/Packet.cpp
+===================================================================
+--- libsfml.orig/src/SFML/Network/Packet.cpp	2008-06-10 18:43:37.000000000 +0200
++++ libsfml/src/SFML/Network/Packet.cpp	2008-06-10 18:46:25.000000000 +0200
+@@ -28,6 +28,9 @@
+ #include <SFML/Network/Packet.hpp>
+ #include <SFML/Network/SocketHelper.hpp>
+ 
++#include <cstring>
++using std::memset;
++using std::strncpy;
+ 
+ namespace sf
+ {
+Index: libsfml/src/SFML/Network/SocketTCP.cpp
+===================================================================
+--- libsfml.orig/src/SFML/Network/SocketTCP.cpp	2008-06-10 18:43:37.000000000 +0200
++++ libsfml/src/SFML/Network/SocketTCP.cpp	2008-06-10 18:46:25.000000000 +0200
+@@ -30,6 +30,8 @@
+ #include <SFML/Network/Packet.hpp>
+ #include <iostream>
+ 
++#include <cstring>
++using std::memset;
+ 
+ namespace sf
+ {
+Index: libsfml/src/SFML/Network/SocketUDP.cpp
+===================================================================
+--- libsfml.orig/src/SFML/Network/SocketUDP.cpp	2008-06-10 18:46:34.000000000 +0200
++++ libsfml/src/SFML/Network/SocketUDP.cpp	2008-06-10 18:46:53.000000000 +0200
+@@ -30,6 +30,8 @@
+ #include <SFML/Network/Packet.hpp>
+ #include <iostream>
+ 
++#include <cstring>
++using std::memset;
+ 
+ namespace sf
+ {
+Index: libsfml/src/SFML/Audio/SoundFileDefault.cpp
+===================================================================
+--- libsfml.orig/src/SFML/Audio/SoundFileDefault.cpp	2008-06-10 18:49:11.000000000 +0200
++++ libsfml/src/SFML/Audio/SoundFileDefault.cpp	2008-06-10 18:49:35.000000000 +0200
+@@ -28,6 +28,8 @@
+ #include <SFML/Audio/SoundFileDefault.hpp>
+ #include <iostream>
+ 
++#include <cstring>
++using std::memcpy;
+ 
+ namespace sf
+ {
diff --git a/debian/patches/series b/debian/patches/series
index 4e3e3ed..a4e755f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ add_destdir_to_makefiles.patch
 add_script_header_to_example_makefiles.patch
 removing_removed_sources_from_makefiles.patch
 patching_files_as_needed_by_repackaging.patch
+cstring_ftbfs.patch

-- 
Simple and fast multimedia library for C++