debian/changelog

+pdal (1.7.2-2) unstable; urgency=medium
+
+  * Move NumPy plugin to libpdal-plugin-python package.
+  * Update symbols for other architectures.
+  * Include examples in libpdal-dev.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Sat, 19 May 2018 10:29:37 +0200
+
 pdal (1.7.2-1) unstable; urgency=medium
 
   * New upstream release.

debian/control

@@ -173,7 +173,6 @@ 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}),
@@ -236,27 +235,6 @@ 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
@@ -284,6 +262,8 @@ Section: libs
 Depends: ${python:Depends},
          ${shlibs:Depends},
          ${misc:Depends}
+Breaks: libpdal-plugin-numpy (<< 1.7.2-2~)
+Replaces: libpdal-plugin-numpy (<< 1.7.2-2~)
 Description: Point Data Abstraction Library - Python 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

debian/libpdal-dev.examples

+examples/*

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-plugin-python.install

+usr/lib/libpdal_plugin_*_numpy.so*
 usr/lib/libpdal_plugin_*_python.so*

debian/libpdal-plugin-python.lintian-overrides

@@ -5,4 +5,9 @@ libpdal-plugin-python: non-dev-pkg-with-shlib-symlink *
 
 # False positive, part of NormalX, NormalY, NormalZ
 libpdal-plugin-python: spelling-error-in-binary * NormalY Normally
+libpdal-plugin-python: 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-python: hardening-no-fortify-functions *
 

debian/libpdal-util6.symbols

-# SymbolsHelper-Confirmed: 1.7.2 amd64 armel
+# SymbolsHelper-Confirmed: 1.7.2 amd64 armel m68k x32
 libpdal_util.so.6 #PACKAGE# #MINVER#
  _ZN4pdal12georeference17georeferenceWgs84EddRKNS0_14RotationMatrixES3_RKNS0_3XyzE@Base 1.1.0
  _ZN4pdal5BOX2D23getDefaultSpatialExtentEv@Base 1.1.0
@@ -81,9 +81,9 @@ libpdal_util.so.6 #PACKAGE# #MINVER#
  _ZN4pdalrsERSiRNS_6BoundsE@Base 1.3.0
  (optional=templinst|arch=sh4)_ZN9__gnu_cxx12__to_xstringINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEcEET_PFiPT0_jPKS8_13__va_list_tagEjSB_z@Base 1.7.1
  (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|arch=amd64 powerpc s390x|subst)_ZN9__gnu_cxx12__to_xstringINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEcEET_PFiPT0_{size_t}PKS8_P13__va_list_tagE{size_t}SB_z@Base 1.7.0
+ (optional=templinst|arch=amd64 powerpc s390x x32|subst)_ZN9__gnu_cxx12__to_xstringINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEcEET_PFiPT0_{size_t}PKS8_P13__va_list_tagE{size_t}SB_z@Base 1.7.0
  (optional=templinst|arch=hurd-i386 i386 ppc64 ppc64el|subst)_ZN9__gnu_cxx12__to_xstringINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEcEET_PFiPT0_{size_t}PKS8_PcE{size_t}SB_z@Base 1.7.1
- (optional=templinst|arch=hppa mips mips64el mipsel sparc64|subst)_ZN9__gnu_cxx12__to_xstringINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEcEET_PFiPT0_{size_t}PKS8_PvE{size_t}SB_z@Base 1.7.1
+ (optional=templinst|arch=hppa m68k mips mips64el mipsel sparc64|subst)_ZN9__gnu_cxx12__to_xstringINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEcEET_PFiPT0_{size_t}PKS8_PvE{size_t}SB_z@Base 1.7.1
  (optional=templinst|arch=arm64 armel armhf|subst)_ZN9__gnu_cxx12__to_xstringINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEcEET_PFiPT0_{size_t}PKS8_St9__va_listE{size_t}SB_z@Base 1.7.1
  _ZN9pdalboost10filesystem11path_traits8dispatchERKNS0_15directory_entryERNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 1.2.0
  _ZN9pdalboost10filesystem11path_traits8dispatchERKNS0_15directory_entryERNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKSt7codecvtIwc11__mbstate_tE@Base 1.2.0

debian/rules

@@ -81,8 +81,8 @@ override_dh_install:
 	dh_install --list-missing
 
 override_dh_python2:
-	dh_python2 -plibpdal-plugin-python -plibpdal-plugin-numpy
-	dh_numpy -plibpdal-plugin-python -plibpdal-plugin-numpy
+	dh_python2 -plibpdal-plugin-python
+	dh_numpy -plibpdal-plugin-python
 
 override_dh_makeshlibs:
 	dh_makeshlibs -- -v$(UPSTREAM_VERSION) -c0