debian/changelog

-pdal (1.7.0-1) UNRELEASED; urgency=medium
+pdal (1.7.0-1~exp1) experimental; urgency=medium
 
   * New upstream release.
   * Bump Standards-Version to 4.1.3, no changes.
@@ -7,8 +7,18 @@ pdal (1.7.0-1) UNRELEASED; urgency=medium
   * Update Vcs-* URLs for Salsa.
   * Refresh patches.
   * Update copyright file.
+  * Add -Wno-error=maybe-uninitialized to buildflags.
+    See: https://github.com/PDAL/PDAL/issues/1899
+  * Add patch to fix linking to libdl for dlopen().
+  * Rename library packages for SONAME bump.
+  * Add package for NumPy plugin.
+  * Add lintian override for spelling-error-in-binary false positive.
+  * Check DEB_BUILD_OPTIONS for nocheck in dh_auto_test override.
+  * Update symbols for amd64.
+  * Strip pre-release from symbols version.
+  * Move pkg-config file to Multi-Arch path.
 
- -- Bas Couwenberg <sebastic@debian.org>  Fri, 06 Apr 2018 09:49:02 +0200
+ -- Bas Couwenberg <sebastic@debian.org>  Fri, 06 Apr 2018 13:33:20 +0200
 
 pdal (1.6.0-1) unstable; urgency=medium
 

debian/control

@@ -92,7 +92,7 @@ Description: Point Data Abstraction Library - documentation
  .
  This package contains the PDAL documentation.
 
-Package: libpdal-base5
+Package: libpdal-base6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
@@ -114,7 +114,7 @@ Description: Point Data Abstraction Library - libpdal_base
  .
  This package contains the libpdal_base shared library.
 
-Package: libpdal-util5
+Package: libpdal-util6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
@@ -138,8 +138,8 @@ Description: Point Data Abstraction Library - libpdal_util
 Package: libpdal-dev
 Architecture: any
 Section: libdevel
-Depends: libpdal-base5 (= ${binary:Version}),
-         libpdal-util5 (= ${binary:Version}),
+Depends: libpdal-base6 (= ${binary:Version}),
+         libpdal-util6 (= ${binary:Version}),
          libboost-filesystem-dev,
          libboost-iostreams-dev,
          libboost-program-options-dev,
@@ -173,6 +173,7 @@ Architecture: any
 Section: libs
 Depends: libpdal-plugin-greyhound (= ${binary:Version}),
          libpdal-plugin-icebridge (= ${binary:Version}),
+         libpdal-plugin-numpy (= ${binary:Version}),
          libpdal-plugin-pgpointcloud (= ${binary:Version}),
          libpdal-plugin-python (= ${binary:Version}),
          libpdal-plugin-sqlite (= ${binary:Version}),
@@ -235,6 +236,27 @@ Description: Point Data Abstraction Library - Icebridge plugin
  .
  This package contains the Icebridge plugin.
 
+Package: libpdal-plugin-numpy
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Description: Point Data Abstraction Library - NumPy plugin
+ PDAL is a BSD licensed library for translating and manipulating point
+ cloud data of various formats. PDAL can be used to read, write and
+ translate point cloud data in many formats. Support is included for
+ input files of LAS, LAZ, SBET, BPF, QFIT and others. PDAL can also read
+ from and write to databases that support point cloud storage, including
+ Oracle, Postgres and SQLite.
+ .
+ PDAL should not be confused with PCL (Point Cloud Library). PCL is a
+ library specifically designed to provide algorithmic analysis and
+ modification of point clouds. PDAL provides a limited interface to the
+ facilities of PCL, but does not in general attempt to duplicate its
+ capabilities.
+ .
+ This package contains the NumPy plugin.
+
 Package: libpdal-plugin-pgpointcloud
 Architecture: any
 Section: libs

debian/copyright

@@ -31,9 +31,10 @@ Files: doc/tutorial/pcl_spec.rst
 Copyright: 2014, RadiantBlue Technologies, Inc.
 License: CC-BY-3.0-US
 
-Files: java/core-scala/src/main/scala/io/pdal/pipeline/*
-Copyright: 2017, Azavea
-License: Apache-2.0
+Files: plugins/greyhound/io/bounds.cpp
+ plugins/greyhound/io/bounds.hpp
+Copyright: 2016, Connor Manning (connor@hobu.co)
+License: LGPL-2.1+
 
 Files: plugins/greyhound/io/bounds.cpp
  plugins/greyhound/io/bounds.hpp
@@ -440,19 +441,6 @@ License: BSL-1.0
  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  DEALINGS IN THE SOFTWARE.
 
-License: Apache-2.0
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- .
-     http://www.apache.org/licenses/LICENSE-2.0
- .
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
 License: Expat
  Permission is hereby granted, free of charge, to any person obtaining
  a copy of this software and associated documentation files (the

debian/libpdal-base5.lintian-overrides → debian/libpdal-base6.lintian-overrides

 # False positive, part of NormalX, NormalY, NormalZ
-libpdal-base5: spelling-error-in-binary usr/lib/libpdal_base.so.* NormalY Normally
+libpdal-base6: spelling-error-in-binary usr/lib/libpdal_base.so.* NormalY Normally
 

debian/libpdal-dev.install

@@ -4,5 +4,5 @@ usr/lib/lib*.a
 usr/lib/libpdalcpp.so
 usr/lib/libpdal_base.so
 usr/lib/libpdal_util.so
-usr/lib/pkgconfig
+usr/lib/*/pkgconfig
 usr/lib/pdal/cmake

debian/libpdal-plugin-greyhound.lintian-overrides

@@ -7,3 +7,6 @@ libpdal-plugin-greyhound: non-dev-pkg-with-shlib-symlink *
 #  Fortify Source functions: no, only unprotected functions found!
 libpdal-plugin-greyhound: hardening-no-fortify-functions *
 
+# False positive, part of NormalX, NormalY, NormalZ
+libpdal-plugin-greyhound: spelling-error-in-binary * NormalY Normally
+

debian/libpdal-plugin-numpy.install

+usr/lib/libpdal_plugin_*_numpy.so*

debian/libpdal-plugin-numpy.lintian-overrides

+# Loadable plugin
+libpdal-plugin-numpy: package-name-doesnt-match-sonames *
+libpdal-plugin-numpy: no-symbols-control-file *
+libpdal-plugin-numpy: non-dev-pkg-with-shlib-symlink *
+
+# False positive, part of NormalX, NormalY, NormalZ
+libpdal-plugin-numpy: spelling-error-in-binary * NORMALY NORMALLY
+
+# Build uses -D_FORTIFY_SOURCE=2, but hardening-check reports:
+#  Fortify Source functions: no, only unprotected functions found!
+libpdal-plugin-numpy: hardening-no-fortify-functions *
+

debian/libpdal-util5.symbols → debian/libpdal-util6.symbols

-# SymbolsHelper-Confirmed: 1.6.0 amd64 arm64 armel armhf hppa hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 m68k mips mips64el mipsel powerpc ppc64 ppc64el s390x sh4 x32
-libpdal_util.so.5 #PACKAGE# #MINVER#
+# SymbolsHelper-Confirmed: 1.7.0 amd64
+libpdal_util.so.6 #PACKAGE# #MINVER#
  _ZN4pdal12georeference17georeferenceWgs84EddRKNS0_14RotationMatrixES3_RKNS0_3XyzE@Base 1.1.0
  _ZN4pdal5BOX2D23getDefaultSpatialExtentEv@Base 1.1.0
  _ZN4pdal5BOX2D4growEdd@Base 1.1.0
@@ -34,7 +34,7 @@ libpdal_util.so.5 #PACKAGE# #MINVER#
  _ZN4pdal5Utils8demangleERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 1.1.0
  _ZN4pdal5Utils8unsetenvERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 1.2.0
  (arch=armel armhf hppa hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe sh4 x32)_ZN4pdal5Utils8wordWrapERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEjj@Base 1.5.0
- (arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZN4pdal5Utils8wordWrapERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEmm@Base 1.5.0~rc2
+ (arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZN4pdal5Utils8wordWrapERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEmm@Base 1.5.0
  _ZN4pdal5Utils9backtraceB5cxx11Ev@Base 1.4.0
  (subst)_ZN4pdal5Utils9wordWrap2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE{size_t}{size_t}@Base 1.3.0
  _ZN4pdal6Bounds3setERKNS_5BOX2DE@Base 1.3.0
@@ -79,7 +79,8 @@ libpdal_util.so.5 #PACKAGE# #MINVER#
  _ZN4pdalrsERSiRNS_5BOX2DE@Base 1.1.0
  _ZN4pdalrsERSiRNS_5BOX3DE@Base 1.1.0
  _ZN4pdalrsERSiRNS_6BoundsE@Base 1.3.0
- (optional=templinst|arch=alpha)_ZN9__gnu_cxx12__to_xstringINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEcEET_PFiPT0_mPKS8_13__va_list_tagEmSB_z@Base 1.5.0~rc2
+ (optional=templinst|arch=alpha)_ZN9__gnu_cxx12__to_xstringINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEcEET_PFiPT0_mPKS8_13__va_list_tagEmSB_z@Base 1.5.0
+ (optional=templinst)_ZN9__gnu_cxx12__to_xstringINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEcEET_PFiPT0_mPKS8_P13__va_list_tagEmSB_z@Base 1.7.0
  _ZN9pdalboost10filesystem11path_traits8dispatchERKNS0_15directory_entryERNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 1.2.0
  _ZN9pdalboost10filesystem11path_traits8dispatchERKNS0_15directory_entryERNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKSt7codecvtIwc11__mbstate_tE@Base 1.2.0
  _ZN9pdalboost10filesystem16filesystem_error5m_impD1Ev@Base 1.2.0
@@ -101,7 +102,7 @@ libpdal_util.so.5 #PACKAGE# #MINVER#
  _ZN9pdalboost10filesystem4path25m_path_iterator_incrementERNS1_8iteratorE@Base 1.2.0
  _ZN9pdalboost10filesystem4path25remove_trailing_separatorEv@Base 1.2.0
  (arch=armel armhf hppa hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe sh4 x32)_ZN9pdalboost10filesystem4path27m_erase_redundant_separatorEj@Base 1.5.0
- (arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZN9pdalboost10filesystem4path27m_erase_redundant_separatorEm@Base 1.5.0~rc2
+ (arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZN9pdalboost10filesystem4path27m_erase_redundant_separatorEm@Base 1.5.0
  _ZN9pdalboost10filesystem4path28m_append_separator_if_neededEv@Base 1.2.0
  _ZN9pdalboost10filesystem4path5imbueERKSt6locale@Base 1.2.0
  _ZN9pdalboost10filesystem4path7codecvtEv@Base 1.2.0
@@ -115,7 +116,7 @@ libpdal_util.so.5 #PACKAGE# #MINVER#
  _ZN9pdalboost10filesystem6detail11dir_itr_impD2Ev@Base 1.2.0
  _ZN9pdalboost10filesystem6detail11lex_compareENS0_4path8iteratorES3_S3_S3_@Base 1.2.0
  _ZN9pdalboost10filesystem6detail11permissionsERKNS0_4pathENS0_5permsEPNS_6system10error_codeE@Base 1.2.0
- (arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZN9pdalboost10filesystem6detail11resize_fileERKNS0_4pathEmPNS_6system10error_codeE@Base 1.5.0~rc2
+ (arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZN9pdalboost10filesystem6detail11resize_fileERKNS0_4pathEmPNS_6system10error_codeE@Base 1.5.0
  (arch=armel armhf hppa hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe sh4 x32)_ZN9pdalboost10filesystem6detail11resize_fileERKNS0_4pathEyPNS_6system10error_codeE@Base 1.5.0
  _ZN9pdalboost10filesystem6detail12copy_symlinkERKNS0_4pathES4_PNS_6system10error_codeE@Base 1.2.0
  _ZN9pdalboost10filesystem6detail12current_pathEPNS_6system10error_codeE@Base 1.2.0
@@ -170,15 +171,17 @@ libpdal_util.so.5 #PACKAGE# #MINVER#
  _ZN9pdalboost6detail17sp_counted_impl_pINS_10filesystem6detail11dir_itr_impEED0Ev@Base 1.2.0
  _ZN9pdalboost6detail17sp_counted_impl_pINS_10filesystem6detail11dir_itr_impEED1Ev@Base 1.2.0
  _ZN9pdalboost6detail17sp_counted_impl_pINS_10filesystem6detail11dir_itr_impEED2Ev@Base 1.2.0
+ _ZN9pdalboost6system12system_errorC1ERKS1_@Base 1.7.0
+ _ZN9pdalboost6system12system_errorC2ERKS1_@Base 1.7.0
  _ZN9pdalboost6system12system_errorD0Ev@Base 1.2.0
  _ZN9pdalboost6system12system_errorD1Ev@Base 1.2.0
  _ZN9pdalboost6system12system_errorD2Ev@Base 1.2.0
  _ZN9pdalboost6system15system_categoryEv@Base 1.2.0
  _ZN9pdalboost6system16generic_categoryEv@Base 1.2.0
  _ZNK4pdal5BOX2D5emptyEv@Base 1.1.0
- _ZNK4pdal5BOX2D5validEv@Base 1.5.0~rc1
+ _ZNK4pdal5BOX2D5validEv@Base 1.5.0
  _ZNK4pdal5BOX3D5emptyEv@Base 1.1.0
- _ZNK4pdal5BOX3D5validEv@Base 1.5.0~rc1
+ _ZNK4pdal5BOX3D5validEv@Base 1.5.0
  _ZNK4pdal6Bounds4is3dEv@Base 1.3.0
  _ZNK4pdal6Bounds4to2dEv@Base 1.3.0
  _ZNK4pdal6Bounds4to3dEv@Base 1.3.0

debian/patches/dlopen.patch

+Description: Fix linking to libdl for dlopen().
+ [100%] Linking CXX executable ../../../bin/pdal_io_numpy_test
+ cd /build/pdal-1.7.0/obj-x86_64-linux-gnu/plugins/python/io && /usr/bin/cmake -E cmake_link_script CMakeFiles/pdal_io_numpy_test.dir/link.txt --verbose=1
+ /usr/bin/c++  -g -O2 -fdebug-prefix-map=/build/pdal-1.7.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wno-error=maybe-uninitialized -Wdate-time -D_FORTIFY_SOURCE=2 -O2 -g -DNDEBUG  -Wl,-z,relro -Wl,-z,now -rdynamic CMakeFiles/pdal_io_numpy_test.dir/__/test/NumpyReaderTest.cpp.o CMakeFiles/pdal_io_numpy_test.dir/__/plang/Environment.cpp.o CMakeFiles/pdal_io_numpy_test.dir/__/plang/Redirector.cpp.o ../../../test/unit/CMakeFiles/pdal_test_support.dir/Support.cpp.o  -o ../../../bin/pdal_io_numpy_test -Wl,-rpath,/build/pdal-1.7.0/obj-x86_64-linux-gnu/lib ../../../lib/libgtest.a ../../../lib/libpdal_plugin_reader_numpy.so.7.0.0 -lpython2.7 ../../../lib/libpdal_base.so.7.0.0 -lpthread -lgdal -lgeos_c -lgeotiff -lxml2 -lz -lcurl -ljsoncpp ../../../lib/libpdal_util.so.7.0.0 
+ /usr/bin/ld: CMakeFiles/pdal_io_numpy_test.dir/__/plang/Environment.cpp.o: undefined reference to symbol 'dlopen@@GLIBC_2.2.5'
+ //lib/x86_64-linux-gnu/libdl.so.2: error adding symbols: DSO missing from command line
+ collect2: error: ld returned 1 exit status
+Author: Bas Couwenberg <sebastic@debian.org>
+Forwarded: https://github.com/PDAL/PDAL/pull/1900
+
+--- a/pdal/util/CMakeLists.txt
++++ b/pdal/util/CMakeLists.txt
+@@ -27,7 +27,7 @@ target_include_directories(${PDAL_UTIL_L
+ 
+ if (UNIX AND NOT APPLE)
+     target_link_libraries(${PDAL_UTIL_LIB_NAME}
+-        PRIVATE
++        PUBLIC
+             dl
+     )
+ endif()

debian/patches/series

@@ -2,3 +2,4 @@ privacy-breach.patch
 disable-sphinxcontrib-bibtex.patch
 use-mathjax-package.patch
 sphinx-DOCUMENTATION_OPTIONS-does-not-define-SOURCELINK_SUFFIX.patch
+dlopen.patch

debian/rules

@@ -5,9 +5,11 @@
 # Enable hardening build flags
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 include /usr/share/dpkg/pkg-info.mk
 
-CXXFLAGS += $(CPPFLAGS)
+CXXFLAGS += $(CPPFLAGS) -Wno-error=maybe-uninitialized
 
 UPSTREAM_VERSION  = $(shell echo $(DEB_VERSION_UPSTREAM) | sed -e 's/\+.*//')
 
@@ -58,10 +60,12 @@ override_dh_auto_build:
 	sphinx-build doc/ doc/html/ && ln -s /usr/share/javascript/mathjax doc/html/_static/
 
 override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	# Exclude tests:
 	# - pgpointcloudtest, requires configured PostgreSQL database
 	# - pdal_spatial_reference_test, fails sometimes
 	(cd obj-* && ctest --force-new-ctest-process --output-on-failure --exclude-regex "pgpointcloudtest|pdal_spatial_reference_test" || echo "Ignoring test failures")
+endif
 
 override_dh_auto_install:
 	dh_auto_install
@@ -69,12 +73,16 @@ override_dh_auto_install:
 	# Strip RPATH
 	chrpath --delete debian/tmp/usr/lib/libpdal_plugin_*.so
 
+	# Move pkg-config file to Multi-Arch path
+	mkdir debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
+	mv debian/tmp/usr/lib/pkgconfig debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
+
 override_dh_install:
 	dh_install --list-missing
 
 override_dh_python2:
-	dh_python2 -plibpdal-plugin-python
-	dh_numpy -plibpdal-plugin-python
+	dh_python2 -plibpdal-plugin-python -plibpdal-plugin-numpy
+	dh_numpy -plibpdal-plugin-python -plibpdal-plugin-numpy
 
 override_dh_makeshlibs:
 	dh_makeshlibs -- -v$(UPSTREAM_VERSION) -c0