Bug#1062368: dlib: NMU diff for 64-bit time_t transition

[mwhudson at fastmail.fm]

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)
-------------- next part --------------
diff -Nru dlib-19.24+dfsg/debian/changelog dlib-19.24+dfsg/debian/changelog
--- dlib-19.24+dfsg/debian/changelog	2022-05-15 19:23:47.000000000 +0000
+++ dlib-19.24+dfsg/debian/changelog	2024-02-28 21:42:25.000000000 +0000
@@ -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 <mwhudson at debian.org>  Wed, 28 Feb 2024 21:42:25 +0000
+
 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.000000000 +0000
+++ dlib-19.24+dfsg/debian/control	2024-02-28 21:42:25.000000000 +0000
@@ -5,7 +5,7 @@
            Pierre Gruet <pgt at debian.org>
 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.000000000 +0000
+++ dlib-19.24+dfsg/debian/libdlib19.1.examples	1970-01-01 00:00:00.000000000 +0000
@@ -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.000000000 +0000
+++ dlib-19.24+dfsg/debian/libdlib19.1.install	1970-01-01 00:00:00.000000000 +0000
@@ -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-overrides	2022-04-16 21:30:19.000000000 +0000
+++ dlib-19.24+dfsg/debian/libdlib19.1.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
@@ -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.000000000 +0000
+++ dlib-19.24+dfsg/debian/libdlib19.1t64.examples	2024-02-28 21:42:23.000000000 +0000
@@ -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.000000000 +0000
+++ dlib-19.24+dfsg/debian/libdlib19.1t64.install	2024-02-28 21:42:23.000000000 +0000
@@ -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.000000000 +0000
+++ dlib-19.24+dfsg/debian/libdlib19.1t64.lintian-overrides	2024-02-28 21:42:23.000000000 +0000
@@ -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/rules	2022-05-02 17:42:04.000000000 +0000
+++ dlib-19.24+dfsg/debian/rules	2024-02-28 21:42:23.000000000 +0000
@@ -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 $@ --buildsystem=cmake