diff -Nru ros-rosinstall-0.7.8/debian/changelog ros-rosinstall-0.7.8/debian/changelog --- ros-rosinstall-0.7.8/debian/changelog 2018-04-04 19:51:39.000000000 +0000 +++ ros-rosinstall-0.7.8/debian/changelog 2019-09-28 06:38:20.000000000 +0000 @@ -1,3 +1,20 @@ +ros-rosinstall (0.7.8-4) unstable; urgency=medium + + * Add Python 3 patches + + -- Jochen Sprickerhof Sat, 28 Sep 2019 08:38:20 +0200 + +ros-rosinstall (0.7.8-3) unstable; urgency=medium + + * Fix ancient-python-version-field + * Bump policy version (no changes) + * switch to debhelper-compat and debhelper 12 + * add Salsa CI + * Drop Python 2 (Closes: #938397) + * Add d/clean + + -- Jochen Sprickerhof Fri, 27 Sep 2019 14:18:21 +0200 + ros-rosinstall (0.7.8-2) unstable; urgency=medium * Add R³ diff -Nru ros-rosinstall-0.7.8/debian/clean ros-rosinstall-0.7.8/debian/clean --- ros-rosinstall-0.7.8/debian/clean 1970-01-01 00:00:00.000000000 +0000 +++ ros-rosinstall-0.7.8/debian/clean 2019-09-27 12:17:16.000000000 +0000 @@ -0,0 +1 @@ +src/rosinstall.egg-info/ diff -Nru ros-rosinstall-0.7.8/debian/compat ros-rosinstall-0.7.8/debian/compat --- ros-rosinstall-0.7.8/debian/compat 2018-03-31 13:28:43.000000000 +0000 +++ ros-rosinstall-0.7.8/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -11 diff -Nru ros-rosinstall-0.7.8/debian/control ros-rosinstall-0.7.8/debian/control --- ros-rosinstall-0.7.8/debian/control 2018-03-31 17:16:48.000000000 +0000 +++ ros-rosinstall-0.7.8/debian/control 2019-09-27 12:16:23.000000000 +0000 @@ -3,34 +3,19 @@ Priority: optional Maintainer: Debian Science Maintainers Uploaders: Thomas Moulard , Jochen Sprickerhof , Leopold Palomo-Avellaneda -Build-Depends: debhelper (>= 11), dh-python, python-all, python-setuptools, python3-all, python3-setuptools, python-wstool, python-yaml, python-mock, git, mercurial, python-catkin-pkg, python-rosdistro, zsh, python3-wstool, python3-yaml, python3-mock, python3-catkin-pkg, python3-rosdistro -Standards-Version: 4.1.3 +Build-Depends: debhelper-compat (= 12), dh-python, python3-all, python3-setuptools, git, mercurial, zsh, python3-wstool, python3-yaml, python3-mock, python3-catkin-pkg, python3-rosdistro +Standards-Version: 4.4.0 Rules-Requires-Root: no Homepage: https://wiki.ros.org/rosinstall -X-Python-Version: >= 2.6 -X-Python3-Version: >= 3.2 Vcs-Git: https://salsa.debian.org/science-team/ros-rosinstall.git Vcs-Browser: https://salsa.debian.org/science-team/ros-rosinstall Testsuite: autopkgtest-pkg-python -Package: python-rosinstall -Architecture: all -Depends: ${python:Depends}, ${misc:Depends} -Description: Installer for Robot OS (Python 2) - This package is part of Robot OS (ROS). The rosinstall package - provides a Python API for interacting with a source code workspace as - well as a group of command line tools. Rosinstall leverages the - vcstools package for source control and stores its state in - rosinstall files. - . - Using rosinstall you can update several folders using a variety of SCMs - (SVN, Mercurial, git, Bazaar) with just one command. - . - This package installs the library for Python 2. - Package: python3-rosinstall Architecture: all Depends: ${python3:Depends}, ${misc:Depends} +Breaks: python-rosinstall (<< 0.7.8-3) +Replaces: python-rosinstall (<< 0.7.8-3) Description: Installer for Robot OS (Python 3) This package is part of Robot OS (ROS). The rosinstall package provides a Python API for interacting with a source code workspace as diff -Nru ros-rosinstall-0.7.8/debian/gitlab-ci.yml ros-rosinstall-0.7.8/debian/gitlab-ci.yml --- ros-rosinstall-0.7.8/debian/gitlab-ci.yml 1970-01-01 00:00:00.000000000 +0000 +++ ros-rosinstall-0.7.8/debian/gitlab-ci.yml 2019-09-27 12:15:35.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-rosinstall-0.7.8/debian/patches/0006-Switch-generated-setup.sh-to-Python-3.patch ros-rosinstall-0.7.8/debian/patches/0006-Switch-generated-setup.sh-to-Python-3.patch --- ros-rosinstall-0.7.8/debian/patches/0006-Switch-generated-setup.sh-to-Python-3.patch 1970-01-01 00:00:00.000000000 +0000 +++ ros-rosinstall-0.7.8/debian/patches/0006-Switch-generated-setup.sh-to-Python-3.patch 2019-09-28 06:34:36.000000000 +0000 @@ -0,0 +1,39 @@ +From: Jochen Sprickerhof +Date: Sat, 28 Sep 2019 08:06:24 +0200 +Subject: Switch generated setup.sh to Python 3 + +--- + src/rosinstall/setupfiles.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/rosinstall/setupfiles.py b/src/rosinstall/setupfiles.py +index c46d9af..702c0f2 100644 +--- a/src/rosinstall/setupfiles.py ++++ b/src/rosinstall/setupfiles.py +@@ -196,7 +196,7 @@ unset _SETUP_SH_ERROR + # We store into _PARSED_CONFIG the result of python code, + # which is the ros_package_path and the list of setup_files to source + # Using python here to benefit of the pyyaml library +-export _PARSED_CONFIG=`/usr/bin/env python << EOPYTHON ++export _PARSED_CONFIG=`/usr/bin/env python3 << EOPYTHON + + %(pycode)s + EOPYTHON` +@@ -249,7 +249,7 @@ unset _SETUPFILES_ROSINSTALL + + # prepend elements from .rosinstall file to ROS_PACKAGE_PATH + # ignoring duplicates entries from value set by setup files +-export ROS_PACKAGE_PATH=`/usr/bin/env python << EOPYTHON ++export ROS_PACKAGE_PATH=`/usr/bin/env python3 << EOPYTHON + import os + ros_package_path = os.environ.get('ROS_PACKAGE_PATH', '') + original_elements = ros_package_path.split(':') +@@ -271,7 +271,7 @@ export ROS_WORKSPACE=%(wspath)s + # if setup.sh did not set ROS_ROOT (pre-fuerte) + if [ -z "${ROS_ROOT}" ]; then + # using ROS_ROOT now being in ROS_PACKAGE_PATH +- export _ROS_ROOT_ROSINSTALL=`/usr/bin/env python << EOPYTHON ++ export _ROS_ROOT_ROSINSTALL=`/usr/bin/env python3 << EOPYTHON + import sys, os; + if 'ROS_PACKAGE_PATH' in os.environ: + pkg_path = os.environ['ROS_PACKAGE_PATH'] diff -Nru ros-rosinstall-0.7.8/debian/patches/0007-Disable-test-using-Python-2.patch ros-rosinstall-0.7.8/debian/patches/0007-Disable-test-using-Python-2.patch --- ros-rosinstall-0.7.8/debian/patches/0007-Disable-test-using-Python-2.patch 1970-01-01 00:00:00.000000000 +0000 +++ ros-rosinstall-0.7.8/debian/patches/0007-Disable-test-using-Python-2.patch 2019-09-28 06:34:36.000000000 +0000 @@ -0,0 +1,20 @@ +From: Jochen Sprickerhof +Date: Sat, 28 Sep 2019 08:18:58 +0200 +Subject: Disable test using Python 2 + +--- + test/local/test_setupfiles.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/test/local/test_setupfiles.py b/test/local/test_setupfiles.py +index 121210a..fd37d0e 100644 +--- a/test/local/test_setupfiles.py ++++ b/test/local/test_setupfiles.py +@@ -248,6 +248,7 @@ class GenerateTest(AbstractFakeRosBasedTest): + class Genfiletest(AbstractRosinstallBaseDirTest): + + def test_gen_python_code(self): ++ return # use Python 3 version below + config = Config( + [PathSpec(os.path.join("test", "example_dirs", "ros_comm")), + PathSpec("bar.sh", tags=['setup-file']), diff -Nru ros-rosinstall-0.7.8/debian/patches/0008-Fix-Python-3-detection.patch ros-rosinstall-0.7.8/debian/patches/0008-Fix-Python-3-detection.patch --- ros-rosinstall-0.7.8/debian/patches/0008-Fix-Python-3-detection.patch 1970-01-01 00:00:00.000000000 +0000 +++ ros-rosinstall-0.7.8/debian/patches/0008-Fix-Python-3-detection.patch 2019-09-28 06:34:36.000000000 +0000 @@ -0,0 +1,21 @@ +From: Jochen Sprickerhof +Date: Sat, 28 Sep 2019 08:34:27 +0200 +Subject: Fix Python 3 detection + +--- + test/local/test_setupfiles.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/local/test_setupfiles.py b/test/local/test_setupfiles.py +index fd37d0e..a687276 100644 +--- a/test/local/test_setupfiles.py ++++ b/test/local/test_setupfiles.py +@@ -51,7 +51,7 @@ def has_python3(): + p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + output, err = p.communicate() + p.stdout.close() +- if not p.returncode == 0: ++ if p.returncode == 0: + return True + return False + diff -Nru ros-rosinstall-0.7.8/debian/patches/series ros-rosinstall-0.7.8/debian/patches/series --- ros-rosinstall-0.7.8/debian/patches/series 2018-04-04 19:45:45.000000000 +0000 +++ ros-rosinstall-0.7.8/debian/patches/series 2019-09-28 06:34:36.000000000 +0000 @@ -3,3 +3,6 @@ 0004-Add-missing-dependency.patch 0004-Add-fake-identity-for-VCSs-107.patch 0005-Adopt-to-new-get_info_table_raw_csv-API.patch +0006-Switch-generated-setup.sh-to-Python-3.patch +0007-Disable-test-using-Python-2.patch +0008-Fix-Python-3-detection.patch diff -Nru ros-rosinstall-0.7.8/debian/rules ros-rosinstall-0.7.8/debian/rules --- ros-rosinstall-0.7.8/debian/rules 2018-03-31 13:25:25.000000000 +0000 +++ ros-rosinstall-0.7.8/debian/rules 2019-09-27 12:15:35.000000000 +0000 @@ -1,7 +1,4 @@ #!/usr/bin/make -f -export PYBUILD_NAME=rosinstall -export PYBUILD_AFTER_INSTALL=rm -rf 'debian/python3-rosinstall/usr/bin' - %: - dh $@ --with python2,python3 --buildsystem=pybuild + dh $@ --with python3 --buildsystem=pybuild diff -Nru ros-rosinstall-0.7.8/debian/source/options ros-rosinstall-0.7.8/debian/source/options --- ros-rosinstall-0.7.8/debian/source/options 2018-03-31 13:25:25.000000000 +0000 +++ ros-rosinstall-0.7.8/debian/source/options 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -extend-diff-ignore = "^[^/]*[.]egg-info/"