Source: octomap
Dear maintainer,
Please find attached a final version of this patch for the time_t
transition. This patch is being uploaded to unstable.
Note that this adds a versioned build-dependency on dpkg-dev, to guard
against accidental backports with a wrong ABI.
Thanks!
-- System Information:
Debian Release: trixie/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 6.5.0-21-generic (SMP w/16 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE,
TAINT_UNSIGNED_MODULE
Locale: LANG=C, LC_CTYPE=C.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: unable to detect
diff -Nru octomap-1.9.7+dfsg/debian/changelog
octomap-1.9.7+dfsg/debian/changelog
--- octomap-1.9.7+dfsg/debian/changelog 2021-08-26 18:30:54.000000000 +0000
+++ octomap-1.9.7+dfsg/debian/changelog 2024-02-29 01:43:28.000000000 +0000
@@ -1,3 +1,10 @@
+octomap (1.9.7+dfsg-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition. Closes: #1063227
+
+ -- Benjamin Drung <bdr...@debian.org> Thu, 29 Feb 2024 01:43:28 +0000
+
octomap (1.9.7+dfsg-3) unstable; urgency=medium
* Move to unstable
diff -Nru octomap-1.9.7+dfsg/debian/control octomap-1.9.7+dfsg/debian/control
--- octomap-1.9.7+dfsg/debian/control 2021-04-30 16:07:28.000000000 +0000
+++ octomap-1.9.7+dfsg/debian/control 2024-02-29 01:43:28.000000000 +0000
@@ -5,14 +5,17 @@
Uploaders: Leopold Palomo-Avellaneda <l...@alaxarxa.net>,
Jose Luis Rivero <jriv...@osrfoundation.org>,
Juhani Numminen <juhaninummin...@gmail.com>
-Build-Depends: debhelper-compat (= 13), cmake, qtbase5-dev,
libqglviewer-dev-qt5
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13), cmake,
qtbase5-dev, libqglviewer-dev-qt5
Standards-Version: 4.5.1
Rules-Requires-Root: no
Homepage: https://octomap.github.io
Vcs-Browser: https://salsa.debian.org/science-team/octomap
Vcs-Git: https://salsa.debian.org/science-team/octomap.git
-Package: liboctomap1.9
+Package: liboctomap1.9t64
+Provides: ${t64:Provides}
+Replaces: liboctomap1.9
+Breaks: liboctomap1.9 (<< ${source:Version})
Architecture: any
Multi-Arch: same
Section: libs
@@ -40,7 +43,7 @@
Architecture: any
Multi-Arch: same
Section: libdevel
-Depends: liboctomap1.9 (= ${binary:Version}),
+Depends: liboctomap1.9t64 (= ${binary:Version}),
${misc:Depends}
Conflicts: liboctomap1.8
Replaces: liboctomap1.8
@@ -51,7 +54,10 @@
to meet the following requirements: Full 3D model, Updatable, Flexible and
Compact. This package contains the development stuff.
-Package: libdynamicedt3d1.9
+Package: libdynamicedt3d1.9t64
+Provides: ${t64:Provides}
+Replaces: libdynamicedt3d1.9
+Breaks: libdynamicedt3d1.9 (<< ${source:Version})
Architecture: any
Multi-Arch: same
Section: libs
@@ -66,7 +72,7 @@
Architecture: any
Multi-Arch: same
Section: libdevel
-Depends: libdynamicedt3d1.9 (= ${binary:Version}), liboctomap-dev,
+Depends: libdynamicedt3d1.9t64 (= ${binary:Version}), liboctomap-dev,
${misc:Depends}
Conflicts: libdynamicedt3d1.8
Replaces: libdynamicedt3d1.8
@@ -77,7 +83,10 @@
to propagate changes to the EDT. This package contains the development
files.
-Package: liboctovis1.9
+Package: liboctovis1.9t64
+Provides: ${t64:Provides}
+Replaces: liboctovis1.9
+Breaks: liboctovis1.9 (<< ${source:Version})
Architecture: any
Multi-Arch: same
Section: libs
@@ -91,7 +100,7 @@
Architecture: any
Multi-Arch: same
Section: libdevel
-Depends: liboctovis1.9 (= ${binary:Version}), liboctomap-dev,
+Depends: liboctovis1.9t64 (= ${binary:Version}), liboctomap-dev,
${misc:Depends}
Conflicts: liboctomap1.8
Replaces: liboctomap1.8
@@ -102,7 +111,7 @@
Package: octovis
Architecture: any
-Depends: liboctovis1.9 (= ${binary:Version}),
+Depends: liboctovis1.9t64 (= ${binary:Version}),
${misc:Depends}, ${shlibs:Depends},
Conflicts: liboctomap1.8
Replaces: liboctomap1.8
diff -Nru octomap-1.9.7+dfsg/debian/libdynamicedt3d1.9.install
octomap-1.9.7+dfsg/debian/libdynamicedt3d1.9.install
--- octomap-1.9.7+dfsg/debian/libdynamicedt3d1.9.install 2021-04-30
16:07:28.000000000 +0000
+++ octomap-1.9.7+dfsg/debian/libdynamicedt3d1.9.install 1970-01-01
00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/lib/*/libdynamicedt3d.so.*
diff -Nru octomap-1.9.7+dfsg/debian/libdynamicedt3d1.9t64.install
octomap-1.9.7+dfsg/debian/libdynamicedt3d1.9t64.install
--- octomap-1.9.7+dfsg/debian/libdynamicedt3d1.9t64.install 1970-01-01
00:00:00.000000000 +0000
+++ octomap-1.9.7+dfsg/debian/libdynamicedt3d1.9t64.install 2021-04-30
16:07:28.000000000 +0000
@@ -0,0 +1 @@
+usr/lib/*/libdynamicedt3d.so.*
diff -Nru octomap-1.9.7+dfsg/debian/libdynamicedt3d1.9t64.lintian-overrides
octomap-1.9.7+dfsg/debian/libdynamicedt3d1.9t64.lintian-overrides
--- octomap-1.9.7+dfsg/debian/libdynamicedt3d1.9t64.lintian-overrides
1970-01-01 00:00:00.000000000 +0000
+++ octomap-1.9.7+dfsg/debian/libdynamicedt3d1.9t64.lintian-overrides
2024-02-29 01:43:20.000000000 +0000
@@ -0,0 +1 @@
+libdynamicedt3d1.9t64: package-name-doesnt-match-sonames libdynamicedt3d1.9
diff -Nru octomap-1.9.7+dfsg/debian/liboctomap1.9.docs
octomap-1.9.7+dfsg/debian/liboctomap1.9.docs
--- octomap-1.9.7+dfsg/debian/liboctomap1.9.docs 2021-04-30
16:07:28.000000000 +0000
+++ octomap-1.9.7+dfsg/debian/liboctomap1.9.docs 1970-01-01
00:00:00.000000000 +0000
@@ -1 +0,0 @@
-octomap/CHANGELOG.txt
diff -Nru octomap-1.9.7+dfsg/debian/liboctomap1.9.install
octomap-1.9.7+dfsg/debian/liboctomap1.9.install
--- octomap-1.9.7+dfsg/debian/liboctomap1.9.install 2021-04-30
16:07:28.000000000 +0000
+++ octomap-1.9.7+dfsg/debian/liboctomap1.9.install 1970-01-01
00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-usr/lib/*/liboctomap.so.*
-usr/lib/*/liboctomath.so.*
diff -Nru octomap-1.9.7+dfsg/debian/liboctomap1.9t64.docs
octomap-1.9.7+dfsg/debian/liboctomap1.9t64.docs
--- octomap-1.9.7+dfsg/debian/liboctomap1.9t64.docs 1970-01-01
00:00:00.000000000 +0000
+++ octomap-1.9.7+dfsg/debian/liboctomap1.9t64.docs 2021-04-30
16:07:28.000000000 +0000
@@ -0,0 +1 @@
+octomap/CHANGELOG.txt
diff -Nru octomap-1.9.7+dfsg/debian/liboctomap1.9t64.install
octomap-1.9.7+dfsg/debian/liboctomap1.9t64.install
--- octomap-1.9.7+dfsg/debian/liboctomap1.9t64.install 1970-01-01
00:00:00.000000000 +0000
+++ octomap-1.9.7+dfsg/debian/liboctomap1.9t64.install 2021-04-30
16:07:28.000000000 +0000
@@ -0,0 +1,2 @@
+usr/lib/*/liboctomap.so.*
+usr/lib/*/liboctomath.so.*
diff -Nru octomap-1.9.7+dfsg/debian/liboctomap1.9t64.lintian-overrides
octomap-1.9.7+dfsg/debian/liboctomap1.9t64.lintian-overrides
--- octomap-1.9.7+dfsg/debian/liboctomap1.9t64.lintian-overrides
1970-01-01 00:00:00.000000000 +0000
+++ octomap-1.9.7+dfsg/debian/liboctomap1.9t64.lintian-overrides
2024-02-29 01:43:20.000000000 +0000
@@ -0,0 +1 @@
+liboctomap1.9t64: package-name-doesnt-match-sonames liboctomap1.9
diff -Nru octomap-1.9.7+dfsg/debian/liboctovis1.9.install
octomap-1.9.7+dfsg/debian/liboctovis1.9.install
--- octomap-1.9.7+dfsg/debian/liboctovis1.9.install 2021-04-30
16:07:28.000000000 +0000
+++ octomap-1.9.7+dfsg/debian/liboctovis1.9.install 1970-01-01
00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/lib/*/liboctovis.so.*
diff -Nru octomap-1.9.7+dfsg/debian/liboctovis1.9.maintscript
octomap-1.9.7+dfsg/debian/liboctovis1.9.maintscript
--- octomap-1.9.7+dfsg/debian/liboctovis1.9.maintscript 2021-04-30
16:07:28.000000000 +0000
+++ octomap-1.9.7+dfsg/debian/liboctovis1.9.maintscript 1970-01-01
00:00:00.000000000 +0000
@@ -1 +0,0 @@
-symlink_to_dir /usr/share/doc/liboctovis1.9 /usr/share/doc/liboctomap1.9
1.9.3+dfsg-1~ liboctovis1.9
diff -Nru octomap-1.9.7+dfsg/debian/liboctovis1.9t64.install
octomap-1.9.7+dfsg/debian/liboctovis1.9t64.install
--- octomap-1.9.7+dfsg/debian/liboctovis1.9t64.install 1970-01-01
00:00:00.000000000 +0000
+++ octomap-1.9.7+dfsg/debian/liboctovis1.9t64.install 2021-04-30
16:07:28.000000000 +0000
@@ -0,0 +1 @@
+usr/lib/*/liboctovis.so.*
diff -Nru octomap-1.9.7+dfsg/debian/liboctovis1.9t64.lintian-overrides
octomap-1.9.7+dfsg/debian/liboctovis1.9t64.lintian-overrides
--- octomap-1.9.7+dfsg/debian/liboctovis1.9t64.lintian-overrides
1970-01-01 00:00:00.000000000 +0000
+++ octomap-1.9.7+dfsg/debian/liboctovis1.9t64.lintian-overrides
2024-02-29 01:43:20.000000000 +0000
@@ -0,0 +1 @@
+liboctovis1.9t64: package-name-doesnt-match-sonames liboctovis1.9
diff -Nru octomap-1.9.7+dfsg/debian/liboctovis1.9t64.maintscript
octomap-1.9.7+dfsg/debian/liboctovis1.9t64.maintscript
--- octomap-1.9.7+dfsg/debian/liboctovis1.9t64.maintscript 1970-01-01
00:00:00.000000000 +0000
+++ octomap-1.9.7+dfsg/debian/liboctovis1.9t64.maintscript 2021-04-30
16:07:28.000000000 +0000
@@ -0,0 +1 @@
+symlink_to_dir /usr/share/doc/liboctovis1.9 /usr/share/doc/liboctomap1.9
1.9.3+dfsg-1~ liboctovis1.9
