[SCM] WorldForge transport library branch, master, updated. upstream/0.3.8-34-gd539ca7

Stephen M. Webb stephen.webb at bregmasoft.ca
Sun Feb 5 15:53:27 UTC 2012


The following commit has been merged in the master branch:
commit 35971db02c9e318204accc022e0398e7723a87c7
Author: Stephen M. Webb <stephen.webb at bregmasoft.ca>
Date:   Sun Feb 5 10:33:52 2012 -0500

    removed 0001-gcc-4.4.patch (no longer required)

diff --git a/debian/changelog b/debian/changelog
index 4b5f589..b3e57fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,8 +15,9 @@ skstream (0.3.8-1) UNRELEASED; urgency=low
   * debian/rules: add --with autoreconf to regenerate autotools files
   * debian/control: tweaked for multi-arch
   * used xz compression for packaging
+  * removed 0001-gcc-4.4.patch (no longer required)
 
- -- Stephen M. Webb <stephen.webb at bregmasoft.ca>  Sun, 29 Jan 2012 13:24:34 -0500
+ -- Stephen M. Webb <stephen.webb at bregmasoft.ca>  Sun, 05 Feb 2012 10:33:20 -0500
 
 skstream (0.3.6-5) unstable; urgency=low
 
diff --git a/debian/patches/0001-gcc-4.4.patch b/debian/patches/0001-gcc-4.4.patch
deleted file mode 100644
index a27d53f..0000000
--- a/debian/patches/0001-gcc-4.4.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Description: fixes compilation errors with GCC 4.4
-From: Michael Koch <konqueror at gmx.de> 
-
---- a/skstream/skserver.cpp
-+++ b/skstream/skserver.cpp
-@@ -43,6 +43,8 @@
- #include <cstdio>
- #include <cstring>
- 
-+#include <string.h>
-+
- #ifdef _WIN32
- #define SHUT_RD SD_RECEIVE
- #define SHUT_WR SD_SEND
---- a/skstream/skstream.cpp
-+++ b/skstream/skstream.cpp
-@@ -45,6 +45,8 @@
- #include <cstring>
- #include <cassert>
- 
-+#include <string.h>
-+
- #ifdef _WIN32
- #define SHUT_RD SD_RECEIVE
- #define SHUT_WR SD_SEND
---- a/skstream/skstream.h
-+++ b/skstream/skstream.h
-@@ -29,6 +29,7 @@
- #ifndef RGJ_FREE_STREAM_H_
- #define RGJ_FREE_STREAM_H_
- 
-+#include <cstdio>
- #include <iostream>
- 
- #include <skstream/sksocket.h>
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index c727c99..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-gcc-4.4.patch

-- 
WorldForge transport library



More information about the Pkg-games-commits mailing list