Bug#1063050: vlfeat: 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'), (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 vlfeat-0.9.21+full/debian/changelog
vlfeat-0.9.21+full/debian/changelog
--- vlfeat-0.9.21+full/debian/changelog 2024-01-27 22:26:12.0 +
+++ vlfeat-0.9.21+full/debian/changelog 2024-02-28 23:17:05.0 +
@@ -1,3 +1,10 @@
+vlfeat (0.9.21+full-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition. Closes: #1063050
+
+ -- Steve Langasek Wed, 28 Feb 2024 23:17:05 +
+
vlfeat (0.9.21+full-2) unstable; urgency=medium
* Build requires the full imagemagick (Closes: #1037988). Thanks to
diff -Nru vlfeat-0.9.21+full/debian/control vlfeat-0.9.21+full/debian/control
--- vlfeat-0.9.21+full/debian/control 2024-01-27 22:24:21.0 +
+++ vlfeat-0.9.21+full/debian/control 2024-02-28 23:17:05.0 +
@@ -1,7 +1,7 @@
Source: vlfeat
Section: science
Priority: optional
-Build-Depends: debhelper (>= 11), dh-exec, octave-dev, dh-octave,
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper (>= 11), dh-exec, octave-dev,
dh-octave,
transfig, ghostscript, librsvg2-bin, texlive-latex-base,
imagemagick,
python3, python3-pygments, doxygen, rsync, groff
Build-Conflicts: graphicsmagick-imagemagick-compat
@@ -12,7 +12,10 @@
Vcs-Git: https://salsa.debian.org/science-team/vlfeat.git
Vcs-Browser: https://salsa.debian.org/science-team/vlfeat
-Package: libvlfeat1
+Package: libvlfeat1t64
+Provides: ${t64:Provides}
+Replaces: libvlfeat1
+Breaks: libvlfeat1 (<< ${source:Version})
Section: libs
Architecture: any
Multi-Arch: same
@@ -29,7 +32,7 @@
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, libvlfeat1 (= ${binary:Version})
+Depends: ${misc:Depends}, libvlfeat1t64 (= ${binary:Version})
Recommends: libvlfeat-doc
Description: Computer vision library focussing on visual features and
clustering
VLFeat implements popular computer vision algorithms including MSER, k-means,
@@ -58,7 +61,7 @@
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
-Depends: ${shlibs:Depends}, ${misc:Depends}, libvlfeat1 (>= ${binary:Version}),
+Depends: ${shlibs:Depends}, ${misc:Depends}, libvlfeat1t64 (>=
${binary:Version}),
${octave:Depends}
Recommends: libvlfeat-doc
Description: Computer vision library focussing on visual features and
clustering
diff -Nru vlfeat-0.9.21+full/debian/libvlfeat1.install
vlfeat-0.9.21+full/debian/libvlfeat1.install
--- vlfeat-0.9.21+full/debian/libvlfeat1.install2021-11-11
18:45:54.0 +
+++ vlfeat-0.9.21+full/debian/libvlfeat1.install1970-01-01
00:00:00.0 +
@@ -1,3 +0,0 @@
-#!/usr/bin/dh-exec
-
-libvl*.so.* usr/lib/${DEB_HOST_MULTIARCH}
diff -Nru vlfeat-0.9.21+full/debian/libvlfeat1.lintian-overrides
vlfeat-0.9.21+full/debian/libvlfeat1.lintian-overrides
--- vlfeat-0.9.21+full/debian/libvlfeat1.lintian-overrides 2021-11-11
18:45:54.0 +
+++ vlfeat-0.9.21+full/debian/libvlfeat1.lintian-overrides 1970-01-01
00:00:00.0 +
@@ -1,5 +0,0 @@
-# package has the full name of the project: vlfeat however upstream generally
-# calls their library "libvl.so". I want to be in-line with upstream, so I
-# retain this discrepancy
-
-libvlfeat1: package-name-doesnt-match-sonames
diff -Nru vlfeat-0.9.21+full/debian/libvlfeat1.symbols
vlfeat-0.9.21+full/debian/libvlfeat1.symbols
--- vlfeat-0.9.21+full/debian/libvlfeat1.symbols2022-07-07
17:29:52.0 +
+++ vlfeat-0.9.21+full/debian/libvlfeat1.symbols1970-01-01
00:00:00.0 +
@@ -1,395 +0,0 @@
-libvl.so.1 libvlfeat1 #MINVER#
- _vl_distance_chi2_d@Base 0.9.20+dfsg0
- _vl_distance_chi2_f@Base 0.9.20+dfsg0
- _vl_distance_hellinger_d@Base 0.9.20+dfsg0
- _vl_distance_hellinger_f@Base 0.9.20+dfsg0
- _vl_distance_js_d@Base 0.9.20+dfsg0
- _vl_distance_js_f@Base 0.9.20+dfsg0
- _vl_distance_l1_d@Base 0.9.20+dfsg0
- _vl_distance_l1_f@Base 0.9.20+dfsg0
- _vl_distance_l2_d@Base 0.9.20+dfsg0
- _vl_distance_l2_f@Base 0.9.20+dfsg0
- _vl_distance_mahalanobis_sq_d@Base 0.9.20+dfsg0
- _vl_distance_mahalanobis_sq_f@Base 0.9.20+dfsg0
- _vl_dsift_update_buffers@Base 0.9.21+full
- _vl_kernel_chi2_d@Base 0.9.20+dfsg0
- _vl_kernel_chi2_f@Base 0.9.20+dfsg0
- _vl_kernel_hellinger_d@Base
Bug#1063050: vlfeat: NMU diff for 64-bit time_t transition
Source: vlfeat
Version: 0.9.21+full-2
Severity: serious
Tags: patch pending sid trixie
Justification: library ABI skew on upgrade
User: debian-...@lists.debian.org
Usertags: time-t
NOTICE: these changes must not be uploaded to unstable yet!
Dear maintainer,
As part of the 64-bit time_t transition required to support 32-bit
architectures in 2038 and beyond
(https://wiki.debian.org/ReleaseGoals/64bit-time), we have identified
vlfeat as a source package shipping runtime libraries whose ABI
either is affected by the change in size of time_t, or could not be
analyzed via abi-compliance-checker (and therefore to be on the safe
side we assume is affected).
To ensure that inconsistent combinations of libraries with their
reverse-dependencies are never installed together, it is necessary to
have a library transition, which is most easily done by renaming the
runtime library package.
Since turning on 64-bit time_t is being handled centrally through a change
to the default dpkg-buildflags (https://bugs.debian.org/1037136), it is
important that libraries affected by this ABI change all be uploaded close
together in time. Therefore I have prepared a 0-day NMU for vlfeat
which will initially be uploaded to experimental if possible, then to
unstable after packages have cleared binary NEW.
Please find the patch for this NMU attached.
If you have any concerns about this patch, please reach out ASAP. Although
this package will be uploaded to experimental immediately, there will be a
period of several days before we begin uploads to unstable; so if information
becomes available that your package should not be included in the transition,
there is time for us to amend the planned uploads.
-- 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 vlfeat-0.9.21+full/debian/changelog
vlfeat-0.9.21+full/debian/changelog
--- vlfeat-0.9.21+full/debian/changelog 2024-01-27 22:26:12.0 +
+++ vlfeat-0.9.21+full/debian/changelog 2024-02-04 18:22:49.0 +
@@ -1,3 +1,10 @@
+vlfeat (0.9.21+full-2.1) experimental; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition.
+
+ -- Steve Langasek Sun, 04 Feb 2024 18:22:49 +
+
vlfeat (0.9.21+full-2) unstable; urgency=medium
* Build requires the full imagemagick (Closes: #1037988). Thanks to
diff -Nru vlfeat-0.9.21+full/debian/control vlfeat-0.9.21+full/debian/control
--- vlfeat-0.9.21+full/debian/control 2024-01-27 22:24:21.0 +
+++ vlfeat-0.9.21+full/debian/control 2024-02-04 18:22:48.0 +
@@ -12,7 +12,10 @@
Vcs-Git: https://salsa.debian.org/science-team/vlfeat.git
Vcs-Browser: https://salsa.debian.org/science-team/vlfeat
-Package: libvlfeat1
+Package: libvlfeat1t64
+Provides: ${t64:Provides}
+Replaces: libvlfeat1
+Breaks: libvlfeat1 (<< ${source:Version})
Section: libs
Architecture: any
Multi-Arch: same
@@ -29,7 +32,7 @@
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, libvlfeat1 (= ${binary:Version})
+Depends: ${misc:Depends}, libvlfeat1t64 (= ${binary:Version})
Recommends: libvlfeat-doc
Description: Computer vision library focussing on visual features and
clustering
VLFeat implements popular computer vision algorithms including MSER, k-means,
@@ -58,7 +61,7 @@
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
-Depends: ${shlibs:Depends}, ${misc:Depends}, libvlfeat1 (>= ${binary:Version}),
+Depends: ${shlibs:Depends}, ${misc:Depends}, libvlfeat1t64 (>=
${binary:Version}),
${octave:Depends}
Recommends: libvlfeat-doc
Description: Computer vision library focussing on visual features and
clustering
diff -Nru vlfeat-0.9.21+full/debian/libvlfeat1.install
vlfeat-0.9.21+full/debian/libvlfeat1.install
--- vlfeat-0.9.21+full/debian/libvlfeat1.install2021-11-11
18:45:54.0 +
+++ vlfeat-0.9.21+full/debian/libvlfeat1.install1970-01-01
00:00:00.0 +
@@ -1,3 +0,0 @@
-#!/usr/bin/dh-exec
-
-libvl*.so.* usr/lib/${DEB_HOST_MULTIARCH}
diff -Nru vlfeat-0.9.21+full/debian/libvlfeat1.lintian-overrides
vlfeat-0.9.21+full/debian/libvlfeat1.lintian-overrides
--- vlfeat-0.9.21+full/debian/libvlfeat1.lintian-overrides 2021-11-11
18:45:54.0 +
+++ vlfeat-0.9.21+full/debian/libvlfeat1.lintian-overrides 1970-01-01
00:00:00.0 +
@@ -1,5 +0,0 @@
-# package has the full name of the project: vlfeat however upstream generally
-# calls their library "libvl.so". I want to be in-line with upstream, so I
-# retain this discrepancy
-
-libvlfeat1: package-name-doesnt-match-sonames
diff -Nru
