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-14-generic (SMP w/12 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=C, LC_CTYPE=C.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru linphone-5.2.0/debian/changelog linphone-5.2.0/debian/changelog
--- linphone-5.2.0/debian/changelog     2024-01-30 14:46:03.000000000 +0000
+++ linphone-5.2.0/debian/changelog     2024-03-01 06:40:46.000000000 +0000
@@ -1,3 +1,10 @@
+linphone (5.2.0-4.3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1062752
+
+ -- Steve Langasek <vor...@debian.org>  Fri, 01 Mar 2024 06:40:46 +0000
+
 linphone (5.2.0-4.2) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru linphone-5.2.0/debian/control linphone-5.2.0/debian/control
--- linphone-5.2.0/debian/control       2024-01-30 14:45:58.000000000 +0000
+++ linphone-5.2.0/debian/control       2024-03-01 06:40:46.000000000 +0000
@@ -6,11 +6,11 @@
            Tzafrir Cohen <tzaf...@debian.org>,
            Felix Lechner <felix.lech...@gmail.com>,
            Bernhard Schmidt <be...@debian.org>,
-Build-Depends: cmake,
+Build-Depends: dpkg-dev (>= 1.22.5), cmake,
                debhelper-compat (= 13),
                doxygen,
 Build-Depends-Indep: graphviz,
-Build-Depends-Arch: libbctoolbox-dev (>= 5.2.0~),
+Build-Depends-Arch: dpkg-dev (>= 1.22.5), libbctoolbox-dev (>= 5.2.0~),
                     libbelcard-dev (>= 5.2.0~),
                     libbellesip-dev (>= 5.2.0~),
                     libbelr-dev (>= 5.2.0~),
@@ -41,8 +41,8 @@
 
 Package: liblinphone-dev
 Section: libdevel
-Depends: liblinphone11 (= ${binary:Version}),
-         liblinphone++11 (= ${binary:Version}),
+Depends: liblinphone11t64 (= ${binary:Version}),
+         liblinphone++11t64 (= ${binary:Version}),
          libbelcard-dev (>= 5.2.0~),
          libbellesip-dev (>= 5.2.0~),
          libbelr-dev (>= 5.2.0~),
@@ -61,7 +61,10 @@
  This package contains the files needed to use the linphone's library in your
  programs.
 
-Package: liblinphone11
+Package: liblinphone11t64
+Provides: ${t64:Provides}
+Replaces: liblinphone11
+Breaks: liblinphone11 (<< ${source:Version})
 Section: libs
 Pre-Depends: ${misc:Pre-Depends},
 Depends: ${misc:Depends},
@@ -75,7 +78,10 @@
  .
  This package contains the shared runtime libraries.
 
-Package: liblinphone++11
+Package: liblinphone++11t64
+Provides: ${t64:Provides}
+Replaces: liblinphone++11
+Breaks: liblinphone++11 (<< ${source:Version})
 Section: libs
 Pre-Depends: ${misc:Pre-Depends},
 Depends: ${misc:Depends},
@@ -102,7 +108,7 @@
 
 Package: linphone-cli
 Depends: host,
-         liblinphone11 (= ${binary:Version}),
+         liblinphone11t64 (= ${binary:Version}),
          linphone-common (= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
diff -Nru linphone-5.2.0/debian/liblinphone++11.install 
linphone-5.2.0/debian/liblinphone++11.install
--- linphone-5.2.0/debian/liblinphone++11.install       2024-01-30 
14:41:40.000000000 +0000
+++ linphone-5.2.0/debian/liblinphone++11.install       1970-01-01 
00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/lib/*/liblinphone++.so.*
diff -Nru linphone-5.2.0/debian/liblinphone++11.shlibs 
linphone-5.2.0/debian/liblinphone++11.shlibs
--- linphone-5.2.0/debian/liblinphone++11.shlibs        2024-01-30 
14:41:40.000000000 +0000
+++ linphone-5.2.0/debian/liblinphone++11.shlibs        1970-01-01 
00:00:00.000000000 +0000
@@ -1 +0,0 @@
-liblinphone++ 11 liblinphone++11 (>= 5.2.0-1), liblinphone++11 (<< 5.3.0-1)
diff -Nru linphone-5.2.0/debian/liblinphone++11t64.install 
linphone-5.2.0/debian/liblinphone++11t64.install
--- linphone-5.2.0/debian/liblinphone++11t64.install    1970-01-01 
00:00:00.000000000 +0000
+++ linphone-5.2.0/debian/liblinphone++11t64.install    2024-01-30 
14:41:40.000000000 +0000
@@ -0,0 +1 @@
+usr/lib/*/liblinphone++.so.*
diff -Nru linphone-5.2.0/debian/liblinphone++11t64.lintian-overrides 
linphone-5.2.0/debian/liblinphone++11t64.lintian-overrides
--- linphone-5.2.0/debian/liblinphone++11t64.lintian-overrides  1970-01-01 
00:00:00.000000000 +0000
+++ linphone-5.2.0/debian/liblinphone++11t64.lintian-overrides  2024-03-01 
06:39:37.000000000 +0000
@@ -0,0 +1 @@
+liblinphone++11t64: package-name-doesnt-match-sonames liblinphone++11
diff -Nru linphone-5.2.0/debian/liblinphone++11t64.shlibs 
linphone-5.2.0/debian/liblinphone++11t64.shlibs
--- linphone-5.2.0/debian/liblinphone++11t64.shlibs     1970-01-01 
00:00:00.000000000 +0000
+++ linphone-5.2.0/debian/liblinphone++11t64.shlibs     2024-03-01 
06:39:37.000000000 +0000
@@ -0,0 +1 @@
+liblinphone++ 11 liblinphone++11t64 (>= 5.2.0-1), liblinphone++11t64 (<< 
5.3.0-1)
diff -Nru linphone-5.2.0/debian/liblinphone11.install 
linphone-5.2.0/debian/liblinphone11.install
--- linphone-5.2.0/debian/liblinphone11.install 2024-01-30 14:41:40.000000000 
+0000
+++ linphone-5.2.0/debian/liblinphone11.install 1970-01-01 00:00:00.000000000 
+0000
@@ -1 +0,0 @@
-usr/lib/*/liblinphone.so.*
diff -Nru linphone-5.2.0/debian/liblinphone11.shlibs 
linphone-5.2.0/debian/liblinphone11.shlibs
--- linphone-5.2.0/debian/liblinphone11.shlibs  2024-01-30 14:41:40.000000000 
+0000
+++ linphone-5.2.0/debian/liblinphone11.shlibs  1970-01-01 00:00:00.000000000 
+0000
@@ -1 +0,0 @@
-liblinphone 11 liblinphone11 (>= 5.2.0-1), liblinphone11 (<< 5.3.0-1)
diff -Nru linphone-5.2.0/debian/liblinphone11t64.install 
linphone-5.2.0/debian/liblinphone11t64.install
--- linphone-5.2.0/debian/liblinphone11t64.install      1970-01-01 
00:00:00.000000000 +0000
+++ linphone-5.2.0/debian/liblinphone11t64.install      2024-01-30 
14:41:40.000000000 +0000
@@ -0,0 +1 @@
+usr/lib/*/liblinphone.so.*
diff -Nru linphone-5.2.0/debian/liblinphone11t64.lintian-overrides 
linphone-5.2.0/debian/liblinphone11t64.lintian-overrides
--- linphone-5.2.0/debian/liblinphone11t64.lintian-overrides    1970-01-01 
00:00:00.000000000 +0000
+++ linphone-5.2.0/debian/liblinphone11t64.lintian-overrides    2024-03-01 
06:39:37.000000000 +0000
@@ -0,0 +1 @@
+liblinphone11t64: package-name-doesnt-match-sonames liblinphone11
diff -Nru linphone-5.2.0/debian/liblinphone11t64.shlibs 
linphone-5.2.0/debian/liblinphone11t64.shlibs
--- linphone-5.2.0/debian/liblinphone11t64.shlibs       1970-01-01 
00:00:00.000000000 +0000
+++ linphone-5.2.0/debian/liblinphone11t64.shlibs       2024-03-01 
06:39:37.000000000 +0000
@@ -0,0 +1 @@
+liblinphone 11 liblinphone11t64 (>= 5.2.0-1), liblinphone11t64 (<< 5.3.0-1)
diff -Nru linphone-5.2.0/debian/rules linphone-5.2.0/debian/rules
--- linphone-5.2.0/debian/rules 2024-01-30 14:41:40.000000000 +0000
+++ linphone-5.2.0/debian/rules 2024-03-01 06:40:46.000000000 +0000
@@ -29,7 +29,7 @@
 # setting CMAKE_SKIP_RPATH
 options += -DCMAKE_SKIP_RPATH=ON
 
-libpkgname := liblinphone11
+libpkgname := liblinphone11t64
 
 # this enables the unified call+chat database; it requires sqlite3 and
 # a version of libsoci-dev built with C++11 support

Reply via email to