[pdal] 04/05: Drop laszip.patch, applied upstream.

Bas Couwenberg sebastic at debian.org
Tue Apr 4 06:05:54 UTC 2017


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

sebastic pushed a commit to branch master
in repository pdal.

commit 8e9977e92d7a247ab547181b43aa22b1689134fd
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Apr 4 07:23:11 2017 +0200

    Drop laszip.patch, applied upstream.
---
 debian/changelog            |  1 +
 debian/patches/laszip.patch | 23 -----------------------
 debian/patches/series       |  1 -
 3 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3e40783..de1bce0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ pdal (1.5.0~rc2-1) UNRELEASED; urgency=medium
 
   * New upstream release candidate.
   * Update symbols for amd64.
+  * Drop laszip.patch, applied upstream.
 
  -- Bas Couwenberg <sebastic at debian.org>  Tue, 04 Apr 2017 07:20:41 +0200
 
diff --git a/debian/patches/laszip.patch b/debian/patches/laszip.patch
deleted file mode 100644
index b59a475..0000000
--- a/debian/patches/laszip.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Fix build without LASzip.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/PDAL/PDAL/pull/1549
-           https://github.com/PDAL/PDAL/pull/1550
-Applied-Upstream: https://github.com/PDAL/PDAL/commit/3e98d50ddc37add6a927036df98dead63031d341
-                  https://github.com/PDAL/PDAL/commit/fd72f8812a429fcf2d4fec4ba8a13cc847bf3aa6
-
---- a/cmake/laszip.cmake
-+++ b/cmake/laszip.cmake
-@@ -17,9 +17,13 @@ if(WITH_LASZIP)
-         set(PDAL_HAVE_LASZIP 1)
-         if(NOT WITH_STATIC_LASZIP AND WIN32)
-             set(LASZIP_DEFINES "-DLASZIP_DLL_IMPORT=1")
-+        else()
-+            set(LASZIP_DEFINES "")
-         endif()
-     else()
-         set(LASZIP_LIBRARY "")
-+        set(LASZIP_INCLUDE_DIR "")
-+        set(LASZIP_DEFINES "")
-         set(WITH_LASZIP FALSE)
-     endif()
- else()
diff --git a/debian/patches/series b/debian/patches/series
index 9ffee90..080f495 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 privacy-breach.patch
 disable-sphinxcontrib-bibtex.patch
 use-mathjax-package.patch
-laszip.patch

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



More information about the Pkg-grass-devel mailing list