[python-pyproj] 08/10: Add patch to have setup.py not modify lib/pyproj/datadir.py*.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository python-pyproj.

commit 87a2e0cb62ba0c2105855b3538d715d7f7edc172
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Jan 6 23:21:17 2016 +0100

    Add patch to have setup.py not modify lib/pyproj/datadir.py*.
    
    setup.py doesn't need to modify lib/pyproj/datadir.py,
    it is already patched for use by the Debian package.
---
 debian/changelog                       |  3 +++
 debian/patches/02-pyproj_datadir.patch | 26 ++++++++++++++++++++++++++
 debian/patches/series                  |  1 +
 3 files changed, 30 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index cda2955..a88320c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ python-pyproj (1.9.5-1) UNRELEASED; urgency=medium
     setup.py now supports system proj directly.
   * Update Vcs-Browser URL to use HTTPS.
   * Update watch file, handle alternative tar extensions.
+  * Add patch to have setup.py not modify lib/pyproj/datadir.py*.
+    setup.py doesn't need to modify lib/pyproj/datadir.py,
+    it is already patched for use by the Debian package.
 
  -- Bas Couwenberg <sebastic at debian.org>  Wed, 06 Jan 2016 21:38:44 +0100
 
diff --git a/debian/patches/02-pyproj_datadir.patch b/debian/patches/02-pyproj_datadir.patch
new file mode 100644
index 0000000..77822d9
--- /dev/null
+++ b/debian/patches/02-pyproj_datadir.patch
@@ -0,0 +1,26 @@
+Description: Don't generate lib/pyproj/datadir.py*.
+ Caused build failure 'due to unexpected upstream changes'.
+ setup.py doesn't need to modify lib/pyproj/datadir.py,
+ it is already patched for use by the Debian package.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: not-needed
+
+--- a/setup.py
++++ b/setup.py
+@@ -23,16 +23,6 @@ if proj_dir is not None:
+     Extension("pyproj._proj",["_proj.c"],include_dirs=incdirs,library_dirs=libdirs,\
+     runtime_library_dirs=libdirs,libraries=libraries)
+ 
+-    # over-write default data directory.
+-    pyproj_datadir = os.path.join(os.path.join(proj_dir,'share'),'proj')
+-    datadirfile = os.path.join('lib',os.path.join('pyproj','datadir.py'))
+-    datadirfile_save = os.path.join('lib',os.path.join('pyproj','datadir.py.save'))
+-    if not os.path.isfile(datadirfile_save):
+-        shutil.copyfile(datadirfile, datadirfile_save)
+-    f = open(datadirfile,'w')
+-    f.write('pyproj_datadir="%s"\n' % pyproj_datadir)
+-    f.close()
+-
+     extensions = [pyprojext]
+     package_data = {}
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 5b24c50..8fc5c63 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01-use_proj-data_instead_of_embedded.patch
+02-pyproj_datadir.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-pyproj.git