[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1061881: akonadi-search: NMU diff for 64-bit time_t transition



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-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 akonadi-search-22.12.3/debian/changelog akonadi-search-22.12.3/debian/changelog
--- akonadi-search-22.12.3/debian/changelog	2023-03-01 20:32:14.000000000 +0000
+++ akonadi-search-22.12.3/debian/changelog	2024-02-28 00:39:18.000000000 +0000
@@ -1,3 +1,10 @@
+akonadi-search (4:22.12.3-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1061881
+
+ -- Steve Langasek <vorlon@debian.org>  Wed, 28 Feb 2024 00:39:18 +0000
+
 akonadi-search (4:22.12.3-1) unstable; urgency=medium
 
   [ Patrick Franz ]
diff -Nru akonadi-search-22.12.3/debian/control akonadi-search-22.12.3/debian/control
--- akonadi-search-22.12.3/debian/control	2023-03-01 18:27:15.000000000 +0000
+++ akonadi-search-22.12.3/debian/control	2024-02-28 00:39:18.000000000 +0000
@@ -4,7 +4,7 @@
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Sandro Knauß <hefee@debian.org>,
            Patrick Franz <deltaone@debian.org>,
-Build-Depends: cmake (>= 3.16~),
+Build-Depends: dpkg-dev (>= 1.22.5), cmake (>= 3.16~),
                debhelper-compat (= 13),
                extra-cmake-modules (>= 5.99.0~),
                gettext,
@@ -74,7 +74,9 @@
  .
  This package contains runtime plugins.
 
-Package: libkf5akonadisearchcore5
+Package: libkf5akonadisearchcore5t64
+Replaces: libkf5akonadisearchcore5
+Breaks: libkf5akonadisearchcore5 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Depends: libkf5akonadisearch-data (>= ${source:Version}),
@@ -85,18 +87,22 @@
 Description: Akonadi search core library
  Internal library used to search in the Akonadi PIM data server.
  This package contains the core library.
-Provides: ${ABI:VirtualPackage},
+Provides: ${t64:Provides}, ${ABI:VirtualPackage},
 
-Package: libkf5akonadisearchdebug5
+Package: libkf5akonadisearchdebug5t64
+Replaces: libkf5akonadisearchdebug5
+Breaks: libkf5akonadisearchdebug5 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends},
 Description: Akonadi search debug library
  Internal library used to search in the Akonadi PIM data server.
  This package contains the debug library.
-Provides: ${ABI:VirtualPackage},
+Provides: ${t64:Provides}, ${ABI:VirtualPackage},
 
-Package: libkf5akonadisearchpim5
+Package: libkf5akonadisearchpim5t64
+Replaces: libkf5akonadisearchpim5
+Breaks: libkf5akonadisearchpim5 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends},
@@ -104,13 +110,15 @@
             libkf5akonadisearch-plugins (= ${binary:Version}),
 Description: Akonadi search library
  Library used to search in the Akonadi PIM data server.
-Provides: ${ABI:VirtualPackage},
+Provides: ${t64:Provides}, ${ABI:VirtualPackage},
 
-Package: libkf5akonadisearchxapian5
+Package: libkf5akonadisearchxapian5t64
+Replaces: libkf5akonadisearchxapian5
+Breaks: libkf5akonadisearchxapian5 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends},
 Description: Akonadi search xapian library
  Internal library used to search in the Akonadi PIM data server.
  This package contains the xapian library.
-Provides: ${ABI:VirtualPackage},
+Provides: ${t64:Provides}, ${ABI:VirtualPackage},
diff -Nru akonadi-search-22.12.3/debian/libkf5akonadisearchcore5.install akonadi-search-22.12.3/debian/libkf5akonadisearchcore5.install
--- akonadi-search-22.12.3/debian/libkf5akonadisearchcore5.install	2022-12-20 00:37:22.000000000 +0000
+++ akonadi-search-22.12.3/debian/libkf5akonadisearchcore5.install	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-usr/lib/*/libKF5AkonadiSearchCore.so.5
-usr/lib/*/libKF5AkonadiSearchCore.so.5.*
diff -Nru akonadi-search-22.12.3/debian/libkf5akonadisearchcore5t64.install akonadi-search-22.12.3/debian/libkf5akonadisearchcore5t64.install
--- akonadi-search-22.12.3/debian/libkf5akonadisearchcore5t64.install	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-search-22.12.3/debian/libkf5akonadisearchcore5t64.install	2022-12-20 00:37:22.000000000 +0000
@@ -0,0 +1,2 @@
+usr/lib/*/libKF5AkonadiSearchCore.so.5
+usr/lib/*/libKF5AkonadiSearchCore.so.5.*
diff -Nru akonadi-search-22.12.3/debian/libkf5akonadisearchcore5t64.lintian-overrides akonadi-search-22.12.3/debian/libkf5akonadisearchcore5t64.lintian-overrides
--- akonadi-search-22.12.3/debian/libkf5akonadisearchcore5t64.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-search-22.12.3/debian/libkf5akonadisearchcore5t64.lintian-overrides	2024-02-28 00:36:22.000000000 +0000
@@ -0,0 +1 @@
+libkf5akonadisearchcore5t64: package-name-doesnt-match-sonames libkf5akonadisearchcore5
diff -Nru akonadi-search-22.12.3/debian/libkf5akonadisearchdebug5.install akonadi-search-22.12.3/debian/libkf5akonadisearchdebug5.install
--- akonadi-search-22.12.3/debian/libkf5akonadisearchdebug5.install	2022-12-20 00:37:22.000000000 +0000
+++ akonadi-search-22.12.3/debian/libkf5akonadisearchdebug5.install	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-usr/lib/*/libKF5AkonadiSearchDebug.so.5
-usr/lib/*/libKF5AkonadiSearchDebug.so.5.*
diff -Nru akonadi-search-22.12.3/debian/libkf5akonadisearchdebug5t64.install akonadi-search-22.12.3/debian/libkf5akonadisearchdebug5t64.install
--- akonadi-search-22.12.3/debian/libkf5akonadisearchdebug5t64.install	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-search-22.12.3/debian/libkf5akonadisearchdebug5t64.install	2022-12-20 00:37:22.000000000 +0000
@@ -0,0 +1,2 @@
+usr/lib/*/libKF5AkonadiSearchDebug.so.5
+usr/lib/*/libKF5AkonadiSearchDebug.so.5.*
diff -Nru akonadi-search-22.12.3/debian/libkf5akonadisearchdebug5t64.lintian-overrides akonadi-search-22.12.3/debian/libkf5akonadisearchdebug5t64.lintian-overrides
--- akonadi-search-22.12.3/debian/libkf5akonadisearchdebug5t64.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-search-22.12.3/debian/libkf5akonadisearchdebug5t64.lintian-overrides	2024-02-28 00:36:22.000000000 +0000
@@ -0,0 +1 @@
+libkf5akonadisearchdebug5t64: package-name-doesnt-match-sonames libkf5akonadisearchdebug5
diff -Nru akonadi-search-22.12.3/debian/libkf5akonadisearchpim5.install akonadi-search-22.12.3/debian/libkf5akonadisearchpim5.install
--- akonadi-search-22.12.3/debian/libkf5akonadisearchpim5.install	2022-12-20 00:37:22.000000000 +0000
+++ akonadi-search-22.12.3/debian/libkf5akonadisearchpim5.install	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-usr/lib/*/libKF5AkonadiSearchPIM.so.5
-usr/lib/*/libKF5AkonadiSearchPIM.so.5.*
diff -Nru akonadi-search-22.12.3/debian/libkf5akonadisearchpim5t64.install akonadi-search-22.12.3/debian/libkf5akonadisearchpim5t64.install
--- akonadi-search-22.12.3/debian/libkf5akonadisearchpim5t64.install	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-search-22.12.3/debian/libkf5akonadisearchpim5t64.install	2022-12-20 00:37:22.000000000 +0000
@@ -0,0 +1,2 @@
+usr/lib/*/libKF5AkonadiSearchPIM.so.5
+usr/lib/*/libKF5AkonadiSearchPIM.so.5.*
diff -Nru akonadi-search-22.12.3/debian/libkf5akonadisearchpim5t64.lintian-overrides akonadi-search-22.12.3/debian/libkf5akonadisearchpim5t64.lintian-overrides
--- akonadi-search-22.12.3/debian/libkf5akonadisearchpim5t64.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-search-22.12.3/debian/libkf5akonadisearchpim5t64.lintian-overrides	2024-02-28 00:36:22.000000000 +0000
@@ -0,0 +1 @@
+libkf5akonadisearchpim5t64: package-name-doesnt-match-sonames libkf5akonadisearchpim5
diff -Nru akonadi-search-22.12.3/debian/libkf5akonadisearchxapian5.install akonadi-search-22.12.3/debian/libkf5akonadisearchxapian5.install
--- akonadi-search-22.12.3/debian/libkf5akonadisearchxapian5.install	2022-12-20 00:37:22.000000000 +0000
+++ akonadi-search-22.12.3/debian/libkf5akonadisearchxapian5.install	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-usr/lib/*/libKF5AkonadiSearchXapian.so.5
-usr/lib/*/libKF5AkonadiSearchXapian.so.5.*
diff -Nru akonadi-search-22.12.3/debian/libkf5akonadisearchxapian5t64.install akonadi-search-22.12.3/debian/libkf5akonadisearchxapian5t64.install
--- akonadi-search-22.12.3/debian/libkf5akonadisearchxapian5t64.install	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-search-22.12.3/debian/libkf5akonadisearchxapian5t64.install	2022-12-20 00:37:22.000000000 +0000
@@ -0,0 +1,2 @@
+usr/lib/*/libKF5AkonadiSearchXapian.so.5
+usr/lib/*/libKF5AkonadiSearchXapian.so.5.*
diff -Nru akonadi-search-22.12.3/debian/libkf5akonadisearchxapian5t64.lintian-overrides akonadi-search-22.12.3/debian/libkf5akonadisearchxapian5t64.lintian-overrides
--- akonadi-search-22.12.3/debian/libkf5akonadisearchxapian5t64.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-search-22.12.3/debian/libkf5akonadisearchxapian5t64.lintian-overrides	2024-02-28 00:36:22.000000000 +0000
@@ -0,0 +1 @@
+libkf5akonadisearchxapian5t64: package-name-doesnt-match-sonames libkf5akonadisearchxapian5

Reply to: