[Debian-med-packaging] Bug#1062403: freecontact: NMU diff for 64-bit time_t transition

[Steve Langasek]

Hello,

The previous NMU of freecontact failed to build in experimental because
debian/rules still had a --v5 option passed to d-shlibs, which is mutually
incompatible with --t64.  Please see the attached corrected patch.

-- 
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 freecontact-1.0.21/debian/changelog freecontact-1.0.21/debian/changelog
--- freecontact-1.0.21/debian/changelog	2023-05-18 09:43:26.000000000 +0000
+++ freecontact-1.0.21/debian/changelog	2024-02-24 01:32:43.000000000 +0000
@@ -1,3 +1,17 @@
+freecontact (1.0.21-13.1~exp2) experimental; urgency=medium
+
+  * Non-maintainer upload.
+  * Drop --v5 argument to d-shlibs, should be mutually exclusive with --t64.
+
+ -- Steve Langasek <vorlon at debian.org>  Sat, 24 Feb 2024 01:32:43 +0000
+
+freecontact (1.0.21-13.1~exp1) experimental; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.
+
+ -- Lukas M?rdian <slyon at debian.org>  Thu, 01 Feb 2024 09:41:16 +0000
+
 freecontact (1.0.21-13) unstable; urgency=medium
 
   * Team upload.
diff -Nru freecontact-1.0.21/debian/control freecontact-1.0.21/debian/control
--- freecontact-1.0.21/debian/control	2022-04-09 20:20:33.000000000 +0000
+++ freecontact-1.0.21/debian/control	2024-02-01 09:41:16.000000000 +0000
@@ -5,7 +5,7 @@
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
                bash-completion,
-               d-shlibs,
+               d-shlibs (>= 0.106),
                gfortran,
                libblas-dev | libblas-3.so,
                libboost-dev,
@@ -35,14 +35,17 @@
  .
  This package contains the command line tool freecontact(1).
 
-Package: libfreecontact0v5
+Package: libfreecontact0t64
+Provides: ${t64:Provides}
+X-Time64-Compat: libfreecontact0v5
+Breaks: libfreecontact0v5 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Conflicts: libfreecontact0
-Replaces: libfreecontact0
+Replaces: libfreecontact0v5, libfreecontact0
 Description: fast protein contact predictor library
  ${Description}
  .
@@ -52,7 +55,7 @@
 Architecture: any
 Multi-Arch: same
 Section: libdevel
-Depends: libfreecontact0v5 (= ${binary:Version}),
+Depends: libfreecontact0t64 (= ${binary:Version}),
          ${misc:Depends}
 Suggests: libfreecontact-doc
 Conflicts: libfreecontact-dev
diff -Nru freecontact-1.0.21/debian/libfreecontact0t64.lintian-overrides freecontact-1.0.21/debian/libfreecontact0t64.lintian-overrides
--- freecontact-1.0.21/debian/libfreecontact0t64.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ freecontact-1.0.21/debian/libfreecontact0t64.lintian-overrides	2024-02-01 09:41:16.000000000 +0000
@@ -0,0 +1 @@
+libfreecontact0t64: package-name-doesnt-match-sonames libfreecontact0v5
diff -Nru freecontact-1.0.21/debian/rules freecontact-1.0.21/debian/rules
--- freecontact-1.0.21/debian/rules	2023-05-18 09:29:42.000000000 +0000
+++ freecontact-1.0.21/debian/rules	2024-02-24 01:32:14.000000000 +0000
@@ -27,10 +27,10 @@
 override_dh_install:
 	dh_install
 	d-shlibmove --commit \
+	            --t64 \
 	            --multiarch \
 	            --exclude-la \
 	            --devunversioned \
-	            --v5 \
                     --override s/libgfortran[345]-dev/libgfortran-12-dev/ \
 	            --movedev debian/tmp/usr/include/* usr/include \
 	            debian/tmp/usr/lib/*/*.so
-------------- 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-med-packaging/attachments/20240223/e3655a08/attachment.sig>