[pktools] 02/02: Add upstream patch to fix pklas2img build failure.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository pktools.

commit d2c6852bcaddebe2f9a1d8692b62d66cb043c3c5
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed May 18 23:38:29 2016 +0200

    Add upstream patch to fix pklas2img build failure.
---
 debian/changelog                                 |  6 ++++++
 debian/patches/pklas2img-CPLErr-conversion.patch | 23 +++++++++++++++++++++++
 debian/patches/series                            |  3 ++-
 debian/pktools.install                           |  2 +-
 debian/pktools.manpages                          |  2 +-
 5 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 17cba4b..034a2ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pktools (2.6.7-1~exp2) UNRELEASED; urgency=medium
+
+  * Add upstream patch to fix pklas2img build failure.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 18 May 2016 23:37:52 +0200
+
 pktools (2.6.7-1~exp1) experimental; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/pklas2img-CPLErr-conversion.patch b/debian/patches/pklas2img-CPLErr-conversion.patch
new file mode 100644
index 0000000..60a2e94
--- /dev/null
+++ b/debian/patches/pklas2img-CPLErr-conversion.patch
@@ -0,0 +1,23 @@
+Description: Fix pklas2img build failure.
+ error: conversion from 'CPLErr' to non-scalar type
+ .
+ return type of setProjection was changed in 2.6.7 from std::string to CPLErr.
+ The string returned was only used in debug mode as info and has been removed
+ in the current version.
+Author: Pieter Kempeneers <kempenep at gmail.com>
+Origin: http://git.savannah.gnu.org/cgit/pktools.git/commit/src/apps/pklas2img.cc?id=337c42c79138fb95b1dd641b91dc5546c270478d
+Bug: https://savannah.nongnu.org/support/?109042
+
+--- a/src/apps/pklas2img.cc
++++ b/src/apps/pklas2img.cc
+@@ -287,9 +287,7 @@ int main(int argc,char **argv) {
+   gt[5]=-dy_opt[0];
+   outputWriter.setGeoTransform(gt);
+   if(projection_opt.size()){
+-    string projectionString=outputWriter.setProjectionProj4(projection_opt[0]);
+-    if(verbose_opt[0])
+-      cout << "projection: " << projectionString << endl;
++    outputWriter.setProjectionProj4(projection_opt[0]);
+   }
+   if(!outputWriter.isGeoRef())
+     cout << "Warning: output image " << output_opt[0] << " is not georeferenced!" << endl;
diff --git a/debian/patches/series b/debian/patches/series
index c91f2ed..fcfdb98 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 soversion.patch
 pkg-config-install-path.patch
 spelling-errors.patch
-#build-pklas2img.patch
+build-pklas2img.patch
 pkg-config-not-executable.patch
+pklas2img-CPLErr-conversion.patch
diff --git a/debian/pktools.install b/debian/pktools.install
index d315f2b..447b050 100644
--- a/debian/pktools.install
+++ b/debian/pktools.install
@@ -20,7 +20,7 @@ usr/bin/pkfssvm
 usr/bin/pkgetmask
 usr/bin/pkinfo
 usr/bin/pkkalman
-#usr/bin/pklas2img
+usr/bin/pklas2img
 usr/bin/pkoptsvm
 usr/bin/pkpolygonize
 usr/bin/pkreclass
diff --git a/debian/pktools.manpages b/debian/pktools.manpages
index dd663c0..88a5ddc 100644
--- a/debian/pktools.manpages
+++ b/debian/pktools.manpages
@@ -20,7 +20,7 @@ debian/man/pkfssvm.1
 debian/man/pkgetmask.1
 debian/man/pkinfo.1
 debian/man/pkkalman.1
-#debian/man/pklas2img.1
+debian/man/pklas2img.1
 debian/man/pkoptsvm.1
 debian/man/pkpolygonize.1
 debian/man/pkreclass.1

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