[Python-modules-commits] r7511 - in packages/pyproj/trunk/debian (8 files)
chrismurf-guest at users.alioth.debian.org
chrismurf-guest at users.alioth.debian.org
Fri Feb 13 15:30:07 UTC 2009
Date: Friday, February 13, 2009 @ 15:30:06
Author: chrismurf-guest
Revision: 7511
Split data off into seperate -data package
Added:
packages/pyproj/trunk/debian/patches/
packages/pyproj/trunk/debian/patches/00-setup.py.patch
packages/pyproj/trunk/debian/patches/01-data-file-placement.patch
packages/pyproj/trunk/debian/patches/series
packages/pyproj/trunk/debian/python-pyproj-data.install
packages/pyproj/trunk/debian/python-pyproj.install
Modified:
packages/pyproj/trunk/debian/control
packages/pyproj/trunk/debian/rules
Modified: packages/pyproj/trunk/debian/control
===================================================================
--- packages/pyproj/trunk/debian/control 2009-02-13 01:06:32 UTC (rev 7510)
+++ packages/pyproj/trunk/debian/control 2009-02-13 15:30:06 UTC (rev 7511)
@@ -3,18 +3,20 @@
Priority: optional
Maintainer: Chris Murphy <chrismurf+ubuntu at gmail.com>
Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-XS-Python-Version: >= 2.4
Build-Depends: python-support (>=0.6),
debhelper (>= 5),
python-all-dev (>= 2.3.5-11),
+ quilt,
cdbs
+XS-Python-Version: >= 2.4
Standards-Version: 3.8.0
Homepage: http://code.google.com/p/pyproj/
Package: python-pyproj
Architecture: any
XB-Python-Version: ${python:Versions}
-Depends: ${python:Depends},
+Depends: python-pyproj-data (= ${source:Version}),
+ ${python:Depends},
${misc:Depends},
${shlibs:Depends}
Provides: ${python:Provides}
@@ -30,3 +32,24 @@
initial point, plus azimuth and distance. The inverse computation involves
determining the forward and back azimuths and distance given the latitudes and
longitudes of an initial and terminus point.
+
+Package: python-pyproj-data
+Architecture: all
+Depends: ${python:Depends},
+ ${misc:Depends},
+ ${shlibs:Depends}
+Provides: ${python:Provides}
+Description: python interface to the PROJ.4 library (projection data)
+ Performs cartographic transformations and geodetic computations. The Proj
+ class can convert from geographic (longitude,latitude) to native map projection
+ (x,y) coordinates and vice versa, or from one map projection coordinate system
+ directly to another.
+ .
+ The Geod class can perform forward and inverse geodetic, or Great Circle,
+ computations. The forward computation involves determining latitude, longitude
+ and back azimuth of a terminus point given the latitude and longitude of an
+ initial point, plus azimuth and distance. The inverse computation involves
+ determining the forward and back azimuths and distance given the latitudes and
+ longitudes of an initial and terminus point.
+ .
+ This package contains architecture independent data for python-pyproj.
Added: packages/pyproj/trunk/debian/patches/00-setup.py.patch
===================================================================
--- packages/pyproj/trunk/debian/patches/00-setup.py.patch (rev 0)
+++ packages/pyproj/trunk/debian/patches/00-setup.py.patch 2009-02-13 15:30:06 UTC (rev 7511)
@@ -0,0 +1,21 @@
+Place data files outside of module path, so there are not multiple copies
+--- pyproj-1.8.5.orig/setup.py
++++ pyproj-1.8.5/setup.py
+@@ -8,8 +8,8 @@
+ packages = ['pyproj']
+ package_dirs = {'':'lib'}
+
+-datafiles = ['data/epsg', 'data/esri', 'data/esri.extra', 'data/GL27', 'data/nad.lst', 'data/nad27', 'data/nad83', 'data/ntv2_out.dist', 'data/other.extra', 'data/pj_out27.dist', 'data/pj_out83.dist', 'data/proj_def.dat', 'data/README', 'data/td_out.dist', 'data/test27', 'data/test83', 'data/testntv2', 'data/testvarious', 'data/world']
+-package_data = {'pyproj':datafiles}
++data_file_list = ['epsg', 'esri', 'esri.extra', 'GL27', 'nad.lst', 'nad27', 'nad83', 'ntv2_out.dist', 'other.extra', 'pj_out27.dist', 'pj_out83.dist', 'proj_def.dat', 'README', 'td_out.dist', 'test27', 'test83', 'testntv2', 'testvarious', 'world']
++datafiles = [('share/pyproj/data', [os.path.join('lib/pyproj/data', x) for x in data_file_list])]
+
+ setup(name = "pyproj",
+ version = "1.8.5",
+@@ -37,5 +37,5 @@
+ packages = packages,
+ package_dir = package_dirs,
+ ext_modules = extensions,
+- package_data = package_data
++ data_files = datafiles
+ )
Added: packages/pyproj/trunk/debian/patches/01-data-file-placement.patch
===================================================================
--- packages/pyproj/trunk/debian/patches/01-data-file-placement.patch (rev 0)
+++ packages/pyproj/trunk/debian/patches/01-data-file-placement.patch 2009-02-13 15:30:06 UTC (rev 7511)
@@ -0,0 +1,15 @@
+Hardcode the data directory for ubuntu systems.
+--- pyproj-1.8.5.orig/lib/pyproj/__init__.py
++++ pyproj-1.8.5/lib/pyproj/__init__.py
+@@ -55,8 +55,9 @@
+ import os
+ #import numpy as np
+
+-pyproj_datadir = os.sep.join([os.path.dirname(__file__), 'data'])
+-set_datapath(pyproj_datadir)
++#pyproj_datadir = os.sep.join([os.path.dirname(__file__), 'data'])
++# hardwired on Ubuntu/Debian systems
++set_datapath('/usr/share/pyproj/data')
+
+ class Proj(_Proj):
+ """
Added: packages/pyproj/trunk/debian/patches/series
===================================================================
--- packages/pyproj/trunk/debian/patches/series (rev 0)
+++ packages/pyproj/trunk/debian/patches/series 2009-02-13 15:30:06 UTC (rev 7511)
@@ -0,0 +1,2 @@
+00-setup.py.patch
+01-data-file-placement.patch
Added: packages/pyproj/trunk/debian/python-pyproj-data.install
===================================================================
--- packages/pyproj/trunk/debian/python-pyproj-data.install (rev 0)
+++ packages/pyproj/trunk/debian/python-pyproj-data.install 2009-02-13 15:30:06 UTC (rev 7511)
@@ -0,0 +1 @@
+debian/tmp/usr/share
Added: packages/pyproj/trunk/debian/python-pyproj.install
===================================================================
--- packages/pyproj/trunk/debian/python-pyproj.install (rev 0)
+++ packages/pyproj/trunk/debian/python-pyproj.install 2009-02-13 15:30:06 UTC (rev 7511)
@@ -0,0 +1 @@
+debian/tmp/usr/lib
Modified: packages/pyproj/trunk/debian/rules
===================================================================
--- packages/pyproj/trunk/debian/rules 2009-02-13 01:06:32 UTC (rev 7510)
+++ packages/pyproj/trunk/debian/rules 2009-02-13 15:30:06 UTC (rev 7511)
@@ -3,6 +3,10 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/python-distutils.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
# Don't compress .py files (I have no idea what this line does.)
DEB_COMPRESS_EXCLUDE = .py
+
+install/python-pyproj-data::
+ find debian/tmp/usr/share/ -type f|xargs chmod 644
More information about the Python-modules-commits
mailing list