This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch master
in repository pktools.
commit 7911f3797c33ca59bca25a4663c133294c8d4601
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Tue Aug 12 13:43:44 2014 +0200
Remove latest_libLAS_support.patch, included upstream.
---
debian/changelog | 1 +
debian/patches/latest_libLAS_support.patch | 34 ------------------------------
debian/patches/series | 1 -
3 files changed, 1 insertion(+), 35 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8e58144..b9afcb7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ pktools (2.5.3-1) UNRELEASED; urgency=medium
* New upstream release.
(closes: #757584)
* Update copyright file.
+ * Remove latest_libLAS_support.patch, included upstream.
-- Bas Couwenberg <sebas...@xs4all.nl> Tue, 12 Aug 2014 13:28:30 +0200
diff --git a/debian/patches/latest_libLAS_support.patch
b/debian/patches/latest_libLAS_support.patch
deleted file mode 100644
index 1f4aa2f..0000000
--- a/debian/patches/latest_libLAS_support.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Pieter Kempeneers <kempe...@gmail.com>
-Subject: liblas 1.8 support
-
-* src/apps/pkfilterdem.cc
-* src/apps/pklas2img.cc
-
-Origin: upstream,
http://git.savannah.gnu.org/cgit/pktools.git/commit/?id=7de3a2b42c92056bbf3f8a9e3ea2fb5ebf361bde
-Bug: https://savannah.nongnu.org/bugs/?42951
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=757584
-
---- pktools.orig/src/apps/pkfilterdem.cc
-+++ pktools/src/apps/pkfilterdem.cc
-@@ -322,8 +322,9 @@
-
hThreshold=hThreshold_opt[0]+maxSlope_opt[0]*(newdim-dim)*input.getDeltaX();
- dim=newdim;
- if(hThreshold_opt.size()>1){
-- if(hThreshold>hThreshold_opt[1])
-+ if(hThreshold>hThreshold_opt[1]){
- hThreshold=hThreshold_opt[1];
-+ }
- }
- std::cout << "iteration " << iteration << ": " << nchange << " pixels
changed" << std::endl;
- ++iteration;
---- pktools.orig/src/apps/pklas2img.cc
-+++ pktools/src/apps/pklas2img.cc
-@@ -282,7 +282,7 @@
- attribute_opt.erase(ait);
- }
- }
-- liblas::Point thePoint;
-+ liblas::Point thePoint(&(lasReader.getHeader()));
- while(lasReader.readNextPoint(thePoint)){
- progress=static_cast<float>(ipoint)/totalPoints;
- pfnProgress(progress,pszMessage,pProgressArg);
diff --git a/debian/patches/series b/debian/patches/series
index 5dc3ab2..0cdaa8e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-latest_libLAS_support.patch
bandwidth-typo.patch
automake-subdir-objects.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/pktools.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
