[Python-modules-commits] r22497 - in packages/basemap/trunk/debian (4 files)
morph at users.alioth.debian.org
morph at users.alioth.debian.org
Fri Aug 10 21:36:54 UTC 2012
Date: Friday, August 10, 2012 @ 21:36:52
Author: morph
Revision: 22497
* debian/control
- add python-tk to b-d, needed to have a fully functional matplotlib module
Modified:
packages/basemap/trunk/debian/changelog
packages/basemap/trunk/debian/control
packages/basemap/trunk/debian/patches/use_share_datafiles
packages/basemap/trunk/debian/rules
Modified: packages/basemap/trunk/debian/changelog
===================================================================
--- packages/basemap/trunk/debian/changelog 2012-08-10 21:05:46 UTC (rev 22496)
+++ packages/basemap/trunk/debian/changelog 2012-08-10 21:36:52 UTC (rev 22497)
@@ -1,10 +1,12 @@
-basemap (1.0.5+dfsg-1) experimental; urgency=low
+basemap (1.0.5+dfsg-1) UNRELEASED; urgency=low
* new upstream release
* debian/patches/*
- refresh patches
+ * debian/control
+ - add python-tk to b-d, needed to have a fully functional matplotlib module
- -- Sandro Tosi <morph at debian.org> Wed, 08 Aug 2012 00:02:06 +0200
+ -- Sandro Tosi <morph at debian.org> Fri, 10 Aug 2012 23:35:53 +0200
basemap (1.0.3+dfsg-2) unstable; urgency=low
Modified: packages/basemap/trunk/debian/control
===================================================================
--- packages/basemap/trunk/debian/control 2012-08-10 21:05:46 UTC (rev 22496)
+++ packages/basemap/trunk/debian/control 2012-08-10 21:36:52 UTC (rev 22497)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Uploaders: Sandro Tosi <morph at debian.org>
-Build-Depends: debhelper (>= 8.0.0), python-all, python-all-dev, python-all-dbg, libgeos-dev, python-httplib2, python-dap, python-support, python-sphinx (>= 1.0.7+dfsg), python-numpy (>= 1:1.5.1-4), python-numpy-dbg, python-matplotlib
+Build-Depends: debhelper (>= 8.0.0), python-all, python-all-dev, python-all-dbg, libgeos-dev, python-httplib2, python-dap, python-support, python-sphinx (>= 1.0.7+dfsg), python-numpy (>= 1:1.5.1-4), python-numpy-dbg, python-matplotlib, python-tk
Standards-Version: 3.9.3
Homepage: http://matplotlib.sourceforge.net/toolkits.html
Modified: packages/basemap/trunk/debian/patches/use_share_datafiles
===================================================================
--- packages/basemap/trunk/debian/patches/use_share_datafiles 2012-08-10 21:05:46 UTC (rev 22496)
+++ packages/basemap/trunk/debian/patches/use_share_datafiles 2012-08-10 21:36:52 UTC (rev 22497)
@@ -3,8 +3,8 @@
Author: Sandro Tosi <morph at debian.org>
Index: basemap-1.0.5+dfsg/lib/mpl_toolkits/basemap/__init__.py
===================================================================
---- 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
+--- basemap-1.0.5+dfsg.orig/lib/mpl_toolkits/basemap/__init__.py 2012-08-06 19:25:57.000000000 +0200
++++ basemap-1.0.5+dfsg/lib/mpl_toolkits/basemap/__init__.py 2012-08-10 21:50:52.706019305 +0200
@@ -44,7 +44,7 @@
if not os.path.isdir(basemap_datadir):
raise RuntimeError('Path in environment BASEMAPDATA not a directory')
@@ -16,14 +16,24 @@
Index: basemap-1.0.5+dfsg/lib/mpl_toolkits/basemap/pyproj.py
===================================================================
---- 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 @@
+--- basemap-1.0.5+dfsg.orig/lib/mpl_toolkits/basemap/pyproj.py 2012-08-06 19:26:00.000000000 +0200
++++ basemap-1.0.5+dfsg/lib/mpl_toolkits/basemap/pyproj.py 2012-08-10 21:49:42.941275370 +0200
+@@ -236,10 +236,14 @@
"sphere": {'a':6370997.0,'b':6370997.0,'description':"Normal Sphere"},
}
-pyproj_datadir = os.sep.join([os.path.dirname(__file__), 'data'])
-+pyproj_datadir = '/usr/share/basemap/data'
- if not os.path.isdir(pyproj_datadir):
- msg="proj data directory not found. Expecting it at: %s"%pyproj_datadir
- raise IOError(msg)
+-if not os.path.isdir(pyproj_datadir):
+- msg="proj data directory not found. Expecting it at: %s"%pyproj_datadir
+- raise IOError(msg)
++# check to see if environment variable BASEMAPDATA set to a directory,
++# and if so look for the data there.
++if 'BASEMAPDATA' in os.environ:
++ pyproj_datadir = os.environ['BASEMAPDATA']
++ if not os.path.isdir(pyproj_datadir):
++ raise RuntimeError('Path in environment BASEMAPDATA not a directory')
++else:
++ pyproj_datadir = '/usr/share/basemap/data'
+
+ set_datapath(pyproj_datadir)
+
Modified: packages/basemap/trunk/debian/rules
===================================================================
--- packages/basemap/trunk/debian/rules 2012-08-10 21:05:46 UTC (rev 22496)
+++ packages/basemap/trunk/debian/rules 2012-08-10 21:36:52 UTC (rev 22497)
@@ -1,6 +1,7 @@
#!/usr/bin/make -f
PYVERS := $(shell pyversions -s)
+LIB := $$(python -c "from distutils.command.build import build ; from distutils.core import Distribution ; b = build(Distribution()) ; b.finalize_options() ; print b.build_platlib")
%:
dh $@ --with sphinxdoc
@@ -24,9 +25,13 @@
dh build
build-indep:
+ # HACK: we need to import axes_grid1 but we need to import it from the "local"
+ # mpl_toolkits namespace
+ ln -s $$(dirname $$(python -c "import mpl_toolkits.axes_grid1 as p; print p.__file__")) $(CURDIR)/$(LIB)/mpl_toolkits/
# build doc only for default python version
- LIB=$$(python -c "from distutils.command.build import build ; from distutils.core import Distribution ; b = build(Distribution()) ; b.finalize_options() ; print b.build_platlib")
- (export MPLCONFIGDIR=. ; cd doc ; PYTHONPATH=$$LIB python make.py html)
+ (export MPLCONFIGDIR=. ; cd doc ; PYTHONPATH=$(CURDIR)/$(LIB) BASEMAPDATA=$(CURDIR)/lib/mpl_toolkits/basemap/data/ python make.py html)
+ # remove hack
+ rm $(CURDIR)/$(LIB)/mpl_toolkits/axes_grid1
override_dh_sphinxdoc:
dh_sphinxdoc -i
More information about the Python-modules-commits
mailing list