diff -Nru ros-rosinstall-0.7.7/debian/changelog ros-rosinstall-0.7.8/debian/changelog --- ros-rosinstall-0.7.7/debian/changelog 2017-08-12 14:05:37.000000000 +0000 +++ ros-rosinstall-0.7.8/debian/changelog 2018-04-04 19:51:39.000000000 +0000 @@ -1,3 +1,19 @@ +ros-rosinstall (0.7.8-2) unstable; urgency=medium + + * Add R³ + * http -> https + * Add patch for get_info_table_raw_csv (Closes: #894699) + + -- Jochen Sprickerhof Wed, 04 Apr 2018 21:51:39 +0200 + +ros-rosinstall (0.7.8-1) unstable; urgency=medium + + * Update Vcs URLs to salsa.d.o + * New upstream version 0.7.8 + * Bump policy and debhelper versions (no changes) + + -- Jochen Sprickerhof Sat, 31 Mar 2018 15:32:09 +0200 + ros-rosinstall (0.7.7-6) unstable; urgency=medium * Fix python3 dependencies diff -Nru ros-rosinstall-0.7.7/debian/compat ros-rosinstall-0.7.8/debian/compat --- ros-rosinstall-0.7.7/debian/compat 2017-07-01 10:21:08.000000000 +0000 +++ ros-rosinstall-0.7.8/debian/compat 2018-03-31 13:28:43.000000000 +0000 @@ -1 +1 @@ -10 +11 diff -Nru ros-rosinstall-0.7.7/debian/control ros-rosinstall-0.7.8/debian/control --- ros-rosinstall-0.7.7/debian/control 2017-08-12 14:01:29.000000000 +0000 +++ ros-rosinstall-0.7.8/debian/control 2018-03-31 17:16:48.000000000 +0000 @@ -3,13 +3,14 @@ Priority: optional Maintainer: Debian Science Maintainers Uploaders: Thomas Moulard , Jochen Sprickerhof , Leopold Palomo-Avellaneda -Build-Depends: debhelper (>= 10), 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.0.0 -Homepage: http://wiki.ros.org/rosinstall +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 +Rules-Requires-Root: no +Homepage: https://wiki.ros.org/rosinstall X-Python-Version: >= 2.6 X-Python3-Version: >= 3.2 -Vcs-Git: https://anonscm.debian.org/cgit/debian-science/packages/ros/ros-rosinstall.git -Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/ros/ros-rosinstall.git +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 diff -Nru ros-rosinstall-0.7.7/debian/copyright ros-rosinstall-0.7.8/debian/copyright --- ros-rosinstall-0.7.7/debian/copyright 2017-07-18 16:18:30.000000000 +0000 +++ ros-rosinstall-0.7.8/debian/copyright 2018-03-31 17:17:05.000000000 +0000 @@ -1,7 +1,7 @@ -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: rosinstall Upstream-Contact: Tully Foote -Source: http://wiki.ros.org/rosinstall +Source: https://github.com/vcstools/rosinstall Files: * Copyright: 2009-2011 Willow Garage, Inc. diff -Nru ros-rosinstall-0.7.7/debian/patches/0005-Adopt-to-new-get_info_table_raw_csv-API.patch ros-rosinstall-0.7.8/debian/patches/0005-Adopt-to-new-get_info_table_raw_csv-API.patch --- ros-rosinstall-0.7.7/debian/patches/0005-Adopt-to-new-get_info_table_raw_csv-API.patch 1970-01-01 00:00:00.000000000 +0000 +++ ros-rosinstall-0.7.8/debian/patches/0005-Adopt-to-new-get_info_table_raw_csv-API.patch 2018-04-04 19:45:45.000000000 +0000 @@ -0,0 +1,20 @@ +From: Jochen Sprickerhof +Date: Wed, 4 Apr 2018 21:45:25 +0200 +Subject: Adopt to new get_info_table_raw_csv API + +--- + src/rosinstall/rosws_cli.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/rosinstall/rosws_cli.py b/src/rosinstall/rosws_cli.py +index 650c9c1..4a3eee8 100644 +--- a/src/rosinstall/rosws_cli.py ++++ b/src/rosinstall/rosws_cli.py +@@ -331,6 +331,7 @@ $ %(prog)s info --only=path,cur_uri,cur_revision robot_model geometry + if only_options == '': + parser.error('No valid options given') + lines = get_info_table_raw_csv(config, ++ parser, + properties=only_options, + localnames=args) + print('\n'.join(lines)) diff -Nru ros-rosinstall-0.7.7/debian/patches/series ros-rosinstall-0.7.8/debian/patches/series --- ros-rosinstall-0.7.7/debian/patches/series 2017-07-25 20:15:29.000000000 +0000 +++ ros-rosinstall-0.7.8/debian/patches/series 2018-04-04 19:45:45.000000000 +0000 @@ -2,3 +2,4 @@ 0002-Disable-tests-with-network-connection.patch 0004-Add-missing-dependency.patch 0004-Add-fake-identity-for-VCSs-107.patch +0005-Adopt-to-new-get_info_table_raw_csv-API.patch diff -Nru ros-rosinstall-0.7.7/README.rst ros-rosinstall-0.7.8/README.rst --- ros-rosinstall-0.7.7/README.rst 2015-10-17 22:28:31.000000000 +0000 +++ ros-rosinstall-0.7.8/README.rst 2016-05-23 21:30:16.000000000 +0000 @@ -3,7 +3,7 @@ Command-line tools for maintaining a workspace of projects from multiple version-control systems, tailored for the ROS (Robot operating system) community. -See http://www.ros.org/doc/api/rosinstall/html +See http://docs.ros.org/independent/api/rosinstall/html Installing ---------- diff -Nru ros-rosinstall-0.7.7/src/rosinstall/__version__.py ros-rosinstall-0.7.8/src/rosinstall/__version__.py --- ros-rosinstall-0.7.7/src/rosinstall/__version__.py 2015-10-17 22:28:31.000000000 +0000 +++ ros-rosinstall-0.7.8/src/rosinstall/__version__.py 2016-05-23 21:30:16.000000000 +0000 @@ -1 +1 @@ -version = '0.7.7' +version = '0.7.8' diff -Nru ros-rosinstall-0.7.7/stdeb.cfg ros-rosinstall-0.7.8/stdeb.cfg --- ros-rosinstall-0.7.7/stdeb.cfg 2015-10-17 22:28:31.000000000 +0000 +++ ros-rosinstall-0.7.8/stdeb.cfg 2016-05-23 21:30:16.000000000 +0000 @@ -3,5 +3,5 @@ Depends3: subversion, mercurial, git-core, bzr, python3-yaml, python3-vcstools (>= 0.1.38), python3-catkin-pkg, python3-rosdistro (>=0.3.0), python3-wstool (>=0.1.12) Conflicts: python3-rosinstall Conflicts3: python-rosinstall -Suite: oneiric precise quantal raring saucy trusty utopic vivid wheezy jessie +Suite: oneiric precise quantal raring saucy trusty utopic vivid wily xenial wheezy jessie X-Python3-Version: >= 3.2 diff -Nru ros-rosinstall-0.7.7/.travis.yml ros-rosinstall-0.7.8/.travis.yml --- ros-rosinstall-0.7.7/.travis.yml 2015-10-17 22:28:31.000000000 +0000 +++ ros-rosinstall-0.7.8/.travis.yml 2016-05-23 21:30:16.000000000 +0000 @@ -10,7 +10,7 @@ # develop seems to be required by travis since 02/2013 - python setup.py build develop - sudo apt-get clean - - sudo apt-get install -qq zsh + - sudo apt-get update && sudo apt-get install -qq zsh - sudo pip install vcstools nose-cov coverage PyYAML # Set git config to silence some stuff in the tests - git config --global user.email "foo@example.com"