Hello,
> which is not yet released as 2.0.5, and which you can include as a
> patch if you want to go on with the ros-geometry2 transition.
>
Since you are the maintainer, I'm uploading in deferred/1 your patch, refreshed
in some parts to apply to
the current 2.0.4 (and removing the rules part, since we can't patch with quilt
debian directory)
I'm attaching the diff that will go in unstable in ~24h
I didn't use NMU as notation, but a "team upload" since the patch comes from
you :)
let me know if this is good, so I can speed it up and let it go in sid today!
G.
diff -Nru mrpt-2.0.4/debian/changelog mrpt-2.0.4/debian/changelog
--- mrpt-2.0.4/debian/changelog 2020-06-20 17:24:00.000000000 +0200
+++ mrpt-2.0.4/debian/changelog 2020-07-17 08:14:20.000000000 +0200
@@ -1,3 +1,11 @@
+mrpt (1:2.0.4-2) unstable; urgency=medium
+
+ * Team upload
+ * debian/patches/e84511500276d38d3eeff0b220e8d45e0d74fc93.patch:
+ - cherry-pick upstream "fix" for a failing test (Closes: #964044).
+
+ -- Gianfranco Costamagna <locutusofb...@debian.org> Fri, 17 Jul 2020
08:14:20 +0200
+
mrpt (1:2.0.4-1) unstable; urgency=medium
* New version of upstream sources.
diff -Nru
mrpt-2.0.4/debian/patches/e84511500276d38d3eeff0b220e8d45e0d74fc93.patch
mrpt-2.0.4/debian/patches/e84511500276d38d3eeff0b220e8d45e0d74fc93.patch
--- mrpt-2.0.4/debian/patches/e84511500276d38d3eeff0b220e8d45e0d74fc93.patch
1970-01-01 01:00:00.000000000 +0100
+++ mrpt-2.0.4/debian/patches/e84511500276d38d3eeff0b220e8d45e0d74fc93.patch
2020-07-17 08:14:20.000000000 +0200
@@ -0,0 +1,55 @@
+From e84511500276d38d3eeff0b220e8d45e0d74fc93 Mon Sep 17 00:00:00 2001
+From: Jose Luis Blanco Claraco <joseluisblan...@gmail.com>
+Date: Thu, 2 Jul 2020 23:53:34 +0200
+Subject: [PATCH] give up with the problematic unit test if building a Debian
+ package
+
+---
+ doc/doxygen-pages/changeLog_doc.h | 4 ++++
+ libs/apps/src/RawlogGrabberApp_unittest.cpp | 10 ++++++++++
+ packaging/debian/rules | 2 ++
+ 3 files changed, 16 insertions(+)
+
+Index: mrpt-2.0.4/doc/doxygen-pages/changeLog_doc.h
+===================================================================
+--- mrpt-2.0.4.orig/doc/doxygen-pages/changeLog_doc.h
++++ mrpt-2.0.4/doc/doxygen-pages/changeLog_doc.h
+@@ -47,6 +47,10 @@
+ - Fix: mrpt::maps::CPointsMapXYZI::setFromPCLPointCloudXYZI() was using a
non-existing method.
+ - Fix: mrpt::nav::PlannerSimple2D did not honored maximum path length
correctly.
+ - Fix race condition in CGenericCamera_AVI unit test.
++- Deprecations:
++ - mrpt::system::TParameters is now deprecated.
++- BUG FIXES:
++ - Avoid crash in camera-calib app when clicking "Close" while capturing a
live video.
+
+ ------
+ # Version 2.0.3: Released May 13, 2020
+Index: mrpt-2.0.4/libs/apps/src/RawlogGrabberApp_unittest.cpp
+===================================================================
+--- mrpt-2.0.4.orig/libs/apps/src/RawlogGrabberApp_unittest.cpp
++++ mrpt-2.0.4/libs/apps/src/RawlogGrabberApp_unittest.cpp
+@@ -13,6 +13,7 @@
+ #include <mrpt/core/lock_helper.h>
+ #include <mrpt/system/filesystem.h>
+ #include <test_mrpt_common.h>
++#include <cstdlib>
+ #include <thread>
+
+ #if MRPT_HAS_FFMPEG && MRPT_HAS_OPENCV
+@@ -21,6 +22,15 @@
+ TEST(RawlogGrabberApp, DISABLED_CGenericCamera_AVI)
+ #endif
+ {
++ // This particular unit test is REALLY problematic for some reason on
build
++ // farms. It's safer to just disable it in this case:
++ if (::getenv("DEB_BUILD_ARCH") || ::getenv("DEB_BUILD_MAINT_OPTIONS"))
++ {
++ std::cerr << "Warning: Disabling test since we are building a
Debian "
++ "package.\n";
++ return;
++ }
++
+ using namespace std::string_literals;
+
+ const std::string ini_fil =
diff -Nru mrpt-2.0.4/debian/patches/series mrpt-2.0.4/debian/patches/series
--- mrpt-2.0.4/debian/patches/series 2020-06-20 17:24:00.000000000 +0200
+++ mrpt-2.0.4/debian/patches/series 2020-07-17 08:14:20.000000000 +0200
@@ -1 +1,2 @@
fix-inconsistent-appstream-metadata-license.diff
+e84511500276d38d3eeff0b220e8d45e0d74fc93.patch
diff -Nru mrpt-2.0.4/debian/rules mrpt-2.0.4/debian/rules
--- mrpt-2.0.4/debian/rules 2020-06-20 17:24:00.000000000 +0200
+++ mrpt-2.0.4/debian/rules 2020-07-17 08:14:20.000000000 +0200
@@ -68,6 +68,8 @@
# Show CPU flags, to help debugging unit test crashes related to
# illegal instructions, etc.
cat /proc/cpuinfo
+ # Show env vars for debugging:
+ env
# Autoconfigure step:
dh_auto_configure -- $(CMAKE_FLAGS)
