[Python-modules-commits] r23895 - in packages/basemap/trunk/debian (2 files)

[morph at users.alioth.debian.org]

    Date: Monday, April 8, 2013 @ 22:05:06
  Author: morph
Revision: 23895

debian/patches/{fix_ftbfs_with_geos3.3, use_share_datafiles}

Modified:
  packages/basemap/trunk/debian/changelog
  packages/basemap/trunk/debian/patches/fix_ftbfs_with_geos3.3

Modified: packages/basemap/trunk/debian/changelog
===================================================================
--- packages/basemap/trunk/debian/changelog	2013-04-08 21:56:28 UTC (rev 23894)
+++ packages/basemap/trunk/debian/changelog	2013-04-08 22:05:06 UTC (rev 23895)
@@ -4,10 +4,10 @@
   * debian/copyright
     - extended Debian packaging years
     - added new upstream files
-  * debian/patches/use_share_datafiles
+  * debian/patches/{fix_ftbfs_with_geos3.3, use_share_datafiles}
     - updated to new upstream code
 
- -- Sandro Tosi <morph at debian.org>  Mon, 08 Apr 2013 23:56:17 +0200
+ -- Sandro Tosi <morph at debian.org>  Tue, 09 Apr 2013 00:04:32 +0200
 
 basemap (1.0.5+dfsg-1) experimental; urgency=low
 

Modified: packages/basemap/trunk/debian/patches/fix_ftbfs_with_geos3.3
===================================================================
--- packages/basemap/trunk/debian/patches/fix_ftbfs_with_geos3.3	2013-04-08 21:56:28 UTC (rev 23894)
+++ packages/basemap/trunk/debian/patches/fix_ftbfs_with_geos3.3	2013-04-08 22:05:06 UTC (rev 23895)
@@ -1,14 +1,12 @@
 Description: Fix FTBFS when building basemap with geos 3.3
 Author: Francesco P. Lovergine <frankie at debian.org>
-Index: basemap-1.0.5+dfsg/setup.py
-===================================================================
---- basemap-1.0.5+dfsg.orig/setup.py	2012-08-07 23:51:53.958603491 +0200
-+++ basemap-1.0.5+dfsg/setup.py	2012-08-07 23:52:29.662982320 +0200
-@@ -75,14 +75,14 @@
+--- a/setup.py
++++ b/setup.py
+@@ -75,14 +75,14 @@ if sys.platform == 'win32':
      extensions.append(Extension("_geoslib",['src/_geoslib.c'],
                                  library_dirs=geos_library_dirs,
                                  include_dirs=geos_include_dirs,
--                                libraries=['geos_c','geos']))
+-                                libraries=['geos']))
 +                                libraries=['geos_c']))
  else:
      #extensions.append(Extension("mpl_toolkits.basemap._geoslib",['src/_geoslib.c'],