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

[morph at users.alioth.debian.org]

    Date: Sunday, May 27, 2012 @ 20:49:06
  Author: morph
Revision: 21959

removed, merged upstream

Modified:
  packages/basemap/trunk/debian/changelog
Deleted:
  packages/basemap/trunk/debian/patches/dont_compile_nad2bin_on_clean

Modified: packages/basemap/trunk/debian/changelog
===================================================================
--- packages/basemap/trunk/debian/changelog	2012-05-27 20:18:41 UTC (rev 21958)
+++ packages/basemap/trunk/debian/changelog	2012-05-27 20:49:06 UTC (rev 21959)
@@ -5,8 +5,10 @@
   * debian/copyright
     - updated for new upstream code
     - extended packaging copyright years
+  * debian/patches/dont_compile_nad2bin_on_clean
+    - removed, merged upstream
 
- -- Sandro Tosi <morph at debian.org>  Sun, 27 May 2012 22:02:10 +0200
+ -- Sandro Tosi <morph at debian.org>  Sun, 27 May 2012 22:48:33 +0200
 
 basemap (1.0.2-3) unstable; urgency=low
 

Deleted: packages/basemap/trunk/debian/patches/dont_compile_nad2bin_on_clean
===================================================================
--- packages/basemap/trunk/debian/patches/dont_compile_nad2bin_on_clean	2012-05-27 20:18:41 UTC (rev 21958)
+++ packages/basemap/trunk/debian/patches/dont_compile_nad2bin_on_clean	2012-05-27 20:49:06 UTC (rev 21959)
@@ -1,13 +0,0 @@
-Index: basemap-1.0.2/setup.py
-===================================================================
---- basemap-1.0.2.orig/setup.py	2011-11-05 18:02:58.000000000 +0100
-+++ basemap-1.0.2/setup.py	2011-11-13 22:05:27.571909960 +0100
-@@ -90,7 +90,7 @@
- # create pyproj binary datum shift grid files.
- pathout =\
- os.path.join('lib',os.path.join('mpl_toolkits',os.path.join('basemap','data')))
--if sys.argv[1] != ['sdist','clean']:
-+if sys.argv[1] not in ['sdist','clean']:
-     cc = ccompiler.new_compiler()
-     sysconfig.customize_compiler(cc)
-     cc.set_include_dirs(['src'])