[Pkg-sdl-commits] r153 - in unstable/libparagui1.0/debian: . patches

[aurel32 at alioth.debian.org]

Author: aurel32
Date: 2007-12-18 08:01:58 +0000 (Tue, 18 Dec 2007)
New Revision: 153

Added:
   unstable/libparagui1.0/debian/patches/020_stl_map.diff
Modified:
   unstable/libparagui1.0/debian/changelog
   unstable/libparagui1.0/debian/patches/series
Log:
  * debian/patches/020_stl_map.diff:
    + Always use #include <map>.  Closes: bug#455340.



Modified: unstable/libparagui1.0/debian/changelog
===================================================================
--- unstable/libparagui1.0/debian/changelog	2007-12-17 23:34:53 UTC (rev 152)
+++ unstable/libparagui1.0/debian/changelog	2007-12-18 08:01:58 UTC (rev 153)
@@ -1,16 +1,16 @@
-libparagui1.0 (1.0.4-14) UNRELEASED; urgency=low
-
-  * Make the package binNMU safe. 
-
- -- Aurelien Jarno <aurel32 at debian.org>  Mon,  5 Mar 2007 21:44:53 +0100
-
 libparagui1.0 (1.0.4-13) unstable; urgency=low
 
+  [ Sam Hocevar]
   * debian/patches/030_underquoted_definitions.diff:
     + New patch. Fix annoying underquoted definition in paragui.m4.
 
- -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Sat, 15 Jul 2006 12:13:45 +0200
+  [ Aurelien Jarno ]
+  * Make the package binNMU safe.
+  * debian/patches/020_stl_map.diff:
+    + Always use #include <map>.  Closes: bug#455340.
 
+ -- Aurelien Jarno <aurel32 at debian.org>  Tue, 18 Dec 2007 08:58:36 +0100
+
 libparagui1.0 (1.0.4-12) unstable; urgency=low
 
   * Distribute the .so link with the -dev package.

Added: unstable/libparagui1.0/debian/patches/020_stl_map.diff
===================================================================
--- unstable/libparagui1.0/debian/patches/020_stl_map.diff	                        (rev 0)
+++ unstable/libparagui1.0/debian/patches/020_stl_map.diff	2007-12-18 08:01:58 UTC (rev 153)
@@ -0,0 +1,25 @@
+--- libparagui1.0-1.0.4.orig/include/paraconfig.h
++++ libparagui1.0-1.0.4/include/paraconfig.h
+@@ -44,22 +44,8 @@
+ 
+ // STL map / hash_map
+ 
+-#if defined(HAVE_HASH_MAP)
+-#define HASH_MAP_INC <hash_map>
+-#define MAP_INC <hash_map>
+-#define STL_MAP hash_map
+-#elif defined(HAVE_EXT_HASH_MAP)
+-#define HASH_MAP_INC <ext/hash_map>
+-#define MAP_INC <ext/hash_map>
+-#if PG_VERSIONNUM(__GNUC__, __GNUC_MINOR__, 0) >= PG_VERSIONNUM(3, 1, 0)
+-#define STL_MAP __gnu_cxx::hash_map
+-#else
+-#define STL_MAP hash_map
+-#endif
+-#else
+ #define MAP_INC <map>
+ #define STL_MAP map
+-#endif
+ 
+ 
+ //

Modified: unstable/libparagui1.0/debian/patches/series
===================================================================
--- unstable/libparagui1.0/debian/patches/series	2007-12-17 23:34:53 UTC (rev 152)
+++ unstable/libparagui1.0/debian/patches/series	2007-12-18 08:01:58 UTC (rev 153)
@@ -1,5 +1,6 @@
 000_freetype_linkage.diff -p1
 010_rebootstrap.diff
+020_stl_map.diff
 021_pgtimerobject.h.diff -p0
 022_pglog.h.diff 
 023_pgmsgmap.cpp.diff