Bug#1063227: octomap: NMU diff for 64-bit time_t transition

2024-02-28 Thread Benjamin Drung
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.0 +
+++ octomap-1.9.7+dfsg/debian/changelog 2024-02-29 01:43:28.0 +
@@ -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   Thu, 29 Feb 2024 01:43:28 +
+
 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.0 +
+++ octomap-1.9.7+dfsg/debian/control   2024-02-29 01:43:28.0 +
@@ -5,14 +5,17 @@
 Uploaders: Leopold Palomo-Avellaneda ,
Jose Luis Rivero ,
Juhani Numminen 
-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.install2021-04-30 
16:07:28.0 +
+++ octomap-1.9.7+dfsg/debian/libdynamicedt3d1.9.install1970-01-01 
00:00:00.0 +
@@ -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.0 +
+++ octomap-1.9.7+dfsg/debian/libdynamicedt3d1.9t64.install 2021-04-30 
16:07:28.0 +
@@ -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.0 +
+++ 

Bug#1063227: octomap: NMU diff for 64-bit time_t transition

2024-02-05 Thread Graham Inggs
Source: octomap
Version: 1.9.7+dfsg-3
Severity: serious
Tags: patch pending sid trixie
Justification: library ABI skew on upgrade
User: debian-...@lists.debian.org
Usertags: time-t

NOTICE: these changes must not be uploaded to unstable yet!

Dear maintainer,

As part of the 64-bit time_t transition required to support 32-bit
architectures in 2038 and beyond
(https://wiki.debian.org/ReleaseGoals/64bit-time), we have identified
octomap as a source package shipping runtime libraries whose ABI
either is affected by the change in size of time_t, or could not be
analyzed via abi-compliance-checker (and therefore to be on the safe
side we assume is affected).

To ensure that inconsistent combinations of libraries with their
reverse-dependencies are never installed together, it is necessary to
have a library transition, which is most easily done by renaming the
runtime library package.

Since turning on 64-bit time_t is being handled centrally through a change
to the default dpkg-buildflags (https://bugs.debian.org/1037136), it is
important that libraries affected by this ABI change all be uploaded close
together in time.  Therefore I have prepared a 0-day NMU for octomap
which will initially be uploaded to experimental if possible, then to
unstable after packages have cleared binary NEW.

Please find the patch for this NMU attached.

If you have any concerns about this patch, please reach out ASAP.  Although
this package will be uploaded to experimental immediately, there will be a
period of several days before we begin uploads to unstable; so if information
becomes available that your package should not be included in the transition,
there is time for us to amend the planned uploads.



-- System Information:
Debian Release: trixie/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 6.5.0-15-generic (SMP w/8 CPU threads; PREEMPT)
Kernel taint flags: TAINT_OOT_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.0 +
+++ octomap-1.9.7+dfsg/debian/changelog 2024-02-05 18:45:29.0 +
@@ -1,3 +1,10 @@
+octomap (1.9.7+dfsg-3.1) experimental; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.
+
+ -- Graham Inggs   Mon, 05 Feb 2024 18:45:29 +
+
 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.0 +
+++ octomap-1.9.7+dfsg/debian/control   2024-02-05 18:45:29.0 +
@@ -12,7 +12,10 @@
 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