Bug#1062368: dlib: 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-21-generic (SMP w/16 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 dlib-19.24+dfsg/debian/changelog dlib-19.24+dfsg/debian/changelog
--- dlib-19.24+dfsg/debian/changelog2022-05-15 19:23:47.0 +
+++ dlib-19.24+dfsg/debian/changelog2024-02-28 21:42:25.0 +
@@ -1,3 +1,16 @@
+dlib (19.24+dfsg-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition.
+
+ [ Pierre Gruet ]
+ * Fixing the soversion in d/rules
+
+ [ Steve Langasek ]
+ * Fix debian/rules to not change the upstream soname.
+
+ -- Michael Hudson-Doyle Wed, 28 Feb 2024 21:42:25 +
+
dlib (19.24+dfsg-1) unstable; urgency=medium
* New upstream version 19.24+dfsg
diff -Nru dlib-19.24+dfsg/debian/control dlib-19.24+dfsg/debian/control
--- dlib-19.24+dfsg/debian/control 2022-05-15 12:02:01.0 +
+++ dlib-19.24+dfsg/debian/control 2024-02-28 21:42:25.0 +
@@ -5,7 +5,7 @@
Pierre Gruet
Section: libs
Priority: optional
-Build-Depends: bzip2,
+Build-Depends: dpkg-dev (>= 1.22.5), bzip2,
cmake,
debhelper-compat (= 13),
libblas-dev,
@@ -23,7 +23,7 @@
Architecture: any
Multi-Arch: same
Section: libdevel
-Depends: libdlib19.1 (= ${binary:Version}),
+Depends: libdlib19.1t64 (= ${binary:Version}),
${misc:Depends},
libopencv-core-dev,
libpng-dev,
@@ -40,7 +40,10 @@
.
This package contains the development headers.
-Package: libdlib19.1
+Package: libdlib19.1t64
+Provides: ${t64:Provides}
+Replaces: libdlib19.1
+Breaks: libdlib19.1 (<< ${source:Version})
Architecture: any
Multi-Arch: same
Depends: libdlib-data,
diff -Nru dlib-19.24+dfsg/debian/libdlib19.1.examples
dlib-19.24+dfsg/debian/libdlib19.1.examples
--- dlib-19.24+dfsg/debian/libdlib19.1.examples 2022-04-16 18:58:05.0
+
+++ dlib-19.24+dfsg/debian/libdlib19.1.examples 1970-01-01 00:00:00.0
+
@@ -1 +0,0 @@
-examples/*
diff -Nru dlib-19.24+dfsg/debian/libdlib19.1.install
dlib-19.24+dfsg/debian/libdlib19.1.install
--- dlib-19.24+dfsg/debian/libdlib19.1.install 2022-04-16 18:58:05.0
+
+++ dlib-19.24+dfsg/debian/libdlib19.1.install 1970-01-01 00:00:00.0
+
@@ -1 +0,0 @@
-usr/lib/*/lib*.so.*
diff -Nru dlib-19.24+dfsg/debian/libdlib19.1.lintian-overrides
dlib-19.24+dfsg/debian/libdlib19.1.lintian-overrides
--- dlib-19.24+dfsg/debian/libdlib19.1.lintian-overrides2022-04-16
21:30:19.0 +
+++ dlib-19.24+dfsg/debian/libdlib19.1.lintian-overrides1970-01-01
00:00:00.0 +
@@ -1,3 +0,0 @@
-# symbols file are not recommended for C++ libraries
-# cf http://www.eyrie.org/~eagle/journal/2012-02/001.html
-no-symbols-control-file
diff -Nru dlib-19.24+dfsg/debian/libdlib19.1t64.examples
dlib-19.24+dfsg/debian/libdlib19.1t64.examples
--- dlib-19.24+dfsg/debian/libdlib19.1t64.examples 1970-01-01
00:00:00.0 +
+++ dlib-19.24+dfsg/debian/libdlib19.1t64.examples 2024-02-28
21:42:23.0 +
@@ -0,0 +1 @@
+examples/*
diff -Nru dlib-19.24+dfsg/debian/libdlib19.1t64.install
dlib-19.24+dfsg/debian/libdlib19.1t64.install
--- dlib-19.24+dfsg/debian/libdlib19.1t64.install 1970-01-01
00:00:00.0 +
+++ dlib-19.24+dfsg/debian/libdlib19.1t64.install 2024-02-28
21:42:23.0 +
@@ -0,0 +1 @@
+usr/lib/*/lib*.so.*
diff -Nru dlib-19.24+dfsg/debian/libdlib19.1t64.lintian-overrides
dlib-19.24+dfsg/debian/libdlib19.1t64.lintian-overrides
--- dlib-19.24+dfsg/debian/libdlib19.1t64.lintian-overrides 1970-01-01
00:00:00.0 +
+++ dlib-19.24+dfsg/debian/libdlib19.1t64.lintian-overrides 2024-02-28
21:42:23.0 +
@@ -0,0 +1,4 @@
+# symbols file are not recommended for C++ libraries
+# cf http://www.eyrie.org/~eagle/journal/2012-02/001.html
+no-symbols-control-file
+libdlib19.1t64: package-name-doesnt-match-sonames libdlib19.1
diff -Nru dlib-19.24+dfsg/debian/rules dlib-19.24+dfsg/debian/rules
--- dlib-19.24+dfsg/debian/rules2022-05-02 17:42:04.0 +
+++ dlib-19.24+dfsg/debian/rules2024-02-28 21:42:23.0 +
@@ -13,7 +13,8 @@
CONFIG_SHARED_PATH = config_shared
CONFIG_STATIC_PATH = config_static
LIB_SOVERSION = 19.1
-EXAMPLES_PATH =
Bug#1062368: dlib: NMU diff for 64-bit time_t transition
The previous patch overlooked that the variable in debian/rules affected not
only the package name, but the soname produced for the .so file. Please
find a corrected patch attached.
--
Steve Langasek Give me a lever long enough and a Free OS
Debian Developer to set it on, and I can move the world.
Ubuntu Developer https://www.debian.org/
slanga...@ubuntu.com vor...@debian.org
diff -Nru dlib-19.24+dfsg/debian/changelog dlib-19.24+dfsg/debian/changelog
--- dlib-19.24+dfsg/debian/changelog2022-05-15 19:23:47.0 +
+++ dlib-19.24+dfsg/debian/changelog2024-02-25 00:18:05.0 +
@@ -1,3 +1,23 @@
+dlib (19.24+dfsg-1.1~exp3) experimental; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix debian/rules to not change the upstream soname.
+
+ -- Steve Langasek Sun, 25 Feb 2024 00:18:05 +
+
+dlib (19.24+dfsg-1.1~exp2) experimental; urgency=medium
+
+ * Fixing the soversion in d/rules
+
+ -- Pierre Gruet Fri, 02 Feb 2024 23:10:12 +0100
+
+dlib (19.24+dfsg-1.1~exp1) experimental; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition.
+
+ -- Michael Hudson-Doyle Thu, 01 Feb 2024 07:29:47 +
+
dlib (19.24+dfsg-1) unstable; urgency=medium
* New upstream version 19.24+dfsg
diff -Nru dlib-19.24+dfsg/debian/control dlib-19.24+dfsg/debian/control
--- dlib-19.24+dfsg/debian/control 2022-05-15 12:02:01.0 +
+++ dlib-19.24+dfsg/debian/control 2024-02-02 21:51:38.0 +
@@ -23,7 +23,7 @@
Architecture: any
Multi-Arch: same
Section: libdevel
-Depends: libdlib19.1 (= ${binary:Version}),
+Depends: libdlib19.1t64 (= ${binary:Version}),
${misc:Depends},
libopencv-core-dev,
libpng-dev,
@@ -40,7 +40,10 @@
.
This package contains the development headers.
-Package: libdlib19.1
+Package: libdlib19.1t64
+Provides: ${t64:Provides}
+Replaces: libdlib19.1
+Breaks: libdlib19.1 (<< ${source:Version})
Architecture: any
Multi-Arch: same
Depends: libdlib-data,
diff -Nru dlib-19.24+dfsg/debian/libdlib19.1.examples
dlib-19.24+dfsg/debian/libdlib19.1.examples
--- dlib-19.24+dfsg/debian/libdlib19.1.examples 2022-04-16 18:58:05.0
+
+++ dlib-19.24+dfsg/debian/libdlib19.1.examples 1970-01-01 00:00:00.0
+
@@ -1 +0,0 @@
-examples/*
diff -Nru dlib-19.24+dfsg/debian/libdlib19.1.install
dlib-19.24+dfsg/debian/libdlib19.1.install
--- dlib-19.24+dfsg/debian/libdlib19.1.install 2022-04-16 18:58:05.0
+
+++ dlib-19.24+dfsg/debian/libdlib19.1.install 1970-01-01 00:00:00.0
+
@@ -1 +0,0 @@
-usr/lib/*/lib*.so.*
diff -Nru dlib-19.24+dfsg/debian/libdlib19.1.lintian-overrides
dlib-19.24+dfsg/debian/libdlib19.1.lintian-overrides
--- dlib-19.24+dfsg/debian/libdlib19.1.lintian-overrides2022-04-16
21:30:19.0 +
+++ dlib-19.24+dfsg/debian/libdlib19.1.lintian-overrides1970-01-01
00:00:00.0 +
@@ -1,3 +0,0 @@
-# symbols file are not recommended for C++ libraries
-# cf http://www.eyrie.org/~eagle/journal/2012-02/001.html
-no-symbols-control-file
diff -Nru dlib-19.24+dfsg/debian/libdlib19.1t64.examples
dlib-19.24+dfsg/debian/libdlib19.1t64.examples
--- dlib-19.24+dfsg/debian/libdlib19.1t64.examples 1970-01-01
00:00:00.0 +
+++ dlib-19.24+dfsg/debian/libdlib19.1t64.examples 2024-02-02
21:51:38.0 +
@@ -0,0 +1 @@
+examples/*
diff -Nru dlib-19.24+dfsg/debian/libdlib19.1t64.install
dlib-19.24+dfsg/debian/libdlib19.1t64.install
--- dlib-19.24+dfsg/debian/libdlib19.1t64.install 1970-01-01
00:00:00.0 +
+++ dlib-19.24+dfsg/debian/libdlib19.1t64.install 2024-02-02
21:51:38.0 +
@@ -0,0 +1 @@
+usr/lib/*/lib*.so.*
diff -Nru dlib-19.24+dfsg/debian/libdlib19.1t64.lintian-overrides
dlib-19.24+dfsg/debian/libdlib19.1t64.lintian-overrides
--- dlib-19.24+dfsg/debian/libdlib19.1t64.lintian-overrides 1970-01-01
00:00:00.0 +
+++ dlib-19.24+dfsg/debian/libdlib19.1t64.lintian-overrides 2024-02-02
21:51:38.0 +
@@ -0,0 +1,4 @@
+# symbols file are not recommended for C++ libraries
+# cf http://www.eyrie.org/~eagle/journal/2012-02/001.html
+no-symbols-control-file
+libdlib19.1t64: package-name-doesnt-match-sonames libdlib19.1
diff -Nru dlib-19.24+dfsg/debian/rules dlib-19.24+dfsg/debian/rules
--- dlib-19.24+dfsg/debian/rules2022-05-02 17:42:04.0 +
+++ dlib-19.24+dfsg/debian/rules2024-02-25 00:17:41.0 +
@@ -13,7 +13,8 @@
CONFIG_SHARED_PATH = config_shared
CONFIG_STATIC_PATH = config_static
LIB_SOVERSION = 19.1
-EXAMPLES_PATH =
debian/libdlib$(LIB_SOVERSION)/usr/share/doc/libdlib$(LIB_SOVERSION)/examples/
+LIB_SOVERSION_ISH = $(LIB_SOVERSION)t64
+EXAMPLES_PATH =
debian/libdlib$(LIB_SOVERSION_ISH)/usr/share/doc/libdlib$(LIB_SOVERSION_ISH)/examples/
%:
dh $@
Bug#1062368: dlib: NMU diff for 64-bit time_t transition
Source: dlib
Version: 19.24+dfsg-1
Severity: serious
Tags: patch pending
Justification: library ABI skew on upgrade
User: debian-...@lists.debian.org
Usertags: time-t
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
dlib 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 dlib
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'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 6.5.0-15-generic (SMP w/16 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 dlib-19.24+dfsg/debian/changelog dlib-19.24+dfsg/debian/changelog
--- dlib-19.24+dfsg/debian/changelog2022-05-15 19:23:47.0 +
+++ dlib-19.24+dfsg/debian/changelog2024-02-01 07:26:59.0 +
@@ -1,3 +1,10 @@
+dlib (19.24+dfsg-1.1) experimental; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition.
+
+ -- Michael Hudson-Doyle Thu, 01 Feb 2024 07:26:59 +
+
dlib (19.24+dfsg-1) unstable; urgency=medium
* New upstream version 19.24+dfsg
diff -Nru dlib-19.24+dfsg/debian/control dlib-19.24+dfsg/debian/control
--- dlib-19.24+dfsg/debian/control 2022-05-15 12:02:01.0 +
+++ dlib-19.24+dfsg/debian/control 2024-02-01 07:26:08.0 +
@@ -23,7 +23,7 @@
Architecture: any
Multi-Arch: same
Section: libdevel
-Depends: libdlib19.1 (= ${binary:Version}),
+Depends: libdlib19.1t64 (= ${binary:Version}),
${misc:Depends},
libopencv-core-dev,
libpng-dev,
@@ -40,7 +40,10 @@
.
This package contains the development headers.
-Package: libdlib19.1
+Package: libdlib19.1t64
+Provides: ${t64:Provides}
+Replaces: libdlib19.1
+Breaks: libdlib19.1 (<< ${source:Version})
Architecture: any
Multi-Arch: same
Depends: libdlib-data,
diff -Nru dlib-19.24+dfsg/debian/libdlib19.1.examples
dlib-19.24+dfsg/debian/libdlib19.1.examples
--- dlib-19.24+dfsg/debian/libdlib19.1.examples 2022-04-16 18:58:05.0
+
+++ dlib-19.24+dfsg/debian/libdlib19.1.examples 1970-01-01 00:00:00.0
+
@@ -1 +0,0 @@
-examples/*
diff -Nru dlib-19.24+dfsg/debian/libdlib19.1.install
dlib-19.24+dfsg/debian/libdlib19.1.install
--- dlib-19.24+dfsg/debian/libdlib19.1.install 2022-04-16 18:58:05.0
+
+++ dlib-19.24+dfsg/debian/libdlib19.1.install 1970-01-01 00:00:00.0
+
@@ -1 +0,0 @@
-usr/lib/*/lib*.so.*
diff -Nru dlib-19.24+dfsg/debian/libdlib19.1.lintian-overrides
dlib-19.24+dfsg/debian/libdlib19.1.lintian-overrides
--- dlib-19.24+dfsg/debian/libdlib19.1.lintian-overrides2022-04-16
21:30:19.0 +
+++ dlib-19.24+dfsg/debian/libdlib19.1.lintian-overrides1970-01-01
00:00:00.0 +
@@ -1,3 +0,0 @@
-# symbols file are not recommended for C++ libraries
-# cf http://www.eyrie.org/~eagle/journal/2012-02/001.html
-no-symbols-control-file
diff -Nru dlib-19.24+dfsg/debian/libdlib19.1t64.examples
dlib-19.24+dfsg/debian/libdlib19.1t64.examples
--- dlib-19.24+dfsg/debian/libdlib19.1t64.examples 1970-01-01
00:00:00.0 +
+++ dlib-19.24+dfsg/debian/libdlib19.1t64.examples 2022-04-16
18:58:05.0 +
@@ -0,0 +1 @@
+examples/*
diff -Nru dlib-19.24+dfsg/debian/libdlib19.1t64.install
dlib-19.24+dfsg/debian/libdlib19.1t64.install
--- dlib-19.24+dfsg/debian/libdlib19.1t64.install 1970-01-01
00:00:00.0 +
+++ dlib-19.24+dfsg/debian/libdlib19.1t64.install 2022-04-16
