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-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 armnn-23.08/debian/changelog armnn-23.08/debian/changelog --- armnn-23.08/debian/changelog 2024-01-13 11:34:44.000000000 +0000 +++ armnn-23.08/debian/changelog 2024-02-28 01:37:30.000000000 +0000 @@ -1,3 +1,10 @@ +armnn (23.08-4.1) unstable; urgency=medium + + * Non-maintainer upload. + * Rename libraries for 64-bit time_t transition. Closes: #1061918 + + -- Steve Langasek <[email protected]> Wed, 28 Feb 2024 01:37:30 +0000 + armnn (23.08-4) unstable; urgency=medium [ Helmut Grohne ] diff -Nru armnn-23.08/debian/control armnn-23.08/debian/control --- armnn-23.08/debian/control 2024-01-13 11:34:44.000000000 +0000 +++ armnn-23.08/debian/control 2024-02-28 01:37:30.000000000 +0000 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Francis Murtagh <[email protected]> Uploaders: Wookey <[email protected]>, Emanuele Rocca <[email protected]> -Build-Depends: libboost-test-dev (>= 1.64), +Build-Depends: dpkg-dev (>= 1.22.5), libboost-test-dev (>= 1.64), libboost-system-dev (>= 1.64), libboost-filesystem-dev (>= 1.64), libboost-log-dev (>= 1.64), libboost-program-options-dev (>= 1.64), cmake, debhelper-compat (= 12), valgrind, libflatbuffers-dev, @@ -15,11 +15,14 @@ Vcs-Git: https://salsa.debian.org/deeplearning-team/armnn.git Vcs-Browser: https://salsa.debian.org/deeplearning-team/armnn -Package: libarmnn33 +Package: libarmnn33t64 +Provides: ${t64:Provides} +Replaces: libarmnn33 +Breaks: libarmnn33 (<< ${source:Version}) Architecture: any Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends} -Suggests: libarmnntfliteparser24 (= ${binary:Version}), +Suggests: libarmnntfliteparser24t64 (= ${binary:Version}), python3-pyarmnn (= ${binary:Version}) Description: Inference engine for CPUs, GPUs and NPUs - shared library Arm NN is a set of tools that enables machine learning workloads on @@ -40,7 +43,7 @@ Package: libarmnn-dev Architecture: any Multi-Arch: same -Depends: libarmnn33 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Depends: libarmnn33t64 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: Inference engine for CPUs, GPUs and NPUs - header files Arm NN is a set of tools that enables machine learning workloads on any hardware. It provides a bridge between existing neural network @@ -57,10 +60,13 @@ . This is the development package containing header files. -Package: libarmnntfliteparser24 +Package: libarmnntfliteparser24t64 +Provides: ${t64:Provides} +Replaces: libarmnntfliteparser24 +Breaks: libarmnntfliteparser24 (<< ${source:Version}) Architecture: any Multi-Arch: same -Depends: libarmnn33 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Depends: libarmnn33t64 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: Arm NN TensorFlow Lite parser library Arm NN is a set of tools that enables machine learning workloads on any hardware. It provides a bridge between existing neural network @@ -82,7 +88,7 @@ Architecture: any Multi-Arch: same Depends: libarmnn-dev (= ${binary:Version}), - libarmnntfliteparser24 (= ${binary:Version}), + libarmnntfliteparser24t64 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: Arm NN TensorFlow Lite parser library - header files @@ -103,8 +109,8 @@ Package: python3-pyarmnn Architecture: any -Depends: libarmnn33 (= ${binary:Version}), - libarmnntfliteparser24 (= ${binary:Version}), +Depends: libarmnn33t64 (= ${binary:Version}), + libarmnntfliteparser24t64 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends} @@ -119,7 +125,7 @@ Package: libarmnn-cpuacc-backend33 Architecture: arm64 Multi-Arch: same -Depends: libarmnn33 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Depends: libarmnn33t64 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: Arm NN dynamically loadable Neon backend Arm NN is a set of tools that enables machine learning workloads on any hardware. It provides a bridge between existing neural network @@ -136,10 +142,13 @@ . This is the dynamically loadable Neon backend package. -Package: libarmnnaclcommon33 +Package: libarmnnaclcommon33t64 +Provides: ${t64:Provides} +Replaces: libarmnnaclcommon33 +Breaks: libarmnnaclcommon33 (<< ${source:Version}) Architecture: armhf arm64 Multi-Arch: same -Depends: libarmnn33 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Depends: libarmnn33t64 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: Arm NN shared library for Arm Compute Library backends Arm NN is a set of tools that enables machine learning workloads on any hardware. It provides a bridge between existing neural network @@ -159,8 +168,8 @@ Package: libarmnn-cpuref-backend33 Architecture: any Multi-Arch: same -Depends: libarmnn33 (= ${binary:Version}), - libarmnnaclcommon33 (= ${binary:Version}) [arm64 armhf], +Depends: libarmnn33t64 (= ${binary:Version}), + libarmnnaclcommon33t64 (= ${binary:Version}) [arm64 armhf], ${shlibs:Depends}, ${misc:Depends} Description: Arm NN dynamically loadable Reference backend @@ -182,8 +191,8 @@ Package: libarmnn-gpuacc-backend33 Architecture: armhf arm64 Multi-Arch: same -Depends: libarmnn33 (= ${binary:Version}), - libarmnnaclcommon33 (= ${binary:Version}) [arm64 armhf], +Depends: libarmnn33t64 (= ${binary:Version}), + libarmnnaclcommon33t64 (= ${binary:Version}) [arm64 armhf], ${shlibs:Depends}, ${misc:Depends} Description: Arm NN dynamically loadable CL backend @@ -205,9 +214,9 @@ Package: armnn-latest-cpu Architecture: arm64 Multi-Arch: same -Depends: libarmnn33(= ${binary:Version}), +Depends: libarmnn33t64(= ${binary:Version}), libarmnn-cpuacc-backend33 (= ${binary:Version}), - libarmnntfliteparser24 (= ${binary:Version}), + libarmnntfliteparser24t64 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: Arm NN Core and CPU backend @@ -230,9 +239,9 @@ Package: armnn-latest-gpu Architecture: armhf arm64 Multi-Arch: same -Depends: libarmnn33 (= ${binary:Version}), +Depends: libarmnn33t64 (= ${binary:Version}), libarmnn-gpuacc-backend33 (= ${binary:Version}), - libarmnntfliteparser24 (= ${binary:Version}), + libarmnntfliteparser24t64 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: Arm NN Core and GPU backend @@ -255,10 +264,10 @@ Package: armnn-latest-cpu-gpu Architecture: arm64 Multi-Arch: same -Depends: libarmnn33 (= ${binary:Version}), +Depends: libarmnn33t64 (= ${binary:Version}), libarmnn-cpuacc-backend33 (= ${binary:Version}), libarmnn-gpuacc-backend33 (= ${binary:Version}), - libarmnntfliteparser24 (= ${binary:Version}), + libarmnntfliteparser24t64 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: Arm NN Core, CPU and GPU backends @@ -282,11 +291,11 @@ Package: armnn-latest-cpu-gpu-ref Architecture: arm64 Multi-Arch: same -Depends: libarmnn33 (= ${binary:Version}), +Depends: libarmnn33t64 (= ${binary:Version}), libarmnn-cpuacc-backend33 (= ${binary:Version}), libarmnn-gpuacc-backend33 (= ${binary:Version}), libarmnn-cpuref-backend33 (= ${binary:Version}), - libarmnntfliteparser24 (= ${binary:Version}), + libarmnntfliteparser24t64 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: Arm NN Core, CPU, GPU, and Reference backends @@ -310,9 +319,9 @@ Package: armnn-latest-ref Architecture: any Multi-Arch: same -Depends: libarmnn33 (= ${binary:Version}), +Depends: libarmnn33t64 (= ${binary:Version}), libarmnn-cpuref-backend33 (= ${binary:Version}), - libarmnntfliteparser24 (= ${binary:Version}), + libarmnntfliteparser24t64 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: Arm NN Core and Reference backend @@ -335,11 +344,11 @@ Package: armnn-latest-all Architecture: any Multi-Arch: same -Depends: libarmnn33 (= ${binary:Version}), +Depends: libarmnn33t64 (= ${binary:Version}), libarmnn-cpuacc-backend33 (= ${binary:Version}) [arm64], libarmnn-cpuref-backend33 (= ${binary:Version}), libarmnn-gpuacc-backend33 (= ${binary:Version}) [armhf arm64], - libarmnntfliteparser24, + libarmnntfliteparser24t64, ${shlibs:Depends}, ${misc:Depends} Description: Arm NN Core and all backends diff -Nru armnn-23.08/debian/libarmnn33.install armnn-23.08/debian/libarmnn33.install --- armnn-23.08/debian/libarmnn33.install 2024-01-13 11:34:44.000000000 +0000 +++ armnn-23.08/debian/libarmnn33.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -usr/lib/*/libarmnn.so.* -usr/lib/*/libarmnnSerializer.so.* diff -Nru armnn-23.08/debian/libarmnn33t64.install armnn-23.08/debian/libarmnn33t64.install --- armnn-23.08/debian/libarmnn33t64.install 1970-01-01 00:00:00.000000000 +0000 +++ armnn-23.08/debian/libarmnn33t64.install 2024-01-13 11:34:44.000000000 +0000 @@ -0,0 +1,2 @@ +usr/lib/*/libarmnn.so.* +usr/lib/*/libarmnnSerializer.so.* diff -Nru armnn-23.08/debian/libarmnn33t64.lintian-overrides armnn-23.08/debian/libarmnn33t64.lintian-overrides --- armnn-23.08/debian/libarmnn33t64.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ armnn-23.08/debian/libarmnn33t64.lintian-overrides 2024-02-28 01:36:18.000000000 +0000 @@ -0,0 +1 @@ +libarmnn33t64: package-name-doesnt-match-sonames libarmnn33 diff -Nru armnn-23.08/debian/libarmnnaclcommon33.install armnn-23.08/debian/libarmnnaclcommon33.install --- armnn-23.08/debian/libarmnnaclcommon33.install 2024-01-13 11:34:44.000000000 +0000 +++ armnn-23.08/debian/libarmnnaclcommon33.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/*/libarmnnAclCommon.so.* diff -Nru armnn-23.08/debian/libarmnnaclcommon33t64.install armnn-23.08/debian/libarmnnaclcommon33t64.install --- armnn-23.08/debian/libarmnnaclcommon33t64.install 1970-01-01 00:00:00.000000000 +0000 +++ armnn-23.08/debian/libarmnnaclcommon33t64.install 2024-01-13 11:34:44.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/*/libarmnnAclCommon.so.* diff -Nru armnn-23.08/debian/libarmnnaclcommon33t64.lintian-overrides armnn-23.08/debian/libarmnnaclcommon33t64.lintian-overrides --- armnn-23.08/debian/libarmnnaclcommon33t64.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ armnn-23.08/debian/libarmnnaclcommon33t64.lintian-overrides 2024-02-28 01:36:18.000000000 +0000 @@ -0,0 +1 @@ +libarmnnaclcommon33t64: package-name-doesnt-match-sonames libarmnnaclcommon33 diff -Nru armnn-23.08/debian/libarmnntfliteparser24.install armnn-23.08/debian/libarmnntfliteparser24.install --- armnn-23.08/debian/libarmnntfliteparser24.install 2024-01-13 11:34:44.000000000 +0000 +++ armnn-23.08/debian/libarmnntfliteparser24.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/*/libarmnnTfLiteParser.so.* diff -Nru armnn-23.08/debian/libarmnntfliteparser24t64.install armnn-23.08/debian/libarmnntfliteparser24t64.install --- armnn-23.08/debian/libarmnntfliteparser24t64.install 1970-01-01 00:00:00.000000000 +0000 +++ armnn-23.08/debian/libarmnntfliteparser24t64.install 2024-01-13 11:34:44.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/*/libarmnnTfLiteParser.so.* diff -Nru armnn-23.08/debian/libarmnntfliteparser24t64.lintian-overrides armnn-23.08/debian/libarmnntfliteparser24t64.lintian-overrides --- armnn-23.08/debian/libarmnntfliteparser24t64.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ armnn-23.08/debian/libarmnntfliteparser24t64.lintian-overrides 2024-02-28 01:36:18.000000000 +0000 @@ -0,0 +1 @@ +libarmnntfliteparser24t64: package-name-doesnt-match-sonames libarmnntfliteparser24
