Run of fresh-releases for ros-catkin-pkg

Try this locally (using the lintian-brush package):

debcheckout ros-catkin-pkg
cd ros-catkin-pkg
new-upstream

Merge these changes:

git pull https://janitor.debian.net/git/ros-catkin-pkg fresh-releases/main

Summary

Merged new upstream version: 0.4.16 (was: 0.4.15).

Diff

diff --git a/.travis.yml b/.travis.yml
index 7457906..358a6dc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,13 @@
 language: python
-dist: trusty
+dist: xenial
 sudo: false
 python:
   - "2.7"
   - "3.4"
   - "3.5"
   - "3.6"
+  - "3.7"
+  - "3.8"
 # command to install dependencies
 install:
   # newer versions of docutils dropped support for Python 3.4
diff --git a/debian/changelog b/debian/changelog
index 9564b10..1f186a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ros-catkin-pkg (0.4.16-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Mon, 27 Jan 2020 02:27:58 +0000
+
 ros-catkin-pkg (0.4.15-1) unstable; urgency=medium
 
   * New upstream version 0.4.15
diff --git a/debian/patches/0001-Set-default-ROS_DISTRO-to-debian.patch b/debian/patches/0001-Set-default-ROS_DISTRO-to-debian.patch
index 0b91f9c..1bcffe7 100644
--- a/debian/patches/0001-Set-default-ROS_DISTRO-to-debian.patch
+++ b/debian/patches/0001-Set-default-ROS_DISTRO-to-debian.patch
@@ -6,11 +6,11 @@ Subject: Set default ROS_DISTRO to debian
  src/catkin_pkg/cli/create_pkg.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/src/catkin_pkg/cli/create_pkg.py b/src/catkin_pkg/cli/create_pkg.py
-index 6626b53..698cdda 100644
---- a/src/catkin_pkg/cli/create_pkg.py
-+++ b/src/catkin_pkg/cli/create_pkg.py
-@@ -42,7 +42,7 @@ def main(argv=sys.argv[1:], parent_path=os.getcwd()):
+Index: ros-catkin-pkg/src/catkin_pkg/cli/create_pkg.py
+===================================================================
+--- ros-catkin-pkg.orig/src/catkin_pkg/cli/create_pkg.py
++++ ros-catkin-pkg/src/catkin_pkg/cli/create_pkg.py
+@@ -42,7 +42,7 @@ def main(argv=sys.argv[1:], parent_path=
      parser.add_argument('-m', '--maintainer',
                          action='append',
                          help='A single maintainer, may be used multiple times')
diff --git a/setup.py b/setup.py
index 2a27fe3..69157bb 100755
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,7 @@ kwargs = {
     # same version as in:
     # - src/catkin_pkg/__init__.py
     # - stdeb.cfg
-    'version': '0.4.15',
+    'version': '0.4.16',
     'packages': ['catkin_pkg', 'catkin_pkg.cli'],
     'package_dir': {'': 'src'},
     'package_data': {'catkin_pkg': ['templates/*.in']},
diff --git a/src/catkin_pkg/__init__.py b/src/catkin_pkg/__init__.py
index ac101f8..bb9d1d3 100644
--- a/src/catkin_pkg/__init__.py
+++ b/src/catkin_pkg/__init__.py
@@ -35,4 +35,4 @@
 # same version as in:
 # - setup.py
 # - stdeb.cfg
-__version__ = '0.4.15'
+__version__ = '0.4.16'
diff --git a/src/catkin_pkg/metapackage.py b/src/catkin_pkg/metapackage.py
index 8be89fd..377bbcb 100644
--- a/src/catkin_pkg/metapackage.py
+++ b/src/catkin_pkg/metapackage.py
@@ -40,6 +40,7 @@ Reference: http://ros.org/reps/rep-0127.html#metapackage
 from __future__ import print_function
 
 import os
+import re
 
 from catkin_pkg.cmake import configure_file
 from catkin_pkg.cmake import get_metapackage_cmake_template_path
@@ -119,7 +120,13 @@ def has_valid_cmakelists_txt(path, metapackage_name):
     """
     cmakelists_txt = get_cmakelists_txt(path)
     expected = get_expected_cmakelists_txt(metapackage_name)
-    return cmakelists_txt == expected
+    prefix, suffix = expected.split('2.8.3', 1)
+    if not cmakelists_txt.startswith(prefix):
+        return False
+    if not cmakelists_txt.endswith(suffix):
+        return False
+    version = cmakelists_txt[len(prefix):-len(suffix)]
+    return re.match(r'^\d+\.\d+\.\d+$', version)
 
 
 def validate_metapackage(path, package):
@@ -147,12 +154,14 @@ def validate_metapackage(path, package):
         raise InvalidMetapackage('No CMakeLists.txt', path, package)
     # Is the CMakeLists.txt correct, else raise
     if not has_valid_cmakelists_txt(path, package.name):
+        expected = get_expected_cmakelists_txt(package.name)
+        expected = expected.replace('2.8.3', '<version x.y.z>')
         raise InvalidMetapackage("""\
 Invalid CMakeLists.txt
 Expected:
 <<<%s>>>
 Got:
-<<<%s>>>""" % (get_expected_cmakelists_txt(package.name), get_cmakelists_txt(path)), path, package
+<<<%s>>>""" % (expected, get_cmakelists_txt(path)), path, package
         )
     # Does it buildtool depend on catkin, else raise
     if not package.has_buildtool_depend_on_catkin():
diff --git a/stdeb.cfg b/stdeb.cfg
index 1951fc4..8229af2 100644
--- a/stdeb.cfg
+++ b/stdeb.cfg
@@ -3,11 +3,11 @@ Debian-Version: 100
 ; catkin-pkg-modules same version as in:
 ; - setup.py
 ; - src/catkin_pkg/__init__.py
-Depends: python-argparse, python-catkin-pkg-modules (>= 0.4.15), python-dateutil, python-docutils
+Depends: python-argparse, python-catkin-pkg-modules (>= 0.4.16), python-dateutil, python-docutils
 ; catkin-pkg-modules same version as in:
 ; - setup.py
 ; - src/catkin_pkg/__init__.py
-Depends3: python3-catkin-pkg-modules (>= 0.4.15), python3-dateutil, python3-docutils
+Depends3: python3-catkin-pkg-modules (>= 0.4.16), python3-dateutil, python3-docutils
 Conflicts: catkin, python3-catkin-pkg
 Conflicts3: catkin, python-catkin-pkg
 Copyright-File: LICENSE

Full worker log Full build log