diff -Nru ros-pluginlib-1.12.1/debian/changelog ros-pluginlib-1.12.1/debian/changelog --- ros-pluginlib-1.12.1/debian/changelog 2019-08-22 07:42:15.000000000 +0000 +++ ros-pluginlib-1.12.1/debian/changelog 2019-10-26 05:30:43.000000000 +0000 @@ -1,8 +1,12 @@ -ros-pluginlib (1.12.1-2build1) eoan; urgency=medium +ros-pluginlib (1.12.1-3) unstable; urgency=medium - * Rebuild against new librosconsole3d. + * Switch to Python 3 + * switch to debhelper-compat and debhelper 12 + * Bump policy version (no changes) + * simplify d/watch + * add Salsa CI - -- Gianfranco Costamagna Thu, 22 Aug 2019 09:42:15 +0200 + -- Jochen Sprickerhof Sat, 26 Oct 2019 07:30:43 +0200 ros-pluginlib (1.12.1-2) unstable; urgency=medium diff -Nru ros-pluginlib-1.12.1/debian/compat ros-pluginlib-1.12.1/debian/compat --- ros-pluginlib-1.12.1/debian/compat 2018-06-21 20:08:01.000000000 +0000 +++ ros-pluginlib-1.12.1/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -11 diff -Nru ros-pluginlib-1.12.1/debian/control ros-pluginlib-1.12.1/debian/control --- ros-pluginlib-1.12.1/debian/control 2018-10-11 05:57:13.000000000 +0000 +++ ros-pluginlib-1.12.1/debian/control 2019-10-26 05:19:22.000000000 +0000 @@ -4,8 +4,8 @@ Uploaders: Thomas Moulard , Jochen Sprickerhof , Leopold Palomo-Avellaneda -Build-Depends: debhelper (>= 11), catkin (>= 0.7.14-5), libboost-filesystem-dev, libboost-system-dev, ros-cmake-modules, libclass-loader-dev, librosconsole-bridge-dev, libroslib-dev, libtinyxml2-dev, librosconsole-dev, libroscpp-core-dev -Standards-Version: 4.2.1 +Build-Depends: debhelper-compat (= 12), catkin (>= 0.7.14-5), libboost-filesystem-dev, libboost-system-dev, ros-cmake-modules, libclass-loader-dev, librosconsole-bridge-dev, libroslib-dev, libtinyxml2-dev, librosconsole-dev, libroscpp-core-dev +Standards-Version: 4.4.1 Section: libs Rules-Requires-Root: no Homepage: https://wiki.ros.org/pluginlib @@ -15,7 +15,7 @@ Package: pluginlib-dev Section: libdevel Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, python, libboost-dev, libboost-filesystem-dev, libboost-system-dev, libtinyxml2-dev, libclass-loader-dev, librosconsole-dev, libroslib-dev, ros-cmake-modules, libboost-filesystem-dev, libboost-system-dev +Depends: ${misc:Depends}, ${shlibs:Depends}, python3, libboost-dev, libboost-filesystem-dev, libboost-system-dev, libtinyxml2-dev, libclass-loader-dev, librosconsole-dev, libroslib-dev, ros-cmake-modules, libboost-filesystem-dev, libboost-system-dev Description: ROS library for plugins This package is part of Robot OS (ROS). This is the high-level ROS plugin interface. It provides tools for writing and dynamically diff -Nru ros-pluginlib-1.12.1/debian/gitlab-ci.yml ros-pluginlib-1.12.1/debian/gitlab-ci.yml --- ros-pluginlib-1.12.1/debian/gitlab-ci.yml 1970-01-01 00:00:00.000000000 +0000 +++ ros-pluginlib-1.12.1/debian/gitlab-ci.yml 2019-10-26 05:30:19.000000000 +0000 @@ -0,0 +1,3 @@ +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml diff -Nru ros-pluginlib-1.12.1/debian/patches/0003-Switch-to-Python-3.patch ros-pluginlib-1.12.1/debian/patches/0003-Switch-to-Python-3.patch --- ros-pluginlib-1.12.1/debian/patches/0003-Switch-to-Python-3.patch 1970-01-01 00:00:00.000000000 +0000 +++ ros-pluginlib-1.12.1/debian/patches/0003-Switch-to-Python-3.patch 2019-10-14 17:28:57.000000000 +0000 @@ -0,0 +1,18 @@ +From: Jochen Sprickerhof +Date: Mon, 14 Oct 2019 19:28:49 +0200 +Subject: Switch to Python 3 + +--- + pluginlib/scripts/pluginlib_headers_migration.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pluginlib/scripts/pluginlib_headers_migration.py b/pluginlib/scripts/pluginlib_headers_migration.py +index 7406763..27ad9f8 100755 +--- a/pluginlib/scripts/pluginlib_headers_migration.py ++++ b/pluginlib/scripts/pluginlib_headers_migration.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # Software License Agreement (BSD License) + # + # Copyright (c) 2018, Open Source Robotics Foundation, Inc. diff -Nru ros-pluginlib-1.12.1/debian/patches/series ros-pluginlib-1.12.1/debian/patches/series --- ros-pluginlib-1.12.1/debian/patches/series 2018-06-21 20:11:47.000000000 +0000 +++ ros-pluginlib-1.12.1/debian/patches/series 2019-10-14 17:28:57.000000000 +0000 @@ -1,2 +1,3 @@ 0001-Add-default-plugin-path.patch 0002-Add-multiarch-triplet-as-optional-search-path.patch +0003-Switch-to-Python-3.patch diff -Nru ros-pluginlib-1.12.1/debian/watch ros-pluginlib-1.12.1/debian/watch --- ros-pluginlib-1.12.1/debian/watch 2017-12-23 16:09:56.000000000 +0000 +++ ros-pluginlib-1.12.1/debian/watch 2019-10-26 05:19:36.000000000 +0000 @@ -1,4 +1,4 @@ version=4 opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%ros-pluginlib-$1.tar.gz%" \ https://github.com/ros/pluginlib/tags \ - (?:.*?/)?v?(1.\d[\d.]*)\.tar\.gz debian uupdate + (?:.*?/)?v?(1.\d[\d.]*)\.tar\.gz