[proj] 01/04: Add patches to install proj_def.dat again.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository proj.

commit 0cfc9343940118f82ceca55cf31bcc793681f899
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Sep 6 19:43:20 2015 +0200

    Add patches to install proj_def.dat again.
---
 debian/changelog                                   |  6 ++++++
 ...removed-proj_def.dat-from-distro-in-r2540.patch | 22 ++++++++++++++++++++
 debian/patches/proj_def.patch                      | 24 ++++++++++++++++++++++
 debian/patches/series                              |  2 ++
 4 files changed, 54 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1e6245f..42fae8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+proj (4.9.1-3) UNRELEASED; urgency=medium
+
+  * Add patches to install proj_def.dat again.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sun, 06 Sep 2015 19:41:49 +0200
+
 proj (4.9.1-2) unstable; urgency=medium
 
   * Update upstream metadata for move to GitHub.
diff --git a/debian/patches/Fix-botched-patch-that-removed-proj_def.dat-from-distro-in-r2540.patch b/debian/patches/Fix-botched-patch-that-removed-proj_def.dat-from-distro-in-r2540.patch
new file mode 100644
index 0000000..8e4a218
--- /dev/null
+++ b/debian/patches/Fix-botched-patch-that-removed-proj_def.dat-from-distro-in-r2540.patch
@@ -0,0 +1,22 @@
+From ef4c4922e6dcb45cf9d57eabb7e1d66172b26081 Mon Sep 17 00:00:00 2001
+From: Howard Butler <howard at hobu.co>
+Date: Wed, 20 May 2015 21:03:14 +0000
+Subject: [PATCH] Fix botched patch that removed proj_def.dat from distro in r2540 #274
+Origin: https://github.com/OSGeo/proj.4/commit/ef4c4922e6dcb45cf9d57eabb7e1d66172b26081
+
+git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@2654 4e78687f-474d-0410-85f9-8d5e500ac6b2
+---
+ nad/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/nad/Makefile.am
++++ b/nad/Makefile.am
+@@ -12,7 +12,7 @@ TESTVARIOUS = $(NADPATH)/testvarious
+ TESTDATUMFILE = $(NADPATH)/testdatumfile
+ TESTIGN = $(NADPATH)/testIGNF
+ 
+-pkgdata_DATA = GL27 nad.lst nad27 nad83 world epsg esri \
++pkgdata_DATA = GL27 nad.lst proj_def.dat nad27 nad83 world epsg esri \
+ 		esri.extra other.extra \
+ 		CH IGNF
+ 
diff --git a/debian/patches/proj_def.patch b/debian/patches/proj_def.patch
new file mode 100644
index 0000000..d9b5e58
--- /dev/null
+++ b/debian/patches/proj_def.patch
@@ -0,0 +1,24 @@
+Description: Add proj_def.dat, erroniously not included in PROJ 4.9.1.
+Origin: https://raw.githubusercontent.com/OSGeo/proj.4/master/nad/proj_def.dat
+Bug: https://github.com/OSGeo/proj.4/issues/274
+
+--- /dev/null
++++ b/nad/proj_def.dat
+@@ -0,0 +1,17 @@
++# Projection library defaults file
++# SCCSID--- @(#)proj_def.dat	4.3	94/02/23	GIE	REL"
++# very preliminary version
++<general>
++ellps=WGS84 
++<>
++<aea> # Conterminous U.S. map
++lat_1=29.5
++lat_2=45.5
++<>
++<lcc> # Conterminous U.S. map
++lat_1=33
++lat_2=45
++<>
++<lagrng>
++W=2
++<>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..40cfc39
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+proj_def.patch
+Fix-botched-patch-that-removed-proj_def.dat-from-distro-in-r2540.patch

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