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

Bug#1063098: openni: NMU diff for 64-bit time_t transition



Source: openni
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 openni-1.5.4.0+dfsg/debian/changelog openni-1.5.4.0+dfsg/debian/changelog
--- openni-1.5.4.0+dfsg/debian/changelog	2023-11-15 10:05:03.000000000 +0000
+++ openni-1.5.4.0+dfsg/debian/changelog	2024-02-29 12:46:22.000000000 +0000
@@ -1,3 +1,10 @@
+openni (1.5.4.0+dfsg-7.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1063098
+
+ -- Benjamin Drung <bdrung@debian.org>  Thu, 29 Feb 2024 12:46:22 +0000
+
 openni (1.5.4.0+dfsg-7) unstable; urgency=medium
 
   * Add loongarch64 support (Closes: #1050419)
diff -Nru openni-1.5.4.0+dfsg/debian/control openni-1.5.4.0+dfsg/debian/control
--- openni-1.5.4.0+dfsg/debian/control	2023-11-15 10:04:47.000000000 +0000
+++ openni-1.5.4.0+dfsg/debian/control	2024-02-29 12:46:22.000000000 +0000
@@ -4,7 +4,7 @@
 Maintainer: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
 Uploaders: Nobuhiro Iwamatsu <iwamatsu@debian.org>,
            Jochen Sprickerhof <jspricke@debian.org>
-Build-Depends: debhelper-compat (= 13),
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13),
                freeglut3-dev,
                libusb-1.0-0-dev,
                python3,
@@ -18,7 +18,10 @@
 Vcs-Git: https://salsa.debian.org/multimedia-team/openni.git
 Vcs-Browser: https://salsa.debian.org/multimedia-team/openni
 
-Package: libopenni0
+Package: libopenni0t64
+Provides: ${t64:Provides}
+Replaces: libopenni0
+Breaks: libopenni0 (<< ${source:Version})
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
@@ -36,7 +39,7 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libopenni0 (= ${binary:Version})
+         libopenni0t64 (= ${binary:Version})
 Description: Java framework for sensor-based 'Natural Interaction'
  OpenNI is a framework for getting data to support 'Natural Interaction',
  i.e. skeleton tracking, gesture tracking, and similar ways of getting data
@@ -68,7 +71,7 @@
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends},
-         libopenni0 (= ${binary:Version})
+         libopenni0t64 (= ${binary:Version})
 Suggests: openni-doc
 Description: headers for OpenNI 'Natural Interaction' frameworks
  OpenNI is a framework for getting data to support 'Natural Interaction',
diff -Nru openni-1.5.4.0+dfsg/debian/libopenni0.dirs openni-1.5.4.0+dfsg/debian/libopenni0.dirs
--- openni-1.5.4.0+dfsg/debian/libopenni0.dirs	2018-10-20 14:13:06.000000000 +0000
+++ openni-1.5.4.0+dfsg/debian/libopenni0.dirs	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-/var/lib/ni
diff -Nru openni-1.5.4.0+dfsg/debian/libopenni0.install openni-1.5.4.0+dfsg/debian/libopenni0.install
--- openni-1.5.4.0+dfsg/debian/libopenni0.install	2018-10-20 14:11:06.000000000 +0000
+++ openni-1.5.4.0+dfsg/debian/libopenni0.install	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-Platform/Linux/Bin/*-Release/lib*.so.* usr/lib/
-Data/SamplesConfig.xml etc/openni/
diff -Nru openni-1.5.4.0+dfsg/debian/libopenni0.postinst openni-1.5.4.0+dfsg/debian/libopenni0.postinst
--- openni-1.5.4.0+dfsg/debian/libopenni0.postinst	2019-09-14 07:20:17.000000000 +0000
+++ openni-1.5.4.0+dfsg/debian/libopenni0.postinst	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
-  configure)
-    # Only register upon fresh install
-    if [ -z "$2" ]; then
-      # manually generate modules.xml, so we don't have a cyclic dependency to openni-utils
-      cat > /var/lib/ni/modules.xml <<EOF
-<Modules>
-    <Module path="/usr/lib/libnimMockNodes.so.0" configDir="/etc/openni" />
-    <Module path="/usr/lib/libnimCodecs.so.0" configDir="/etc/openni" />
-    <Module path="/usr/lib/libnimRecorder.so.0" configDir="/etc/openni" />
-</Modules>
-EOF
-    fi
-    ;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff -Nru openni-1.5.4.0+dfsg/debian/libopenni0.postrm openni-1.5.4.0+dfsg/debian/libopenni0.postrm
--- openni-1.5.4.0+dfsg/debian/libopenni0.postrm	2019-09-14 07:20:17.000000000 +0000
+++ openni-1.5.4.0+dfsg/debian/libopenni0.postrm	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
-  purge)
-    rm -f /var/lib/ni/modules.xml 2>/dev/null
-    rm -f /var/lib/ni/licenses.xml 2>/dev/null
-    ;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff -Nru openni-1.5.4.0+dfsg/debian/libopenni0t64.dirs openni-1.5.4.0+dfsg/debian/libopenni0t64.dirs
--- openni-1.5.4.0+dfsg/debian/libopenni0t64.dirs	1970-01-01 00:00:00.000000000 +0000
+++ openni-1.5.4.0+dfsg/debian/libopenni0t64.dirs	2018-10-20 14:13:06.000000000 +0000
@@ -0,0 +1 @@
+/var/lib/ni
diff -Nru openni-1.5.4.0+dfsg/debian/libopenni0t64.install openni-1.5.4.0+dfsg/debian/libopenni0t64.install
--- openni-1.5.4.0+dfsg/debian/libopenni0t64.install	1970-01-01 00:00:00.000000000 +0000
+++ openni-1.5.4.0+dfsg/debian/libopenni0t64.install	2018-10-20 14:11:06.000000000 +0000
@@ -0,0 +1,2 @@
+Platform/Linux/Bin/*-Release/lib*.so.* usr/lib/
+Data/SamplesConfig.xml etc/openni/
diff -Nru openni-1.5.4.0+dfsg/debian/libopenni0t64.lintian-overrides openni-1.5.4.0+dfsg/debian/libopenni0t64.lintian-overrides
--- openni-1.5.4.0+dfsg/debian/libopenni0t64.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ openni-1.5.4.0+dfsg/debian/libopenni0t64.lintian-overrides	2024-02-29 12:46:12.000000000 +0000
@@ -0,0 +1 @@
+libopenni0t64: package-name-doesnt-match-sonames libopenni0
diff -Nru openni-1.5.4.0+dfsg/debian/libopenni0t64.postinst openni-1.5.4.0+dfsg/debian/libopenni0t64.postinst
--- openni-1.5.4.0+dfsg/debian/libopenni0t64.postinst	1970-01-01 00:00:00.000000000 +0000
+++ openni-1.5.4.0+dfsg/debian/libopenni0t64.postinst	2019-09-14 07:20:17.000000000 +0000
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+  configure)
+    # Only register upon fresh install
+    if [ -z "$2" ]; then
+      # manually generate modules.xml, so we don't have a cyclic dependency to openni-utils
+      cat > /var/lib/ni/modules.xml <<EOF
+<Modules>
+    <Module path="/usr/lib/libnimMockNodes.so.0" configDir="/etc/openni" />
+    <Module path="/usr/lib/libnimCodecs.so.0" configDir="/etc/openni" />
+    <Module path="/usr/lib/libnimRecorder.so.0" configDir="/etc/openni" />
+</Modules>
+EOF
+    fi
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff -Nru openni-1.5.4.0+dfsg/debian/libopenni0t64.postrm openni-1.5.4.0+dfsg/debian/libopenni0t64.postrm
--- openni-1.5.4.0+dfsg/debian/libopenni0t64.postrm	1970-01-01 00:00:00.000000000 +0000
+++ openni-1.5.4.0+dfsg/debian/libopenni0t64.postrm	2019-09-14 07:20:17.000000000 +0000
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+  purge)
+    rm -f /var/lib/ni/modules.xml 2>/dev/null
+    rm -f /var/lib/ni/licenses.xml 2>/dev/null
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0

Reply to: