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')
Architecture: amd64 (x86_64)

Kernel: Linux 6.5.0-21-generic (SMP w/4 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 libcapi20-3-3.27/debian/changelog libcapi20-3-3.27/debian/changelog
--- libcapi20-3-3.27/debian/changelog   2018-04-15 12:23:19.000000000 +0000
+++ libcapi20-3-3.27/debian/changelog   2024-02-29 10:33:37.000000000 +0000
@@ -1,3 +1,10 @@
+libcapi20-3 (1:3.27-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1062243
+
+ -- Lukas Märdian <sl...@debian.org>  Thu, 29 Feb 2024 10:33:37 +0000
+
 libcapi20-3 (1:3.27-3) unstable; urgency=medium
 
   * control:
diff -Nru libcapi20-3-3.27/debian/control libcapi20-3-3.27/debian/control
--- libcapi20-3-3.27/debian/control     2018-04-15 12:22:25.000000000 +0000
+++ libcapi20-3-3.27/debian/control     2024-02-29 10:33:37.000000000 +0000
@@ -4,12 +4,15 @@
 Maintainer: Rolf Leggewie <f...@rolf.leggewie.biz>
 Uploaders: Jan-Michael Brummer <jan.brum...@tabos.org>
 Standards-Version: 4.1.4
-Build-Depends: debhelper (>= 9), dh-autoreconf
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper (>= 9), dh-autoreconf
 Homepage: http://www.isdn4linux.de
 Vcs-Browser: https://github.com/leggewie-DM/libcapi20
 Vcs-Git: g...@github.com:leggewie-DM/libcapi20.git
 
-Package: libcapi20-3
+Package: libcapi20-3t64
+Provides: ${t64:Provides}
+Replaces: libcapi20-3
+Breaks: libcapi20-3 (<< ${source:Version})
 Architecture: linux-any
 Section: libs
 Multi-Arch: same
@@ -23,9 +26,9 @@
 Architecture: linux-any
 Section: libdevel
 Multi-Arch: same
-Depends: libcapi20-3 (= ${binary:Version}), ${misc:Depends}
+Depends: libcapi20-3t64 (= ${binary:Version}), ${misc:Depends}
 Breaks: isdnutils-base (<< 1:3.22+dfsg1-4)
-Replaces: libcapi20-3 (<< 1:3.9.20060704+dfsg.3-4),
+Replaces: libcapi20-3t64 (<< 1:3.9.20060704+dfsg.3-4),
  isdnutils-base (<< 1:3.22+dfsg1-4)
 Description: ISDN utilities - CAPI development libraries
  This package provides files needed for development of CAPI-aware software.
diff -Nru libcapi20-3-3.27/debian/libcapi20-3.docs 
libcapi20-3-3.27/debian/libcapi20-3.docs
--- libcapi20-3-3.27/debian/libcapi20-3.docs    2011-11-10 01:35:09.000000000 
+0000
+++ libcapi20-3-3.27/debian/libcapi20-3.docs    1970-01-01 00:00:00.000000000 
+0000
@@ -1 +0,0 @@
-README
diff -Nru libcapi20-3-3.27/debian/libcapi20-3.install.in 
libcapi20-3-3.27/debian/libcapi20-3.install.in
--- libcapi20-3-3.27/debian/libcapi20-3.install.in      2014-04-25 
06:50:57.000000000 +0000
+++ libcapi20-3-3.27/debian/libcapi20-3.install.in      1970-01-01 
00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-usr/lib/@DEB_HOST_MULTIARCH@/libcapi20.so.* usr/lib/@DEB_HOST_MULTIARCH@/
-usr/lib/@DEB_HOST_MULTIARCH@/capi/*.so*     usr/lib/@DEB_HOST_MULTIARCH@/capi/
diff -Nru libcapi20-3-3.27/debian/libcapi20-3.README.Debian 
libcapi20-3-3.27/debian/libcapi20-3.README.Debian
--- libcapi20-3-3.27/debian/libcapi20-3.README.Debian   2014-04-07 
04:29:08.000000000 +0000
+++ libcapi20-3-3.27/debian/libcapi20-3.README.Debian   1970-01-01 
00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-The libcapi20-3 package was carved out from the long-established isdnutils
-package for easier maintenance in March 2014.  Feel free to consult isdnutils
-history to learn more about how things evolved prior to that date.
-
-It may become necessary to debug libcapi20. Debian builds the package without
-debug information for performance reasons.  Below patch will compile the
-library with debug information.
-
-diff --git a/capi20/capi20.c b/capi20/capi20.c
-index ab8c1c6..81b5c5c 100644
---- a/capi20/capi20.c
-+++ b/capi20/capi20.c
-@@ -61,7 +61,7 @@ static int tracelevel;
- static char *tracefile;
-
- /** debug level, for debugging purpose */
--static int nDebugLevel = 0;
-+static int nDebugLevel = 0xFFFF;
-
- /**
-  * \brief CapiDebug output functions
diff -Nru libcapi20-3-3.27/debian/libcapi20-3.shlibs 
libcapi20-3-3.27/debian/libcapi20-3.shlibs
--- libcapi20-3-3.27/debian/libcapi20-3.shlibs  2014-04-01 03:31:36.000000000 
+0000
+++ libcapi20-3-3.27/debian/libcapi20-3.shlibs  1970-01-01 00:00:00.000000000 
+0000
@@ -1 +0,0 @@
-libcapi20 3 libcapi20-3
diff -Nru libcapi20-3-3.27/debian/libcapi20-3t64.docs 
libcapi20-3-3.27/debian/libcapi20-3t64.docs
--- libcapi20-3-3.27/debian/libcapi20-3t64.docs 1970-01-01 00:00:00.000000000 
+0000
+++ libcapi20-3-3.27/debian/libcapi20-3t64.docs 2011-11-10 01:35:09.000000000 
+0000
@@ -0,0 +1 @@
+README
diff -Nru libcapi20-3-3.27/debian/libcapi20-3t64.install.in 
libcapi20-3-3.27/debian/libcapi20-3t64.install.in
--- libcapi20-3-3.27/debian/libcapi20-3t64.install.in   1970-01-01 
00:00:00.000000000 +0000
+++ libcapi20-3-3.27/debian/libcapi20-3t64.install.in   2024-02-29 
10:33:27.000000000 +0000
@@ -0,0 +1,2 @@
+usr/lib/@DEB_HOST_MULTIARCH@/libcapi20.so.* usr/lib/@DEB_HOST_MULTIARCH@/
+usr/lib/@DEB_HOST_MULTIARCH@/capi/*.so*     usr/lib/@DEB_HOST_MULTIARCH@/capi/
diff -Nru libcapi20-3-3.27/debian/libcapi20-3t64.lintian-overrides 
libcapi20-3-3.27/debian/libcapi20-3t64.lintian-overrides
--- libcapi20-3-3.27/debian/libcapi20-3t64.lintian-overrides    1970-01-01 
00:00:00.000000000 +0000
+++ libcapi20-3-3.27/debian/libcapi20-3t64.lintian-overrides    2024-02-29 
10:20:56.000000000 +0000
@@ -0,0 +1 @@
+libcapi20-3t64: package-name-doesnt-match-sonames libcapi20-3
diff -Nru libcapi20-3-3.27/debian/libcapi20-3t64.README.Debian 
libcapi20-3-3.27/debian/libcapi20-3t64.README.Debian
--- libcapi20-3-3.27/debian/libcapi20-3t64.README.Debian        1970-01-01 
00:00:00.000000000 +0000
+++ libcapi20-3-3.27/debian/libcapi20-3t64.README.Debian        2014-04-07 
04:29:08.000000000 +0000
@@ -0,0 +1,21 @@
+The libcapi20-3 package was carved out from the long-established isdnutils
+package for easier maintenance in March 2014.  Feel free to consult isdnutils
+history to learn more about how things evolved prior to that date.
+
+It may become necessary to debug libcapi20. Debian builds the package without
+debug information for performance reasons.  Below patch will compile the
+library with debug information.
+
+diff --git a/capi20/capi20.c b/capi20/capi20.c
+index ab8c1c6..81b5c5c 100644
+--- a/capi20/capi20.c
++++ b/capi20/capi20.c
+@@ -61,7 +61,7 @@ static int tracelevel;
+ static char *tracefile;
+
+ /** debug level, for debugging purpose */
+-static int nDebugLevel = 0;
++static int nDebugLevel = 0xFFFF;
+
+ /**
+  * \brief CapiDebug output functions
diff -Nru libcapi20-3-3.27/debian/libcapi20-3t64.shlibs 
libcapi20-3-3.27/debian/libcapi20-3t64.shlibs
--- libcapi20-3-3.27/debian/libcapi20-3t64.shlibs       1970-01-01 
00:00:00.000000000 +0000
+++ libcapi20-3-3.27/debian/libcapi20-3t64.shlibs       2024-02-29 
10:20:56.000000000 +0000
@@ -0,0 +1 @@
+libcapi20 3 libcapi20-3t64
diff -Nru libcapi20-3-3.27/debian/rules libcapi20-3-3.27/debian/rules
--- libcapi20-3-3.27/debian/rules       2014-04-07 04:29:08.000000000 +0000
+++ libcapi20-3-3.27/debian/rules       2024-02-29 10:31:51.000000000 +0000
@@ -24,4 +24,4 @@
        dh_link
 
 override_dh_shlibdeps:
-       dh_shlibdeps -L libcapi20-3 -l 
debian/libcapi20-3/usr/lib/$(DEB_HOST_MULTIARCH)
+       dh_shlibdeps -L libcapi20-3t64 -l 
debian/libcapi20-3t64/usr/lib/$(DEB_HOST_MULTIARCH)

Reply via email to