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

[Steve Langasek]

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/
slangasek at ubuntu.com                                     vorlon at debian.org
-------------- 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-25 00:18:05.000000000 +0000
@@ -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 <vorlon at debian.org>  Sun, 25 Feb 2024 00:18:05 +0000
+
+dlib (19.24+dfsg-1.1~exp2) experimental; urgency=medium
+
+  * Fixing the soversion in d/rules
+
+ -- Pierre Gruet <pgt at debian.org>  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 <mwhudson at debian.org>  Thu, 01 Feb 2024 07:29:47 +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-02 21:51:38.000000000 +0000
@@ -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-02 21:51:38.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-02 21:51:38.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-02 21:51:38.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-25 00:17:41.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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://alioth-lists.debian.net/pipermail/debian-science-maintainers/attachments/20240224/01cf10e8/attachment.sig>