Bug#985750: unblock: gazebo/11.1.0+dfsg-6
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package gazebo
[ Reason ]
The version in testing was build with an old version of protobuf so
software using libgazebo-dev and the current protobuf version in testing
fail to build, like gazebo_ros (not in Debian). The fix is to rebuild
against the current protobuf API version and to depend on that to make
sure it is rebuild automatically in future.
The gazebo package only builds on amd64 and i386 and was blocked from
migration due to britney not being smarter. Discussing this in
#debian-devel, elbrus proposed to mark the only autopkgtest as
superficial as it not really testing enough of the package. So the diff
includes this as well.
[ Impact ]
The protobuf headers in libgazebo-dev would not be usable.
[ Tests ]
There are no automated tests, compiling gazebo_ros manually works after
the rebuild.
[ Risks ]
There is no risk, as the libgazebo-dev already depends on
libprotobuf-dev which provides the protobufapi package.
[ Checklist ]
[X] all changes are documented in the d/changelog
[X] I reviewed all changes and I approve them
[X] attach debdiff against the package in testing
unblock gazebo/11.1.0+dfsg-6
diff --git a/debian/changelog b/debian/changelog
index 6ee8a113..7e75fc8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+gazebo (11.1.0+dfsg-6) unstable; urgency=medium
+
+ * Team upload.
+ * Mark test superficial
+
+ -- Jochen Sprickerhof <jspricke@debian.org> Mon, 22 Mar 2021 22:21:38 +0100
+
+gazebo (11.1.0+dfsg-5) unstable; urgency=medium
+
+ * Team upload.
+ * libgazebo-dev Depends on Protobuf API version (Closes: #985660)
+
+ -- Jochen Sprickerhof <jspricke@debian.org> Sun, 21 Mar 2021 22:21:29 +0100
+
gazebo (11.1.0+dfsg-4) unstable; urgency=medium
* Team upload.
diff --git a/debian/control b/debian/control
index 161cefd4..5ac5de9b 100644
--- a/debian/control
+++ b/debian/control
@@ -172,7 +172,8 @@ Depends: libtbb-dev,
libgazebo11 (= ${binary:Version}),
gazebo-common (= ${source:Version}),
gazebo-plugin-base (= ${binary:Version}),
- ${misc:Depends}
+ ${misc:Depends},
+ ${protobuf:API},
Breaks: libgazebo7-dev, libgazebo9-dev (<< 11.0.0+dfsg-1~)
Replaces: libgazebo7-dev, libgazebo9-dev (<< 11.0.0+dfsg-1~)
Description: Open Source Robotics Simulator - Development Files
diff --git a/debian/rules b/debian/rules
index c5b852a6..7268f462 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,11 @@
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+# see #985660
+# extract the protobuf API version package and add it to d/control
+# Needed because protobuf generated headers are only compatible with that version
+protobufapi := $(shell dpkg-query -W -f '$${Provides}' libprotobuf-dev | grep -o 'protobuf-api-[^ ]*')
+
override_dh_auto_configure:
dh_auto_configure -- \
-DUSE_HOST_CFLAGS:BOOL=False \
@@ -18,6 +23,9 @@ override_dh_install:
# Remove old script
rm -f debian/gazebo/usr/bin/gzprop
+execute_before_dh_gencontrol:
+ echo 'protobuf:API=$(protobufapi)' >> debian/libgazebo-dev.substvars
+
# Tests needs an X server running and GPU acceleration
override_dh_auto_test:
diff --git a/debian/tests/control b/debian/tests/control
index 3a872e84..9de62eb0 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,2 +1,3 @@
Tests: build
Depends: @, pkg-config, build-essential
+Restrictions: superficial
Reply to: