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 collectd-5.12.0/debian/.gitignore collectd-5.12.0/debian/.gitignore
--- collectd-5.12.0/debian/.gitignore   2024-02-04 20:09:33.000000000 +0000
+++ collectd-5.12.0/debian/.gitignore   1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-*.swp
diff -Nru collectd-5.12.0/debian/changelog collectd-5.12.0/debian/changelog
--- collectd-5.12.0/debian/changelog    2024-02-04 20:09:33.000000000 +0000
+++ collectd-5.12.0/debian/changelog    2024-02-28 17:04:03.000000000 +0000
@@ -1,3 +1,10 @@
+collectd (5.12.0-17.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1062094
+
+ -- Steve Langasek <[email protected]>  Wed, 28 Feb 2024 17:04:03 +0000
+
 collectd (5.12.0-17) unstable; urgency=medium
 
   * [lots of commits] adding some basic autopkgtest
diff -Nru collectd-5.12.0/debian/control collectd-5.12.0/debian/control
--- collectd-5.12.0/debian/control      2024-02-04 20:09:33.000000000 +0000
+++ collectd-5.12.0/debian/control      2024-02-28 17:04:03.000000000 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Collectd Packaging Team <[email protected]>
 Uploaders: Sebastian Harl <[email protected]>, Marc Fournier <[email protected]>, 
Bernd Zeimetz <[email protected]>
-Build-Depends: debhelper-compat (= 13), po-debconf, dh-strip-nondeterminism, 
dh-autoreconf,
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13), po-debconf, 
dh-strip-nondeterminism, dh-autoreconf,
  bison, flex, autotools-dev, libltdl-dev, pkg-config,
  default-libmysqlclient-dev [!kfreebsd-i386 !kfreebsd-amd64],
  intel-cmt-cat [amd64 i386],
@@ -284,7 +284,7 @@
 Package: libcollectdclient-dev
 Section: libdevel
 Architecture: any
-Depends: libcollectdclient1 (= ${binary:Version}), ${misc:Depends}
+Depends: libcollectdclient1t64 (= ${binary:Version}), ${misc:Depends}
 Description: client library for collectd's control interface (development 
files)
  libcollectdclient provides an API to access the control interface provided by
  the unixsock plugin of collectd, a statistics collection and monitoring
@@ -294,7 +294,10 @@
  .
  This package contains the header files and the static library.
 
-Package: libcollectdclient1
+Package: libcollectdclient1t64
+Provides: ${t64:Provides}
+Replaces: libcollectdclient1
+Breaks: libcollectdclient1 (<< ${source:Version})
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
diff -Nru collectd-5.12.0/debian/libcollectdclient1.install 
collectd-5.12.0/debian/libcollectdclient1.install
--- collectd-5.12.0/debian/libcollectdclient1.install   2024-02-04 
20:09:33.000000000 +0000
+++ collectd-5.12.0/debian/libcollectdclient1.install   1970-01-01 
00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-usr/lib/libcollectdclient.so.*
-
diff -Nru collectd-5.12.0/debian/libcollectdclient1.symbols 
collectd-5.12.0/debian/libcollectdclient1.symbols
--- collectd-5.12.0/debian/libcollectdclient1.symbols   2024-02-04 
20:09:33.000000000 +0000
+++ collectd-5.12.0/debian/libcollectdclient1.symbols   1970-01-01 
00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-libcollectdclient.so.1 libcollectdclient1 #MINVER#
- lcc_connect@Base 4.6.0
- lcc_disconnect@Base 4.6.0
- lcc_flush@Base 4.6.0
- lcc_getval@Base 4.6.0
- lcc_identifier_compare@Base 5.2.0
- lcc_identifier_to_string@Base 4.6.0
- lcc_listen_and_write@Base 5.8.0
- lcc_listval@Base 4.6.0
- lcc_network_buffer_add_value@Base 5.2.0
- lcc_network_buffer_create@Base 5.2.0
- lcc_network_buffer_destroy@Base 5.2.0
- lcc_network_buffer_finalize@Base 5.2.0
- lcc_network_buffer_get@Base 5.2.0
- lcc_network_buffer_initialize@Base 5.2.0
- lcc_network_buffer_set_security_level@Base 5.2.0
- lcc_network_create@Base 5.2.0
- lcc_network_destroy@Base 5.2.0
- lcc_network_parse@Base 5.8.0
- lcc_network_values_send@Base 5.2.0
- lcc_putval@Base 4.6.0
- lcc_server_create@Base 5.2.0
- lcc_server_destroy@Base 5.2.0
- lcc_server_set_interface@Base 5.5.0
- lcc_server_set_security_level@Base 5.2.0
- lcc_server_set_ttl@Base 5.2.0
- lcc_sort_identifiers@Base 5.1.0
- lcc_strerror@Base 4.6.0
- lcc_string_to_identifier@Base 4.6.0
- lcc_version@Base 4.6.0
- lcc_version_extra@Base 4.6.0
- lcc_version_string@Base 4.6.0
diff -Nru collectd-5.12.0/debian/libcollectdclient1t64.install 
collectd-5.12.0/debian/libcollectdclient1t64.install
--- collectd-5.12.0/debian/libcollectdclient1t64.install        1970-01-01 
00:00:00.000000000 +0000
+++ collectd-5.12.0/debian/libcollectdclient1t64.install        2024-02-04 
20:09:33.000000000 +0000
@@ -0,0 +1,2 @@
+usr/lib/libcollectdclient.so.*
+
diff -Nru collectd-5.12.0/debian/libcollectdclient1t64.lintian-overrides 
collectd-5.12.0/debian/libcollectdclient1t64.lintian-overrides
--- collectd-5.12.0/debian/libcollectdclient1t64.lintian-overrides      
1970-01-01 00:00:00.000000000 +0000
+++ collectd-5.12.0/debian/libcollectdclient1t64.lintian-overrides      
2024-02-28 16:56:39.000000000 +0000
@@ -0,0 +1 @@
+libcollectdclient1t64: package-name-doesnt-match-sonames libcollectdclient1
diff -Nru collectd-5.12.0/debian/libcollectdclient1t64.symbols 
collectd-5.12.0/debian/libcollectdclient1t64.symbols
--- collectd-5.12.0/debian/libcollectdclient1t64.symbols        1970-01-01 
00:00:00.000000000 +0000
+++ collectd-5.12.0/debian/libcollectdclient1t64.symbols        2024-02-28 
16:56:39.000000000 +0000
@@ -0,0 +1,32 @@
+libcollectdclient.so.1 libcollectdclient1t64 #MINVER#
+ lcc_connect@Base 4.6.0
+ lcc_disconnect@Base 4.6.0
+ lcc_flush@Base 4.6.0
+ lcc_getval@Base 4.6.0
+ lcc_identifier_compare@Base 5.2.0
+ lcc_identifier_to_string@Base 4.6.0
+ lcc_listen_and_write@Base 5.8.0
+ lcc_listval@Base 4.6.0
+ lcc_network_buffer_add_value@Base 5.2.0
+ lcc_network_buffer_create@Base 5.2.0
+ lcc_network_buffer_destroy@Base 5.2.0
+ lcc_network_buffer_finalize@Base 5.2.0
+ lcc_network_buffer_get@Base 5.2.0
+ lcc_network_buffer_initialize@Base 5.2.0
+ lcc_network_buffer_set_security_level@Base 5.2.0
+ lcc_network_create@Base 5.2.0
+ lcc_network_destroy@Base 5.2.0
+ lcc_network_parse@Base 5.8.0
+ lcc_network_values_send@Base 5.2.0
+ lcc_putval@Base 4.6.0
+ lcc_server_create@Base 5.2.0
+ lcc_server_destroy@Base 5.2.0
+ lcc_server_set_interface@Base 5.5.0
+ lcc_server_set_security_level@Base 5.2.0
+ lcc_server_set_ttl@Base 5.2.0
+ lcc_sort_identifiers@Base 5.1.0
+ lcc_strerror@Base 4.6.0
+ lcc_string_to_identifier@Base 4.6.0
+ lcc_version@Base 4.6.0
+ lcc_version_extra@Base 4.6.0
+ lcc_version_string@Base 4.6.0

Reply via email to