diff -Nru orocos-kdl-1.4.0/debian/changelog orocos-kdl-1.4.0/debian/changelog --- orocos-kdl-1.4.0/debian/changelog 2018-06-28 09:24:26.000000000 +0000 +++ orocos-kdl-1.4.0/debian/changelog 2018-09-27 11:48:52.000000000 +0000 @@ -1,8 +1,28 @@ -orocos-kdl (1.4.0-4build1) cosmic; urgency=medium +orocos-kdl (1.4.0-6) unstable; urgency=medium - * No-change rebuild to build for python3.7. + * Team upload. + * Do not build-depend on all support python(3) versions, since the build + system only builds for the default one. + * Mark liborocos-kdl-dev and python3-pykdl as Multi-Arch:same + (from the m-a hinter). + * Remove obsolete DEB_EXPORT_BUILDFLAGS from d/rules, covered by dh nowdays. - -- Matthias Klose Thu, 28 Jun 2018 09:24:26 +0000 + -- Mattia Rizzolo Thu, 27 Sep 2018 13:48:52 +0200 + +orocos-kdl (1.4.0-5) unstable; urgency=medium + + [ Johannes 'josch' Schauer ] + * add autopkgtest + * add missing dependency of liborocos-kdl-dev on libeigen3-dev + * debian/tests/compilation: Don't forget to add include directories + + [ Jochen Sprickerhof ] + * Fix in tree compilation patch (Closes: #907827) + * Bump policy version (no changes) + * Fix pkgconfig path + * http -> https + + -- Jochen Sprickerhof Fri, 14 Sep 2018 08:38:57 +0200 orocos-kdl (1.4.0-4) unstable; urgency=medium diff -Nru orocos-kdl-1.4.0/debian/control orocos-kdl-1.4.0/debian/control --- orocos-kdl-1.4.0/debian/control 2018-05-12 07:33:50.000000000 +0000 +++ orocos-kdl-1.4.0/debian/control 2018-09-27 11:33:47.000000000 +0000 @@ -1,10 +1,10 @@ Source: orocos-kdl +Section: libs Priority: optional Maintainer: Debian Science Maintainers Uploaders: Leopold Palomo-Avellaneda , Riku Voipio , Jochen Sprickerhof , -Build-Depends: debhelper (>= 11), cmake, pkg-config, libeigen3-dev, python3-all-dev, dh-python, python3-sip-dev -Standards-Version: 4.1.4 -Section: libs +Build-Depends: debhelper (>= 11), cmake, pkg-config, libeigen3-dev, python3-dev, dh-python, python3-sip-dev +Standards-Version: 4.2.1 Rules-Requires-Root: no Homepage: http://www.orocos.org/kdl Vcs-Browser: https://salsa.debian.org/science-team/orocos-kdl @@ -13,7 +13,8 @@ Package: liborocos-kdl-dev Section: libdevel Architecture: any -Depends: liborocos-kdl1.4 (= ${binary:Version}), ${misc:Depends} +Multi-Arch: same +Depends: liborocos-kdl1.4 (= ${binary:Version}), ${misc:Depends}, libeigen3-dev Description: Kinematics and Dynamics Library development files Orocos project to supply RealTime usable kinematics and dynamics code, it contains code for rigid body kinematics calculations and @@ -33,6 +34,7 @@ Package: python3-pykdl Section: python Architecture: any +Multi-Arch: same Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends} Description: Kinematics and Dynamics Library Python library This package contains the Python bindings PyKDL for the Kinematics and diff -Nru orocos-kdl-1.4.0/debian/copyright orocos-kdl-1.4.0/debian/copyright --- orocos-kdl-1.4.0/debian/copyright 2018-04-22 09:20:32.000000000 +0000 +++ orocos-kdl-1.4.0/debian/copyright 2018-09-27 11:31:12.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: orocos-kdl Upstream-Contact: Orocos Developers Source: https://github.com/orocos/orocos_kinematics_dynamics @@ -108,7 +108,7 @@ GNU General Public License for more details. . You should have received a copy of the GNU General Public License - along with this program. If not, see + along with this program. If not, see . On Debian systems, the complete text of the GNU General Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". diff -Nru orocos-kdl-1.4.0/debian/liborocos-kdl-dev.install orocos-kdl-1.4.0/debian/liborocos-kdl-dev.install --- orocos-kdl-1.4.0/debian/liborocos-kdl-dev.install 2018-04-22 08:55:30.000000000 +0000 +++ orocos-kdl-1.4.0/debian/liborocos-kdl-dev.install 2018-09-27 11:31:12.000000000 +0000 @@ -1,4 +1,4 @@ usr/include/* usr/lib/lib*.so -usr/lib/pkgconfig/* -usr/share/orocos_kdl \ No newline at end of file +usr/lib/pkgconfig /usr/share +usr/share/orocos_kdl diff -Nru orocos-kdl-1.4.0/debian/patches/0002-Support-in-tree-compilation.patch orocos-kdl-1.4.0/debian/patches/0002-Support-in-tree-compilation.patch --- orocos-kdl-1.4.0/debian/patches/0002-Support-in-tree-compilation.patch 2018-05-19 15:41:54.000000000 +0000 +++ orocos-kdl-1.4.0/debian/patches/0002-Support-in-tree-compilation.patch 2018-09-27 11:31:12.000000000 +0000 @@ -7,7 +7,7 @@ 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/python_orocos_kdl/CMakeLists.txt b/python_orocos_kdl/CMakeLists.txt -index 35c1c3e..8e5be8b 100644 +index 35c1c3e..fda2666 100644 --- a/python_orocos_kdl/CMakeLists.txt +++ b/python_orocos_kdl/CMakeLists.txt @@ -2,11 +2,13 @@ cmake_minimum_required(VERSION 2.4.6) @@ -15,7 +15,7 @@ project(python_orocos_kdl) -find_package(orocos_kdl) -+add_custom_target(link_target ALL COMMAND ${CMAKE_COMMAND} -E create_symlink ${PROJECT_SOURCE_DIR}/../orocos_kdl/src ${PROJECT_BINARY_DIR}/../orocos_kdl/src/kdl) ++execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${PROJECT_SOURCE_DIR}/../orocos_kdl/src ${PROJECT_BINARY_DIR}/../orocos_kdl/src/kdl) +include_directories(${PROJECT_BINARY_DIR}/../orocos_kdl/src) +include(${PROJECT_BINARY_DIR}/../orocos_kdl/orocos_kdl-config.cmake) include_directories(${orocos_kdl_INCLUDE_DIRS}) diff -Nru orocos-kdl-1.4.0/debian/rules orocos-kdl-1.4.0/debian/rules --- orocos-kdl-1.4.0/debian/rules 2018-04-22 18:26:34.000000000 +0000 +++ orocos-kdl-1.4.0/debian/rules 2018-09-27 11:34:56.000000000 +0000 @@ -1,6 +1,4 @@ #!/usr/bin/make -f -DPKG_EXPORT_BUILDFLAGS = 1 -include /usr/share/dpkg/default.mk export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed diff -Nru orocos-kdl-1.4.0/debian/tests/compilation orocos-kdl-1.4.0/debian/tests/compilation --- orocos-kdl-1.4.0/debian/tests/compilation 1970-01-01 00:00:00.000000000 +0000 +++ orocos-kdl-1.4.0/debian/tests/compilation 2018-09-27 11:31:12.000000000 +0000 @@ -0,0 +1,28 @@ +#!/bin/sh + +set -exu + +cd "$ADTTMP" + +component=$1 +shift + +echo "CmakeLists.txt:" +tee CMakeLists.txt << END +CMAKE_MINIMUM_REQUIRED(VERSION 2.4) +find_package(catkin REQUIRED COMPONENTS $component) +include_directories(include \${catkin_INCLUDE_DIRS}) +add_executable(main main.cc) +target_link_libraries(main \${catkin_LIBRARIES}) +END + +echo "main.cc:" +for incl in $@; do + echo "#include <$incl>" | tee -a main.cc +done +echo "int main(int argc, char* argv[]) { return 0; }" | tee -a main.cc + + +mkdir build +cmake -H. -Bbuild +cmake --build build diff -Nru orocos-kdl-1.4.0/debian/tests/control orocos-kdl-1.4.0/debian/tests/control --- orocos-kdl-1.4.0/debian/tests/control 1970-01-01 00:00:00.000000000 +0000 +++ orocos-kdl-1.4.0/debian/tests/control 2018-09-27 11:31:12.000000000 +0000 @@ -0,0 +1,4 @@ +# we test jacobian.hpp and tree.hpp because they include eigen and boost +Test-Command: ./debian/tests/compilation orocos_kdl kdl/jacobian.hpp kdl/tree.hpp +Restrictions: allow-stderr +Depends: liborocos-kdl-dev, g++, catkin