[Python-modules-commits] r20832 - in packages/basemap/trunk/debian (3 files)

[morph at users.alioth.debian.org]

    Date: Saturday, March 17, 2012 @ 15:01:32
  Author: morph
Revision: 20832

* debian/patches/fix_ftbfs_with_geos3.3
  - fix a FTBFS with geos 3.3; thanks to Andreas Beckmann for the report and
    to Francesco P. Lovergine for the patch; Closes: #663403

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

Modified: packages/basemap/trunk/debian/changelog
===================================================================
--- packages/basemap/trunk/debian/changelog	2012-03-17 12:13:39 UTC (rev 20831)
+++ packages/basemap/trunk/debian/changelog	2012-03-17 15:01:32 UTC (rev 20832)
@@ -1,3 +1,11 @@
+basemap (1.0.2-2) UNRELEASED; urgency=low
+
+  * debian/patches/fix_ftbfs_with_geos3.3
+    - fix a FTBFS with geos 3.3; thanks to Andreas Beckmann for the report and
+      to Francesco P. Lovergine for the patch; Closes: #663403
+
+ -- Sandro Tosi <morph at debian.org>  Sat, 17 Mar 2012 15:40:50 +0100
+
 basemap (1.0.2-1) unstable; urgency=low
 
   * New upstream release

Added: packages/basemap/trunk/debian/patches/fix_ftbfs_with_geos3.3
===================================================================
--- packages/basemap/trunk/debian/patches/fix_ftbfs_with_geos3.3	                        (rev 0)
+++ packages/basemap/trunk/debian/patches/fix_ftbfs_with_geos3.3	2012-03-17 15:01:32 UTC (rev 20832)
@@ -0,0 +1,23 @@
+Description: Fix FTBFS when building basemap with geos 3.3
+Author: Francesco P. Lovergine <frankie at debian.org>
+Index: basemap-1.0.2/setup.py
+===================================================================
+--- basemap-1.0.2.orig/setup.py	2012-03-17 15:45:38.000000000 +0100
++++ basemap-1.0.2/setup.py	2012-03-17 15:46:05.393026519 +0100
+@@ -77,14 +77,14 @@
+     extensions.append(Extension("_geoslib",['src/_geoslib.c'],
+                                 library_dirs=geos_library_dirs,
+                                 include_dirs=geos_include_dirs,
+-                                libraries=['geos_c','geos']))
++                                libraries=['geos_c']))
+ else:
+     #extensions.append(Extension("mpl_toolkits.basemap._geoslib",['src/_geoslib.c'],
+     extensions.append(Extension("_geoslib",['src/_geoslib.c'],
+                                 library_dirs=geos_library_dirs,
+                                 runtime_library_dirs=geos_library_dirs,
+                                 include_dirs=geos_include_dirs,
+-                                libraries=['geos_c','geos']))
++                                libraries=['geos_c']))
+ 
+ # Specify all the required mpl data
+ # create pyproj binary datum shift grid files.

Modified: packages/basemap/trunk/debian/patches/series
===================================================================
--- packages/basemap/trunk/debian/patches/series	2012-03-17 12:13:39 UTC (rev 20831)
+++ packages/basemap/trunk/debian/patches/series	2012-03-17 15:01:32 UTC (rev 20832)
@@ -3,3 +3,4 @@
 add_shebang_data_scripts
 use_share_datafiles
 install_matplotlib_sphinxext
+fix_ftbfs_with_geos3.3