Bug#1062341: highwayhash: 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-21-generic (SMP w/4 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru highwayhash-0~git20200803.9490b14/debian/changelog highwayhash-0~git20200803.9490b14/debian/changelog
--- highwayhash-0~git20200803.9490b14/debian/changelog 2023-12-10 21:46:41.000000000 +0000
+++ highwayhash-0~git20200803.9490b14/debian/changelog 2024-02-28 10:37:34.000000000 +0000
@@ -1,3 +1,10 @@
+highwayhash (0~git20200803.9490b14-4.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition. Closes: #1062341
+
+ -- Lukas Märdian <slyon@debian.org> Wed, 28 Feb 2024 10:37:34 +0000
+
highwayhash (0~git20200803.9490b14-4) unstable; urgency=medium
* Orphan this package. (See #1013208)
diff -Nru highwayhash-0~git20200803.9490b14/debian/control highwayhash-0~git20200803.9490b14/debian/control
--- highwayhash-0~git20200803.9490b14/debian/control 2023-12-10 21:46:17.000000000 +0000
+++ highwayhash-0~git20200803.9490b14/debian/control 2024-02-28 10:37:34.000000000 +0000
@@ -2,7 +2,7 @@
Section: science
Priority: optional
Maintainer: Debian QA Group <packages@qa.debian.org>
-Build-Depends: debhelper-compat (= 13), rename
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13), rename
Standards-Version: 4.6.2
Homepage: https://github.com/google/highwayhash
Vcs-Git: https://salsa.debian.org/science-team/highwayhash.git
@@ -12,7 +12,7 @@
Package: libhighwayhash-dev
Section: libdevel
Architecture: any
-Depends: ${misc:Depends}, libhighwayhash0 (= ${binary:Version})
+Depends: ${misc:Depends}, libhighwayhash0t64 (= ${binary:Version})
Multi-Arch: same
Description: Fast strong hash functions: SipHash/HighwayHash (development)
Highwayhash provides three 'strong' (well-distributed and unpredictable)
@@ -33,7 +33,10 @@
.
This package ships the static library and development files.
-Package: libhighwayhash0
+Package: libhighwayhash0t64
+Provides: ${t64:Provides}
+Replaces: libhighwayhash0
+Breaks: libhighwayhash0 (<< ${source:Version})
Section: libs
Architecture: any
Multi-Arch: same
diff -Nru highwayhash-0~git20200803.9490b14/debian/libhighwayhash0t64.lintian-overrides highwayhash-0~git20200803.9490b14/debian/libhighwayhash0t64.lintian-overrides
--- highwayhash-0~git20200803.9490b14/debian/libhighwayhash0t64.lintian-overrides 1970-01-01 00:00:00.000000000 +0000
+++ highwayhash-0~git20200803.9490b14/debian/libhighwayhash0t64.lintian-overrides 2024-02-28 10:34:38.000000000 +0000
@@ -0,0 +1 @@
+libhighwayhash0t64: package-name-doesnt-match-sonames libhighwayhash0
diff -Nru highwayhash-0~git20200803.9490b14/debian/rules highwayhash-0~git20200803.9490b14/debian/rules
--- highwayhash-0~git20200803.9490b14/debian/rules 2023-12-10 21:36:43.000000000 +0000
+++ highwayhash-0~git20200803.9490b14/debian/rules 2024-02-28 10:37:24.000000000 +0000
@@ -39,10 +39,10 @@
override_dh_auto_install:
dh_auto_install
- mkdir -p debian/libhighwayhash0/usr/lib/$(DEB_HOST_MULTIARCH)
+ mkdir -p debian/libhighwayhash0t64/usr/lib/$(DEB_HOST_MULTIARCH)
rename 's/.so/.so.0/' debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.so
install -m0755 debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.so.0 \
- debian/libhighwayhash0/usr/lib/$(DEB_HOST_MULTIARCH)/
+ debian/libhighwayhash0t64/usr/lib/$(DEB_HOST_MULTIARCH)/
mkdir -p debian/libhighwayhash-dev/usr/lib/$(DEB_HOST_MULTIARCH)
install -m0755 debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.a \
debian/libhighwayhash-dev/usr/lib/$(DEB_HOST_MULTIARCH)/
Reply to: