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

[morph at users.alioth.debian.org]

    Date: Sunday, November 13, 2011 @ 21:24:03
  Author: morph
Revision: 19316

reintroduce dont_compile_nad2bin_on_clean

Added:
  packages/basemap/trunk/debian/patches/dont_compile_nad2bin_on_clean
Modified:
  packages/basemap/trunk/debian/changelog
  packages/basemap/trunk/debian/patches/series

Modified: packages/basemap/trunk/debian/changelog
===================================================================
--- packages/basemap/trunk/debian/changelog	2011-11-13 21:03:11 UTC (rev 19315)
+++ packages/basemap/trunk/debian/changelog	2011-11-13 21:24:03 UTC (rev 19316)
@@ -3,13 +3,13 @@
   * New upstream release
   * debian/copyright
     - updated
-  * debian/patches/{configure_third_party_modules_installation,
+  * debian/patches/configure_third_party_modules_installation
+    - removed, no longer needed
+  * debian/patches/{dont_install_data_files, use_share_datafiles,
                     dont_compile_nad2bin_on_clean}
-    - removed, no longer needed
-  * debian/patches/{dont_install_data_files, use_share_datafiles}
     - updated to new upstream code
 
- -- Sandro Tosi <morph at debian.org>  Sun, 13 Nov 2011 21:57:06 +0100
+ -- Sandro Tosi <morph at debian.org>  Sun, 13 Nov 2011 22:05:43 +0100
 
 basemap (1.0.1-1) unstable; urgency=low
 

Added: packages/basemap/trunk/debian/patches/dont_compile_nad2bin_on_clean
===================================================================
--- packages/basemap/trunk/debian/patches/dont_compile_nad2bin_on_clean	                        (rev 0)
+++ packages/basemap/trunk/debian/patches/dont_compile_nad2bin_on_clean	2011-11-13 21:24:03 UTC (rev 19316)
@@ -0,0 +1,13 @@
+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'])

Modified: packages/basemap/trunk/debian/patches/series
===================================================================
--- packages/basemap/trunk/debian/patches/series	2011-11-13 21:03:11 UTC (rev 19315)
+++ packages/basemap/trunk/debian/patches/series	2011-11-13 21:24:03 UTC (rev 19316)
@@ -1,3 +1,4 @@
+dont_compile_nad2bin_on_clean
 dont_install_data_files
 add_shebang_data_scripts
 use_share_datafiles