[libgeotiff-dfsg] 01/02: Add upstream patch to revert back including "geo_config.h".

[Bas Couwenberg]

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

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

commit b5d6e866023e6f1b4c7dca95f1c7ebb7836d12ab
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Sep 1 18:42:31 2016 +0200

    Add upstream patch to revert back including "geo_config.h".
    
    Caused librasterlite2 configure to fail (#836308).
---
 debian/changelog                                   |  7 ++++
 debian/patches/series                              |  1 +
 .../svn-r2739_Partial-revert-of-r2736.patch        | 39 ++++++++++++++++++++++
 3 files changed, 47 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a9760fc..7d95a71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libgeotiff-dfsg (1.4.2-2) UNRELEASED; urgency=medium
+
+  * Add upstream patch to revert back including "geo_config.h".
+    Caused librasterlite2 configure to fail (#836308).
+
+ -- Bas Couwenberg <sebastic at debian.org>  Thu, 01 Sep 2016 18:41:21 +0200
+
 libgeotiff-dfsg (1.4.2-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/series b/debian/patches/series
index 10caa94..c3ec608 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 drop-epsg-data-installation.patch
+svn-r2739_Partial-revert-of-r2736.patch
diff --git a/debian/patches/svn-r2739_Partial-revert-of-r2736.patch b/debian/patches/svn-r2739_Partial-revert-of-r2736.patch
new file mode 100644
index 0000000..4b9b959
--- /dev/null
+++ b/debian/patches/svn-r2739_Partial-revert-of-r2736.patch
@@ -0,0 +1,39 @@
+Description: geotiff.h cpl_serv.h: Partial revert of r2736 to revert back including "geo_config.h" (fixes #81)
+ See also: https://bugs.debian.org/836308
+Author: Even Rouault <even.rouault at spatialys.com>
+Origin: https://trac.osgeo.org/geotiff/changeset/2739
+Bug: https://trac.osgeo.org/geotiff/ticket/81
+
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,8 @@
++2016-09-01 Even Rouault <even dot rouault at spatialys dot com>
++
++	* geotiff.h cpl_serv.h: Partial revert of r2736 to revert back including
++	 "geo_config.h" (#81)
++
+ 2016-08-18 Even Rouault <even dot rouault at spatialys dot com>
+ 
+ 	* Makefile.am: Fix build issue on Windows with cmake by not
+--- a/cpl_serv.h
++++ b/cpl_serv.h
+@@ -33,7 +33,7 @@
+ /*	Standard include files.						*/
+ /* ==================================================================== */
+ 
+-#include <geo_config.h>
++#include "geo_config.h"
+ #include <stdio.h>
+ 
+ #include <math.h>
+--- a/geotiff.h
++++ b/geotiff.h
+@@ -32,7 +32,7 @@
+ 
+ #define LIBGEOTIFF_VERSION 1420
+ 
+-#include <geo_config.h>
++#include "geo_config.h"
+ #include "geokeys.h"
+ 
+ /**********************************************************************

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