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 uhd-4.6.0.0+ds1/debian/changelog uhd-4.6.0.0+ds1/debian/changelog
--- uhd-4.6.0.0+ds1/debian/changelog 2023-12-16 03:34:58.000000000 +0000
+++ uhd-4.6.0.0+ds1/debian/changelog 2024-02-28 20:10:38.000000000 +0000
@@ -1,3 +1,10 @@
+uhd (4.6.0.0+ds1-5.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition. Closes: #1063085
+
+ -- Steve Langasek <vor...@debian.org> Wed, 28 Feb 2024 20:10:38 +0000
+
uhd (4.6.0.0+ds1-5) unstable; urgency=medium
* install utilities on hurd
diff -Nru uhd-4.6.0.0+ds1/debian/control uhd-4.6.0.0+ds1/debian/control
--- uhd-4.6.0.0+ds1/debian/control 2023-12-04 01:45:35.000000000 +0000
+++ uhd-4.6.0.0+ds1/debian/control 2024-02-28 20:10:37.000000000 +0000
@@ -2,7 +2,7 @@
Section: science
Priority: optional
Maintainer: A. Maitland Bottoms <bott...@debian.org>
-Build-Depends: cmake,
+Build-Depends: dpkg-dev (>= 1.22.5), cmake,
debhelper-compat (= 13),
dh-python,
libboost-date-time-dev,
@@ -38,7 +38,7 @@
Package: uhd-host
Architecture: any
-Depends: libuhd4.6.0 (= ${binary:Version}),
+Depends: libuhd4.6.0t64 (= ${binary:Version}),
python3-requests,
${misc:Depends},
${python3:Depends},
@@ -57,7 +57,10 @@
display hardware configuration information and Doxygen generated
documentation.
-Package: libuhd4.6.0
+Package: libuhd4.6.0t64
+Provides: ${t64:Provides}
+Replaces: libuhd4.6.0
+Breaks: libuhd4.6.0 (<< ${source:Version})
Architecture: any
Section: libs
Pre-Depends: ${misc:Pre-Depends}
@@ -77,8 +80,8 @@
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
Suggests: uhd-host
-Conflicts: libuhd4.6.0
-Provides: libuhd4.6.0
+Conflicts: libuhd4.6.0t64
+Provides: libuhd4.6.0t64
Multi-Arch: same
Description: universal hardware driver for Ettus Research products - DPDK
Host library for the Universal Hardware Driver for Ettus Research products.
@@ -103,7 +106,7 @@
Package: libuhd-dev
Architecture: any
Section: libdevel
-Depends: libuhd4.6.0 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: libuhd4.6.0t64 (= ${binary:Version}), ${misc:Depends},
${shlibs:Depends}
Recommends: gnuradio-dev
Suggests: uhd-doc
Multi-Arch: same
@@ -120,7 +123,7 @@
Package: python3-uhd
Architecture: any
Section: python
-Depends: libuhd4.6.0 (= ${binary:Version}),
+Depends: libuhd4.6.0t64 (= ${binary:Version}),
python3-ruamel.yaml,
${misc:Depends},
${python3:Depends},
diff -Nru uhd-4.6.0.0+ds1/debian/libuhd4.6.0.install
uhd-4.6.0.0+ds1/debian/libuhd4.6.0.install
--- uhd-4.6.0.0+ds1/debian/libuhd4.6.0.install 2023-11-26 20:12:26.000000000
+0000
+++ uhd-4.6.0.0+ds1/debian/libuhd4.6.0.install 1970-01-01 00:00:00.000000000
+0000
@@ -1,2 +0,0 @@
-usr/lib/*/*.so.*
-usr/share/uhd
diff -Nru uhd-4.6.0.0+ds1/debian/libuhd4.6.0t64.install
uhd-4.6.0.0+ds1/debian/libuhd4.6.0t64.install
--- uhd-4.6.0.0+ds1/debian/libuhd4.6.0t64.install 1970-01-01
00:00:00.000000000 +0000
+++ uhd-4.6.0.0+ds1/debian/libuhd4.6.0t64.install 2023-11-26
20:12:26.000000000 +0000
@@ -0,0 +1,2 @@
+usr/lib/*/*.so.*
+usr/share/uhd
diff -Nru uhd-4.6.0.0+ds1/debian/libuhd4.6.0t64.lintian-overrides
uhd-4.6.0.0+ds1/debian/libuhd4.6.0t64.lintian-overrides
--- uhd-4.6.0.0+ds1/debian/libuhd4.6.0t64.lintian-overrides 1970-01-01
00:00:00.000000000 +0000
+++ uhd-4.6.0.0+ds1/debian/libuhd4.6.0t64.lintian-overrides 2024-02-28
20:06:16.000000000 +0000
@@ -0,0 +1 @@
+libuhd4.6.0t64: package-name-doesnt-match-sonames libuhd4.6.0
diff -Nru uhd-4.6.0.0+ds1/debian/rules uhd-4.6.0.0+ds1/debian/rules
--- uhd-4.6.0.0+ds1/debian/rules 2023-11-26 20:12:26.000000000 +0000
+++ uhd-4.6.0.0+ds1/debian/rules 2024-02-28 20:10:37.000000000 +0000
@@ -57,12 +57,12 @@
rm -rf debian/tmp/usr/share/doc/uhd/doxygen/latex
override_dh_shlibdeps:
- dh_shlibdeps --package=uhd-host --libpackage=libuhd4.6.0
- dh_shlibdeps --package=libuhd4.6.0 --libpackage=libuhd4.6.0
+ dh_shlibdeps --package=uhd-host --libpackage=libuhd4.6.0t64
+ dh_shlibdeps --package=libuhd4.6.0t64 --libpackage=libuhd4.6.0t64
dh_shlibdeps --package=libuhd4.6.0-dpdk --libpackage=libuhd4.6.0-dpdk
dh_shlibdeps --package=libuhd4.6.0-dpdk-tests
--libpackage=libuhd4.6.0-dpdk
- dh_shlibdeps --package=libuhd-dev --libpackage=libuhd4.6.0
- dh_shlibdeps --package=python3-uhd --libpackage=libuhd4.6.0
+ dh_shlibdeps --package=libuhd-dev --libpackage=libuhd4.6.0t64
+ dh_shlibdeps --package=python3-uhd --libpackage=libuhd4.6.0t64
override_dh_auto_clean:
rm -rf host/tests/__pycache__
