[Python-modules-commits] r22493 - in packages/basemap/trunk/debian (6 files)
morph at users.alioth.debian.org
morph at users.alioth.debian.org
Tue Aug 7 22:01:12 UTC 2012
Date: Tuesday, August 7, 2012 @ 22:01:11
Author: morph
Revision: 22493
* debian/patches/*
- refresh patches
Modified:
packages/basemap/trunk/debian/changelog
packages/basemap/trunk/debian/patches/add_shebang_data_scripts
packages/basemap/trunk/debian/patches/dont_install_data_files
packages/basemap/trunk/debian/patches/fix_ftbfs_with_geos3.3
packages/basemap/trunk/debian/patches/install_matplotlib_sphinxext
packages/basemap/trunk/debian/patches/use_share_datafiles
Modified: packages/basemap/trunk/debian/changelog
===================================================================
--- packages/basemap/trunk/debian/changelog 2012-08-07 21:38:18 UTC (rev 22492)
+++ packages/basemap/trunk/debian/changelog 2012-08-07 22:01:11 UTC (rev 22493)
@@ -1,8 +1,10 @@
basemap (1.0.5+dfsg-1) UNRELEASED; urgency=low
* new upstream release
+ * debian/patches/*
+ - refresh patches
- -- Sandro Tosi <morph at debian.org> Tue, 07 Aug 2012 23:38:08 +0200
+ -- Sandro Tosi <morph at debian.org> Tue, 07 Aug 2012 23:53:05 +0200
basemap (1.0.3+dfsg-2) unstable; urgency=low
Modified: packages/basemap/trunk/debian/patches/add_shebang_data_scripts
===================================================================
--- packages/basemap/trunk/debian/patches/add_shebang_data_scripts 2012-08-07 21:38:18 UTC (rev 22492)
+++ packages/basemap/trunk/debian/patches/add_shebang_data_scripts 2012-08-07 22:01:11 UTC (rev 22493)
@@ -1,39 +1,39 @@
Description: added missing shebang to data/ scripts
Author: Sandro Tosi <morph at debian.org>
-Index: basemap-1.0.1/lib/mpl_toolkits/basemap/data/test27
+Index: basemap-1.0.5+dfsg/lib/mpl_toolkits/basemap/data/test27
===================================================================
---- basemap-1.0.1.orig/lib/mpl_toolkits/basemap/data/test27 2011-09-18 18:46:06.045570560 +0200
-+++ basemap-1.0.1/lib/mpl_toolkits/basemap/data/test27 2011-09-18 18:46:18.125937000 +0200
+--- basemap-1.0.5+dfsg.orig/lib/mpl_toolkits/basemap/data/test27 2012-08-07 23:51:27.390322084 +0200
++++ basemap-1.0.5+dfsg/lib/mpl_toolkits/basemap/data/test27 2012-08-07 23:52:02.230691193 +0200
@@ -1,4 +1,4 @@
-:
+#!/bin/sh
# Script to test most of the SPCS zones.
# This script generated from execution of NMD's program l176, where
# the second pair of numbers are respective easting and northing output.
-Index: basemap-1.0.1/lib/mpl_toolkits/basemap/data/test83
+Index: basemap-1.0.5+dfsg/lib/mpl_toolkits/basemap/data/test83
===================================================================
---- basemap-1.0.1.orig/lib/mpl_toolkits/basemap/data/test83 2011-09-18 18:46:06.057570924 +0200
-+++ basemap-1.0.1/lib/mpl_toolkits/basemap/data/test83 2011-09-18 18:46:28.330246695 +0200
+--- basemap-1.0.5+dfsg.orig/lib/mpl_toolkits/basemap/data/test83 2012-08-07 23:51:27.390322084 +0200
++++ basemap-1.0.5+dfsg/lib/mpl_toolkits/basemap/data/test83 2012-08-07 23:52:02.230691193 +0200
@@ -1,4 +1,4 @@
-:
+#!/bin/sh
# Script to test most of the SPCS zones.
#
# This script generated from execution of NMD's program l176, where
-Index: basemap-1.0.1/lib/mpl_toolkits/basemap/data/testntv2
+Index: basemap-1.0.5+dfsg/lib/mpl_toolkits/basemap/data/testntv2
===================================================================
---- basemap-1.0.1.orig/lib/mpl_toolkits/basemap/data/testntv2 2011-09-18 18:46:06.069571288 +0200
-+++ basemap-1.0.1/lib/mpl_toolkits/basemap/data/testntv2 2011-09-18 18:46:37.322519727 +0200
+--- basemap-1.0.5+dfsg.orig/lib/mpl_toolkits/basemap/data/testntv2 2012-08-07 23:51:27.390322084 +0200
++++ basemap-1.0.5+dfsg/lib/mpl_toolkits/basemap/data/testntv2 2012-08-07 23:52:02.230691193 +0200
@@ -1,4 +1,4 @@
-:
+#!/bin/sh
#
# Test NTv2 (.gsb) support. Assumes ntv2_0.gsb is installed.
#
-Index: basemap-1.0.1/lib/mpl_toolkits/basemap/data/testvarious
+Index: basemap-1.0.5+dfsg/lib/mpl_toolkits/basemap/data/testvarious
===================================================================
---- basemap-1.0.1.orig/lib/mpl_toolkits/basemap/data/testvarious 2011-09-18 18:46:06.085571773 +0200
-+++ basemap-1.0.1/lib/mpl_toolkits/basemap/data/testvarious 2011-09-18 18:46:50.250912472 +0200
+--- basemap-1.0.5+dfsg.orig/lib/mpl_toolkits/basemap/data/testvarious 2012-08-07 23:51:27.390322084 +0200
++++ basemap-1.0.5+dfsg/lib/mpl_toolkits/basemap/data/testvarious 2012-08-07 23:52:02.230691193 +0200
@@ -1,4 +1,4 @@
-:
+#!/bin/sh
Modified: packages/basemap/trunk/debian/patches/dont_install_data_files
===================================================================
--- packages/basemap/trunk/debian/patches/dont_install_data_files 2012-08-07 21:38:18 UTC (rev 22492)
+++ packages/basemap/trunk/debian/patches/dont_install_data_files 2012-08-07 22:01:11 UTC (rev 22493)
@@ -2,10 +2,10 @@
separate arch:all package
Author: Sandro Tosi <morph at debian.org>
Forwarded: no
-Index: basemap-1.0.2/setup.py
+Index: basemap-1.0.5+dfsg/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 21:48:53.767056480 +0100
+--- basemap-1.0.5+dfsg.orig/setup.py 2012-08-07 23:51:27.498323226 +0200
++++ basemap-1.0.5+dfsg/setup.py 2012-08-07 23:51:53.958603491 +0200
@@ -134,6 +134,5 @@
packages = packages,
package_dir = package_dirs,
Modified: packages/basemap/trunk/debian/patches/fix_ftbfs_with_geos3.3
===================================================================
--- packages/basemap/trunk/debian/patches/fix_ftbfs_with_geos3.3 2012-08-07 21:38:18 UTC (rev 22492)
+++ packages/basemap/trunk/debian/patches/fix_ftbfs_with_geos3.3 2012-08-07 22:01:11 UTC (rev 22493)
@@ -1,10 +1,10 @@
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
+Index: basemap-1.0.5+dfsg/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 @@
+--- 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 @@
extensions.append(Extension("_geoslib",['src/_geoslib.c'],
library_dirs=geos_library_dirs,
include_dirs=geos_include_dirs,
Modified: packages/basemap/trunk/debian/patches/install_matplotlib_sphinxext
===================================================================
--- packages/basemap/trunk/debian/patches/install_matplotlib_sphinxext 2012-08-07 21:38:18 UTC (rev 22492)
+++ packages/basemap/trunk/debian/patches/install_matplotlib_sphinxext 2012-08-07 22:01:11 UTC (rev 22493)
@@ -2,10 +2,10 @@
documentaion
Author: Sandro Tosi <morph at debian.org>
Forwarded: not-needed
-Index: basemap-1.0.1/doc/sphinxext/gen_gallery.py
+Index: basemap-1.0.5+dfsg/doc/sphinxext/gen_gallery.py
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ basemap-1.0.1/doc/sphinxext/gen_gallery.py 2010-07-07 03:41:46.000000000 +0200
++++ basemap-1.0.5+dfsg/doc/sphinxext/gen_gallery.py 2012-08-07 23:52:18.654865443 +0200
@@ -0,0 +1,124 @@
+# generate a thumbnail gallery of examples
+template = """\
@@ -131,10 +131,10 @@
+
+def setup(app):
+ app.connect('env-updated', gen_gallery)
-Index: basemap-1.0.1/doc/sphinxext/gen_rst.py
+Index: basemap-1.0.5+dfsg/doc/sphinxext/gen_rst.py
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ basemap-1.0.1/doc/sphinxext/gen_rst.py 2010-07-07 03:41:46.000000000 +0200
++++ basemap-1.0.5+dfsg/doc/sphinxext/gen_rst.py 2012-08-07 23:52:18.658865485 +0200
@@ -0,0 +1,158 @@
+"""
+generate the rst files for the examples by iterating over the pylab examples
@@ -294,10 +294,10 @@
+
+def setup(app):
+ app.connect('builder-inited', generate_example_rst)
-Index: basemap-1.0.1/doc/sphinxext/inheritance_diagram.py
+Index: basemap-1.0.5+dfsg/doc/sphinxext/inheritance_diagram.py
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ basemap-1.0.1/doc/sphinxext/inheritance_diagram.py 2010-07-07 03:41:46.000000000 +0200
++++ basemap-1.0.5+dfsg/doc/sphinxext/inheritance_diagram.py 2012-08-07 23:52:18.658865485 +0200
@@ -0,0 +1,407 @@
+"""
+Defines a docutils directive for inserting inheritance diagrams.
@@ -706,10 +706,10 @@
+ app.add_directive(
+ 'inheritance-diagram', inheritance_diagram_directive,
+ False, (1, 100, 0), parts = directives.nonnegative_int)
-Index: basemap-1.0.1/doc/sphinxext/math_symbol_table.py
+Index: basemap-1.0.5+dfsg/doc/sphinxext/math_symbol_table.py
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ basemap-1.0.1/doc/sphinxext/math_symbol_table.py 2010-07-07 03:41:46.000000000 +0200
++++ basemap-1.0.5+dfsg/doc/sphinxext/math_symbol_table.py 2012-08-07 23:52:18.658865485 +0200
@@ -0,0 +1,159 @@
+symbols = [
+ ["Lower-case Greek",
@@ -870,10 +870,10 @@
+ for sym in _mathtext_data.tex2uni:
+ if sym not in all_symbols:
+ print sym
-Index: basemap-1.0.1/doc/sphinxext/mathml.py
+Index: basemap-1.0.5+dfsg/doc/sphinxext/mathml.py
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ basemap-1.0.1/doc/sphinxext/mathml.py 2010-07-07 03:41:46.000000000 +0200
++++ basemap-1.0.5+dfsg/doc/sphinxext/mathml.py 2012-08-07 23:52:18.658865485 +0200
@@ -0,0 +1,552 @@
+from docutils import nodes
+from docutils.writers.html4css1 import HTMLTranslator
Modified: packages/basemap/trunk/debian/patches/use_share_datafiles
===================================================================
--- packages/basemap/trunk/debian/patches/use_share_datafiles 2012-08-07 21:38:18 UTC (rev 22492)
+++ packages/basemap/trunk/debian/patches/use_share_datafiles 2012-08-07 22:01:11 UTC (rev 22493)
@@ -1,23 +1,23 @@
Description: Use the datafile in the python-mpltoolkits.basemap-data package,
if BASEMAPDATA is not set
Author: Sandro Tosi <morph at debian.org>
-Index: basemap-1.0.3+dfsg/lib/mpl_toolkits/basemap/__init__.py
+Index: basemap-1.0.5+dfsg/lib/mpl_toolkits/basemap/__init__.py
===================================================================
---- basemap-1.0.3+dfsg.orig/lib/mpl_toolkits/basemap/__init__.py 2012-05-18 00:39:30.000000000 +0200
-+++ basemap-1.0.3+dfsg/lib/mpl_toolkits/basemap/__init__.py 2012-05-27 22:24:13.009145054 +0200
-@@ -43,7 +43,7 @@
+--- basemap-1.0.5+dfsg.orig/lib/mpl_toolkits/basemap/__init__.py 2012-08-07 23:51:27.334321491 +0200
++++ basemap-1.0.5+dfsg/lib/mpl_toolkits/basemap/__init__.py 2012-08-07 23:52:08.542758141 +0200
+@@ -44,7 +44,7 @@
if not os.path.isdir(basemap_datadir):
raise RuntimeError('Path in environment BASEMAPDATA not a directory')
else:
- basemap_datadir = os.sep.join([os.path.dirname(__file__), 'data'])
+ basemap_datadir = '/usr/share/basemap/data'
- __version__ = '1.0.3'
+ __version__ = '1.0.5'
-Index: basemap-1.0.3+dfsg/lib/mpl_toolkits/basemap/pyproj.py
+Index: basemap-1.0.5+dfsg/lib/mpl_toolkits/basemap/pyproj.py
===================================================================
---- basemap-1.0.3+dfsg.orig/lib/mpl_toolkits/basemap/pyproj.py 2012-05-18 00:39:33.000000000 +0200
-+++ basemap-1.0.3+dfsg/lib/mpl_toolkits/basemap/pyproj.py 2012-05-27 22:24:13.013145092 +0200
+--- basemap-1.0.5+dfsg.orig/lib/mpl_toolkits/basemap/pyproj.py 2012-08-07 23:51:27.334321491 +0200
++++ basemap-1.0.5+dfsg/lib/mpl_toolkits/basemap/pyproj.py 2012-08-07 23:52:08.542758141 +0200
@@ -236,7 +236,7 @@
"sphere": {'a':6370997.0,'b':6370997.0,'description':"Normal Sphere"},
}
More information about the Python-modules-commits
mailing list