debian/changelog

@@ -4,6 +4,8 @@ libkml (1.3.0-8) UNRELEASED; urgency=medium
   * Update watch file to limit matches to archive path.
   * Add Build-Depends-Package field to symbols files.
   * Remove package name from lintian overrides.
+  * Don't build swig bindings.
+  * Update symbols for amd64.
 
  -- Bas Couwenberg <sebastic@debian.org>  Sat, 04 Aug 2018 14:45:48 +0200
 

debian/control

@@ -5,18 +5,13 @@ Uploaders: Francesco Paolo Lovergine <frankie@debian.org>,
 Section: science
 Priority: optional
 Build-Depends: debhelper (>= 9),
-               dh-python,
                cmake,
-               default-jdk,
                libboost-dev,
                libcurl4-gnutls-dev | libcurl-ssl-dev,
                libexpat1-dev,
                libminizip-dev,
                liburiparser-dev (>= 0.7.1),
                pkg-kde-tools,
-               python-dev (>= 2.6.6-3~),
-               python-all-dev (>= 2.6.6-3~),
-               swig,
                zlib1g-dev
 Standards-Version: 4.3.0
 Vcs-Browser: https://salsa.debian.org/debian-gis-team/libkml
@@ -137,45 +132,3 @@ Description: Library to manipulate KML 2.2 OGC standard files - development file
  .
  This package contains files required to build C/C++ programs which use
  the KML library.
-
-
-Package: libkml-java
-Architecture: any
-Section: java
-Depends: libkmlbase1 (= ${binary:Version}),
-         libkmlconvenience1 (= ${binary:Version}),
-         libkmldom1 (= ${binary:Version}),
-         libkmlengine1 (= ${binary:Version}),
-         libkmlregionator1 (= ${binary:Version}),
-         libkmlxsd1 (= ${binary:Version}),
-         ${misc:Depends}
-Pre-Depends: ${shlibs:Depends},
-             ${misc:Pre-Depends}
-Description: Library to manipulate KML 2.2 OGC standard files - Java package
- This is a library for use with applications that want to parse,
- generate and operate on KML, a geo-data XML variant. It is an
- implementation of the OGC KML 2.2 standard. It is written in C++ and
- bindings are available via SWIG to Java and Python.
- .
- This package contains the required packages for Java applications.
-
-Package: python-kml
-Architecture: any
-Section: python
-Depends: libkmlbase1 (= ${binary:Version}),
-         libkmlconvenience1 (= ${binary:Version}),
-         libkmldom1 (= ${binary:Version}),
-         libkmlengine1 (= ${binary:Version}),
-         libkmlregionator1 (= ${binary:Version}),
-         libkmlxsd1 (= ${binary:Version}),
-         ${shlibs:Depends},
-         ${python:Depends},
-         ${misc:Depends}
-Provides: ${python:Provides}
-Description: Library to manipulate KML 2.2 OGC standard files - Python extension
- This is a library for use with applications that want to parse,
- generate and operate on KML, a geo-data XML variant. It is an
- implementation of the OGC KML 2.2 standard. It is written in C++ and
- bindings are available via SWIG to Java and Python.
- .
- This package contains required extensions for Python applications.

debian/libkml-java.install

-usr/share/java
-usr/lib/*/jni

debian/libkml-java.lintian-overrides

-# Build uses -D_FORTIFY_SOURCE=2, but hardening-check reports:
-#  Fortify Source functions: no, only unprotected functions found!
-hardening-no-fortify-functions usr/lib/*/jni/libkmldom_swig_java.so
-
-# Name as used by upstream.
-bad-jar-name usr/share/java/LibKML.jar
-

debian/libkmlconvenience1.symbols

@@ -145,6 +145,7 @@ libkmlconvenience.so.1 #PACKAGE# #MINVER#
  (optional=templinst)_ZNSt6vectorIN5boost13intrusive_ptrIN6kmldom6ObjectEEESaIS4_EE19_M_emplace_back_auxIJRKS4_EEEvDpOT_@Base 1.3.0
  (optional=templinst)_ZNSt6vectorIN7kmlbase4Vec3ESaIS1_EE12emplace_backIJS1_EEEvDpOT_@Base 1.3.0
  (optional=templinst|arch=amd64)_ZNSt6vectorIN7kmlbase4Vec3ESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 1.3.0
+ (optional=templinst|arch=amd64)_ZNSt6vectorIN7kmlbase4Vec3ESaIS1_EE17_M_realloc_insertIJS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 1.3.0
  (optional=templinst)_ZNSt6vectorIN7kmlbase4Vec3ESaIS1_EE19_M_emplace_back_auxIJS1_EEEvDpOT_@Base 1.3.0
  (optional=templinst|arch=amd64)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE17_M_realloc_insertIJRKS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base 1.3.0
  (optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE19_M_emplace_back_auxIJRKS5_EEEvDpOT_@Base 1.3.0

debian/libkmldom1.symbols

@@ -1698,6 +1698,7 @@ libkmldom.so.1 #PACKAGE# #MINVER#
  (optional=templinst|arch=amd64)_ZNSt6vectorIPN6kmldom14ParserObserverESaIS2_EE17_M_realloc_insertIJRKS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 1.3.0
  (optional=templinst)_ZNSt6vectorIPN6kmldom14ParserObserverESaIS2_EE19_M_emplace_back_auxIJRKS2_EEEvDpOT_@Base 1.3.0
  (optional=templinst|arch=amd64)_ZNSt6vectorIiSaIiEE17_M_realloc_insertIJRKiEEEvN9__gnu_cxx17__normal_iteratorIPiS1_EEDpOT_@Base 1.3.0
+ (optional=templinst|arch=amd64)_ZNSt6vectorIiSaIiEE17_M_realloc_insertIJiEEEvN9__gnu_cxx17__normal_iteratorIPiS1_EEDpOT_@Base 1.3.0
  (optional=templinst)_ZNSt6vectorIiSaIiEE19_M_emplace_back_auxIJiEEEvDpOT_@Base 1.3.0
  (optional=templinst|arch=amd64)_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE12_M_constructIPKcEEvT_S8_St20forward_iterator_tag@Base 1.3.0
  (optional=templinst|arch=amd64)_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE12_M_constructIPcEEvT_S7_St20forward_iterator_tag@Base 1.3.0

debian/libkmlengine1.symbols

@@ -262,6 +262,7 @@ libkmlengine.so.1 #PACKAGE# #MINVER#
  _ZN9kmlengine9KmlStreamD0Ev@Base 1.3.0~r864
  _ZN9kmlengine9KmlStreamD1Ev@Base 1.3.0~r864
  _ZN9kmlengine9KmlStreamD2Ev@Base 1.3.0~r864
+ (arch=amd64)_ZNK6kmldom7Element9SerializeERNS_10SerializerE@Base 1.3.0
  _ZNK7kmlbase10NetFetcher8FetchUrlERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPS6_@Base 1.3.0~r864
  _ZNK9kmlengine15UpdateProcessor11GetTargetIdERKN5boost13intrusive_ptrIN6kmldom6ObjectEEEPNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 1.3.0~r864
  _ZNK9kmlengine7KmlFile13GetObjectByIdERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 1.3.0~r864

debian/patches/python3.patch

+Description: Fix syntax for Python 3 compatibility.
+Author: Bas Couwenberg <sebastic@debian.org>
+Forwarded: not-needed
+
+--- a/src/swig/CMakeLists.txt
++++ b/src/swig/CMakeLists.txt
+@@ -10,7 +10,7 @@ if(WITH_PYTHON)
+ 
+   if(NOT DEFINED PYTHON_INSTALL_DIR)
+     execute_process(COMMAND
+-      ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(True)"
++      ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(True))"
+       OUTPUT_VARIABLE PYTHON_INSTALL_DIR
+       OUTPUT_STRIP_TRAILING_WHITESPACE )
+   endif(NOT DEFINED PYTHON_INSTALL_DIR)

debian/patches/series

 wrong-path-for-interpreter.patch
+python3.patch

debian/python-kml.install

-usr/lib/python2*/*-packages

debian/rules

@@ -5,14 +5,12 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 include /usr/share/dpkg/pkg-info.mk
 
-JAVA_HOME = /usr/lib/jvm/default-java
-
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 UPSTREAM_VERSION := $(shell echo $(DEB_VERSION_UPSTREAM) | sed -e 's/\+.*//')
 
 %:
-	dh $@ --with python2,pkgkde_symbolshelper --parallel
+	dh $@ --with pkgkde_symbolshelper --parallel
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
@@ -20,10 +18,7 @@ override_dh_auto_configure:
 		-DCMAKE_INSTALL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/libkml \
 		-DBUILD_TESTING=OFF \
 		-DBUILD_EXAMPLES=OFF \
-		-DINSTALL_EXAMPLES=OFF \
-		-DWITH_SWIG=ON \
-		-DWITH_PYTHON=ON \
-		-DWITH_JAVA=ON \
+		-DINSTALL_EXAMPLES=OFF
 
 override_dh_auto_install:
 	dh_auto_install
@@ -36,6 +31,3 @@ override_dh_install:
 
 override_dh_makeshlibs:
 	dh_makeshlibs -- -c0 -v$(UPSTREAM_VERSION)
-
-override_dh_python2:
-	dh_python2 -ppython-kml

debian/source/lintian-overrides

-# Only Python supported at the moment
-python-foo-but-no-python3-foo python-kml
-
 # Not worth the effort
 testsuite-autopkgtest-missing