[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1063107: openvdb: NMU diff for 64-bit time_t transition



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')
Architecture: amd64 (x86_64)

Kernel: Linux 6.5.0-14-generic (SMP w/12 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, 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: systemd (via /run/systemd/system)
diff -Nru openvdb-10.0.1/debian/changelog openvdb-10.0.1/debian/changelog
--- openvdb-10.0.1/debian/changelog	2023-05-04 21:14:05.000000000 +0000
+++ openvdb-10.0.1/debian/changelog	2024-03-01 19:17:49.000000000 +0000
@@ -1,3 +1,10 @@
+openvdb (10.0.1-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1063107
+
+ -- Steve Langasek <vorlon@debian.org>  Fri, 01 Mar 2024 19:17:49 +0000
+
 openvdb (10.0.1-2) unstable; urgency=medium
 
   * debian/control: Fix dependency of libopenvdb-ax-dev on shared library
diff -Nru openvdb-10.0.1/debian/control openvdb-10.0.1/debian/control
--- openvdb-10.0.1/debian/control	2023-05-04 21:13:36.000000000 +0000
+++ openvdb-10.0.1/debian/control	2024-03-01 19:17:49.000000000 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
 Uploaders: Mathieu Malaterre <malat@debian.org>
-Build-Depends: bison (>= 3.0),
+Build-Depends: dpkg-dev (>= 1.22.5), bison (>= 3.0),
                cmake (>= 3.18),
                debhelper (>= 13),
                dh-python,
@@ -43,7 +43,10 @@
 Standards-Version: 4.6.1
 X-Python3-Version: >= 3.7
 
-Package: libopenvdb10.0
+Package: libopenvdb10.0t64
+Provides: ${t64:Provides}
+Replaces: libopenvdb10.0
+Breaks: libopenvdb10.0 (<< ${source:Version})
 Multi-Arch: same
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -57,7 +60,10 @@
  .
  This package contains the libraries needed to run OpenVDB applications
 
-Package: libopenvdb-ax10.0
+Package: libopenvdb-ax10.0t64
+Provides: ${t64:Provides}
+Replaces: libopenvdb-ax10.0
+Breaks: libopenvdb-ax10.0 (<< ${source:Version})
 Multi-Arch: same
 Architecture: amd64 arm64 armel armhf i386 mips64el ppc64el s390x arc hurd-i386 ia64 kfreebsd-amd64 kfreebsd-i386 m68k powerpc ppc64 riscv64 sh4 sparc64 x32
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -76,7 +82,7 @@
 Section: libdevel
 Depends: libblosc-dev,
          libimath-dev,
-         libopenvdb10.0 (= ${binary:Version}),
+         libopenvdb10.0t64 (= ${binary:Version}),
          libtbb-dev,
          ${misc:Depends}
 Description: Sparse Volume Processing toolkit - dev
@@ -93,7 +99,7 @@
 Section: libdevel
 Depends: libblosc-dev,
          libimath-dev,
-         libopenvdb-ax10.0 (= ${binary:Version}),
+         libopenvdb-ax10.0t64 (= ${binary:Version}),
          libtbb-dev,
          ${misc:Depends}
 Description: Sparse Volume Processing toolkit - dev
@@ -110,7 +116,7 @@
 Section: libdevel
 Depends: libblosc-dev,
          libimath-dev,
-         libopenvdb10.0 (= ${binary:Version}),
+         libopenvdb10.0t64 (= ${binary:Version}),
          libtbb-dev,
          ${misc:Depends}
 Description: Sparse Volume Processing toolkit - NanoVDB - dev
diff -Nru openvdb-10.0.1/debian/control.in openvdb-10.0.1/debian/control.in
--- openvdb-10.0.1/debian/control.in	2023-05-04 21:12:44.000000000 +0000
+++ openvdb-10.0.1/debian/control.in	2024-03-01 11:47:18.000000000 +0000
@@ -43,7 +43,10 @@
 Standards-Version: 4.6.1
 X-Python3-Version: >= 3.7
 
-Package: libopenvdb10.0
+Package: libopenvdb10.0t64
+Provides: ${t64:Provides}
+Replaces: libopenvdb10.0
+Breaks: libopenvdb10.0 (<< ${source:Version})
 Multi-Arch: same
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -57,7 +60,10 @@
  .
  This package contains the libraries needed to run OpenVDB applications
 
-Package: libopenvdb-ax10.0
+Package: libopenvdb-ax10.0t64
+Provides: ${t64:Provides}
+Replaces: libopenvdb-ax10.0
+Breaks: libopenvdb-ax10.0 (<< ${source:Version})
 Multi-Arch: same
 Architecture: @AX_ARCHS@
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -76,7 +82,7 @@
 Section: libdevel
 Depends: libblosc-dev,
          libimath-dev,
-         libopenvdb10.0 (= ${binary:Version}),
+         libopenvdb10.0t64 (= ${binary:Version}),
          libtbb-dev,
          ${misc:Depends}
 Description: Sparse Volume Processing toolkit - dev
@@ -93,7 +99,7 @@
 Section: libdevel
 Depends: libblosc-dev,
          libimath-dev,
-         libopenvdb10.0 (= ${binary:Version}),
+         libopenvdb10.0t64 (= ${binary:Version}),
          libtbb-dev,
          ${misc:Depends}
 Description: Sparse Volume Processing toolkit - dev
@@ -110,7 +116,7 @@
 Section: libdevel
 Depends: libblosc-dev,
          libimath-dev,
-         libopenvdb10.0 (= ${binary:Version}),
+         libopenvdb10.0t64 (= ${binary:Version}),
          libtbb-dev,
          ${misc:Depends}
 Description: Sparse Volume Processing toolkit - NanoVDB - dev
diff -Nru openvdb-10.0.1/debian/libopenvdb-ax10.0t64.lintian-overrides openvdb-10.0.1/debian/libopenvdb-ax10.0t64.lintian-overrides
--- openvdb-10.0.1/debian/libopenvdb-ax10.0t64.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ openvdb-10.0.1/debian/libopenvdb-ax10.0t64.lintian-overrides	2024-03-01 11:47:18.000000000 +0000
@@ -0,0 +1 @@
+libopenvdb-ax10.0t64: package-name-doesnt-match-sonames libopenvdb-ax10.0
diff -Nru openvdb-10.0.1/debian/libopenvdb10.0t64.lintian-overrides openvdb-10.0.1/debian/libopenvdb10.0t64.lintian-overrides
--- openvdb-10.0.1/debian/libopenvdb10.0t64.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ openvdb-10.0.1/debian/libopenvdb10.0t64.lintian-overrides	2024-03-01 11:47:18.000000000 +0000
@@ -0,0 +1 @@
+libopenvdb10.0t64: package-name-doesnt-match-sonames libopenvdb10.0
diff -Nru openvdb-10.0.1/debian/rules openvdb-10.0.1/debian/rules
--- openvdb-10.0.1/debian/rules	2023-05-04 21:12:44.000000000 +0000
+++ openvdb-10.0.1/debian/rules	2024-03-01 19:08:39.000000000 +0000
@@ -164,8 +164,8 @@
 pkg_arun = libopenvdb-ax-tools
 pkg_nrun = libnanovdb-tools
 pkg_orun = libopenvdb-tools
-pkg_alib = libopenvdb-ax$(VER_SONAME)
-pkg_olib = libopenvdb$(VER_SONAME)
+pkg_alib = libopenvdb-ax$(VER_SONAME)t64
+pkg_olib = libopenvdb$(VER_SONAME)t64
 pkg_adev = libopenvdb-ax-dev
 pkg_ndev = libnanovdb-dev
 pkg_odev = libopenvdb-dev

Reply to: