[ogdi-dfsg] 08/11: Drop new_nad_init patch, fixed upstream. Refresh remaining patches.

[Bas 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 3e8a0e9357f15c6681859264e4a4d3a1f5dee8e1
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Jul 19 15:40:39 2016 +0200

    Drop new_nad_init patch, fixed upstream. Refresh remaining patches.
---
 debian/changelog               |  1 +
 debian/patches/new_nad_init    | 15 ---------------
 debian/patches/series          |  1 -
 debian/patches/spelling-errors |  2 +-
 4 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2e358f1..4d1b64f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ogdi-dfsg (3.2.0+ds-1) UNRELEASED; urgency=medium
   * Team upload.
   * New upstream release.
   * Exclude embedded copies of 3rd party code from repacked upstream tarball.
+  * Drop new_nad_init patch, fixed upstream. Refresh remaining patches.
 
  -- Bas Couwenberg <sebastic at debian.org>  Tue, 19 Jul 2016 15:20:42 +0200
 
diff --git a/debian/patches/new_nad_init b/debian/patches/new_nad_init
deleted file mode 100644
index 40b04db..0000000
--- a/debian/patches/new_nad_init
+++ /dev/null
@@ -1,15 +0,0 @@
-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 c1e9911..605425a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,6 @@ makefile
 shared
 endianess
 hurd
-new_nad_init
 hardening
 spelling-errors
 install-so-link
diff --git a/debian/patches/spelling-errors b/debian/patches/spelling-errors
index 588266d..83fa775 100644
--- a/debian/patches/spelling-errors
+++ b/debian/patches/spelling-errors
@@ -4,7 +4,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
 
 --- a/ogdi/c-api/server.c
 +++ b/ogdi/c-api/server.c
-@@ -280,7 +280,7 @@ ecs_Result *svr_CreateServer(s,url,isLoc
+@@ -294,7 +294,7 @@ ecs_Result *svr_CreateServer(s,url,isLoc
    res = s->createserver(s,url); 
    if (res == NULL) {
      res = &svr_dummy_result;

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