[SCM] WorldForge protocol library branch, master, updated. upstream/0.6.2-16-ga4253ee

Stephen M. Webb stephen.webb at bregmasoft.ca
Wed Jan 11 08:38:29 UTC 2012


The following commit has been merged in the master branch:
commit 2cc60e88ea7b67972208cd0b3103b6a3af50adc1
Author: Stephen M. Webb <stephen.webb at bregmasoft.ca>
Date:   Wed Jan 11 01:58:16 2012 -0500

    removed unneeded patches

diff --git a/debian/changelog b/debian/changelog
index 3846206..7a6adf1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ atlas-cpp (0.6.2-1) UNRELEASED; urgency=low
   * regenerate the autotools at build time to fix rpsth problems
   * debian/libatlas-cpp-0.6-1.symbols: added
   * updated the -doc package files
+  * removed unneeded patches
 
  -- Stephen M. Webb <stephen.webb at bregmasoft.ca>  Tue, 10 Jan 2012 21:33:22 -0500
 
diff --git a/debian/patches/atlas-cpp-gcc43.patch b/debian/patches/atlas-cpp-gcc43.patch
deleted file mode 100644
index 6293645..0000000
--- a/debian/patches/atlas-cpp-gcc43.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- Atlas/Filter.cpp.orig
-+++ Atlas/Filter.cpp
-@@ -4,6 +4,8 @@
- 
- #include <Atlas/Filter.h>
- 
-+#include <string.h>
-+
- namespace Atlas {
- 
- Filter::Filter(Filter* next)
-@@ -41,9 +43,9 @@
- 
-     if (numPutback > m_inPutback) numPutback = m_inPutback;
- 
--    std::memcpy(m_outBuffer + (m_inPutback - numPutback),
--                gptr() - numPutback,
--                (unsigned long) numPutback);
-+    ::memcpy(m_outBuffer + (m_inPutback - numPutback),
-+             gptr() - numPutback,
-+             (unsigned long) numPutback);
- 
-     int num;
- 
-only in patch2:
-unchanged:
---- tools/atlas_convert.cpp.orig
-+++ tools/atlas_convert.cpp
-@@ -14,6 +14,7 @@
- #include <fstream>
- #include <iostream>
- 
-+#include <stdlib.h>
- #include <unistd.h>
- 
- int option_format = 0;
diff --git a/debian/patches/atlas-cpp-gcc44.patch b/debian/patches/atlas-cpp-gcc44.patch
deleted file mode 100644
index 7286b2f..0000000
--- a/debian/patches/atlas-cpp-gcc44.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Atlas/Filter.cpp.orig	2009-07-21 11:21:03.000000000 +0200
-+++ Atlas/Filter.cpp	2009-07-21 11:21:34.000000000 +0200
-@@ -4,6 +4,7 @@
- 
- #include <Atlas/Filter.h>
- 
-+#include <cstdio>
- #include <string.h>
- 
- namespace Atlas {

-- 
WorldForge protocol library



More information about the Pkg-games-commits mailing list