[ogdi-dfsg] 02/19: Merge changes from ogdi-dfsg (3.2.0~beta2-7.1).

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository ogdi-dfsg.

commit 93997300d910c4df0dc642f2f6e4ddb17a79e476
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Apr 2 21:11:56 2016 +0200

    Merge changes from ogdi-dfsg (3.2.0~beta2-7.1).
---
 debian/changelog            |  9 +++++++++
 debian/patches/new_nad_init | 15 +++++++++++++++
 debian/patches/series       |  1 +
 3 files changed, 25 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4b52d4f..8657d69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,15 @@ ogdi-dfsg (3.2.0~beta2-8) UNRELEASED; urgency=medium
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 02 Apr 2016 21:13:49 +0200
 
+ogdi-dfsg (3.2.0~beta2-7.1) unstable; urgency=medium
+
+  * Non-maintainer upload to fix FTBFS
+  * Added debian/patches/new_nad_init.dpatch to modify nad_init call,
+    based on patch submitted by Matthias Klose <doko at ubuntu.com>.
+    (Closes: #733387)
+
+ -- Margarita Manterola <marga at debian.org>  Fri, 25 Apr 2014 22:10:54 +0200
+
 ogdi-dfsg (3.2.0~beta2-7) unstable; urgency=low
 
   * Fixed tcl.h path to use the default Tcl version.
diff --git a/debian/patches/new_nad_init b/debian/patches/new_nad_init
new file mode 100644
index 0000000..40b04db
--- /dev/null
+++ b/debian/patches/new_nad_init
@@ -0,0 +1,15 @@
+Description: Fix build failure with proj-4.8.0.
+Author: Matthias Klose <doko at ubuntu.com>
+Bug-Debian: https://bugs.debian.org/733387
+
+--- a/ogdi/datum_driver/usa/dtusa.c
++++ b/ogdi/datum_driver/usa/dtusa.c
+@@ -124,7 +124,7 @@ int dyn_nad_init(privdata, table)
+     strcat(pathfile,"/");  
+     strcat(pathfile,table);  
+ 
+-    ptr->dtptr = nad_init(pathfile);
++    ptr->dtptr = nad_init(pj_get_default_ctx(), pathfile);
+     if (ptr->dtptr == NULL) {
+       ptr->count--;
+       return FALSE;
diff --git a/debian/patches/series b/debian/patches/series
index 48b3158..8a6ac1a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ makefile
 shared
 endianess
 hurd
+new_nad_init

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