Bug#1063051: vnlog: NMU diff for 64-bit time_t transition

Wed Feb 28 23:19:33 GMT 2024

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)
-------------- next part --------------
diff -Nru vnlog-1.36/debian/changelog vnlog-1.36/debian/changelog

--- vnlog-1.36/debian/changelog	2024-01-09 05:22:52.000000000 +0000
+++ vnlog-1.36/debian/changelog	2024-02-28 23:19:22.000000000 +0000
@@ -1,3 +1,10 @@
+vnlog (1.36-4.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1063051
+
+ -- Steve Langasek <vorlon at debian.org>  Wed, 28 Feb 2024 23:19:22 +0000
+
 vnlog (1.36-4) unstable; urgency=medium
 
   * More thorough "clean" (Closes: #1047392)
diff -Nru vnlog-1.36/debian/control vnlog-1.36/debian/control
--- vnlog-1.36/debian/control	2023-06-19 19:53:11.000000000 +0000
+++ vnlog-1.36/debian/control	2024-02-28 23:19:22.000000000 +0000
@@ -1,7 +1,7 @@
 Source: vnlog
 Priority: optional
 Section: devel
-Build-Depends: debhelper-compat (= 11),
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 11),
  mrbuild,
  dh-python,
  python3:any,
@@ -20,7 +20,10 @@
 Vcs-Browser: https://salsa.debian.org/science-team/vnlog
 Testsuite: autopkgtest-pkg-python
 
-Package: libvnlog0
+Package: libvnlog0t64
+Provides: ${t64:Provides}
+Replaces: libvnlog0
+Breaks: libvnlog0 (<< ${source:Version})
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -34,7 +37,7 @@
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: ${misc:Depends}, libvnlog0 (= ${binary:Version}), ${perl:Depends}
+Depends: ${misc:Depends}, libvnlog0t64 (= ${binary:Version}), ${perl:Depends}
 Description: Toolkit to read/write/manipulate whitespace-separated ASCII logs
  Vnlog is a trivially-simple log format consisting of an ASCII table with
  comments and labelled fields. This package provides a C library that simplifies
diff -Nru vnlog-1.36/debian/libvnlog0.install vnlog-1.36/debian/libvnlog0.install
--- vnlog-1.36/debian/libvnlog0.install	2020-06-04 03:10:44.000000000 +0000
+++ vnlog-1.36/debian/libvnlog0.install	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-/usr/lib/*/*.so.*
diff -Nru vnlog-1.36/debian/libvnlog0.symbols vnlog-1.36/debian/libvnlog0.symbols
--- vnlog-1.36/debian/libvnlog0.symbols	2023-06-19 19:56:03.000000000 +0000
+++ vnlog-1.36/debian/libvnlog0.symbols	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-libvnlog.so.0 libvnlog0 #MINVER#
- _vnlog_clear_fields_ctx at libvnlog.so.0 1.5
- _vnlog_emit_legend at libvnlog.so.0 1.5
- _vnlog_emit_record at libvnlog.so.0 1.5
- _vnlog_flush at libvnlog.so.0 1.5
- _vnlog_free_ctx at libvnlog.so.0 1.5
- _vnlog_init_child_ctx at libvnlog.so.0 1.5
- _vnlog_init_session_ctx at libvnlog.so.0 1.5
- _vnlog_printf at libvnlog.so.0 1.5
- _vnlog_set_field_value_binary at libvnlog.so.0 1.5
- _vnlog_set_field_value_ccharp at libvnlog.so.0 1.6
- _vnlog_set_field_value_char at libvnlog.so.0 1.6
- _vnlog_set_field_value_charp at libvnlog.so.0 1.6
- _vnlog_set_field_value_double at libvnlog.so.0 1.5
- _vnlog_set_field_value_float at libvnlog.so.0 1.6
- _vnlog_set_field_value_int16_t at libvnlog.so.0 1.6
- _vnlog_set_field_value_int32_t at libvnlog.so.0 1.6
- _vnlog_set_field_value_int64_t at libvnlog.so.0 1.6
- _vnlog_set_field_value_int8_t at libvnlog.so.0 1.6
- _vnlog_set_field_value_int at libvnlog.so.0 1.5
- _vnlog_set_field_value_uint16_t at libvnlog.so.0 1.6
- _vnlog_set_field_value_uint32_t at libvnlog.so.0 1.6
- _vnlog_set_field_value_uint64_t at libvnlog.so.0 1.6
- _vnlog_set_field_value_uint8_t at libvnlog.so.0 1.6
- _vnlog_set_field_value_unsigned at libvnlog.so.0 1.6
- _vnlog_set_field_value_unsignedint at libvnlog.so.0 1.6
- libvnlog.so.0 at libvnlog.so.0 1.5
- vnlog_base64_encode at libvnlog.so.0 1.21
- vnlog_parser_free at libvnlog.so.0 1.35
- vnlog_parser_init at libvnlog.so.0 1.35
- vnlog_parser_read_record at libvnlog.so.0 1.35
- vnlog_parser_record_from_key at libvnlog.so.0 1.35
- vnlog_set_output_FILE at libvnlog.so.0 1.5
- _vnlog_set_output_FILE at libvnlog.so.0 1.27
diff -Nru vnlog-1.36/debian/libvnlog0t64.install vnlog-1.36/debian/libvnlog0t64.install
--- vnlog-1.36/debian/libvnlog0t64.install	1970-01-01 00:00:00.000000000 +0000
+++ vnlog-1.36/debian/libvnlog0t64.install	2020-06-04 03:10:44.000000000 +0000
@@ -0,0 +1 @@
+/usr/lib/*/*.so.*
diff -Nru vnlog-1.36/debian/libvnlog0t64.lintian-overrides vnlog-1.36/debian/libvnlog0t64.lintian-overrides
--- vnlog-1.36/debian/libvnlog0t64.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ vnlog-1.36/debian/libvnlog0t64.lintian-overrides	2024-02-28 23:19:02.000000000 +0000
@@ -0,0 +1 @@
+libvnlog0t64: package-name-doesnt-match-sonames libvnlog0
diff -Nru vnlog-1.36/debian/libvnlog0t64.symbols vnlog-1.36/debian/libvnlog0t64.symbols
--- vnlog-1.36/debian/libvnlog0t64.symbols	1970-01-01 00:00:00.000000000 +0000
+++ vnlog-1.36/debian/libvnlog0t64.symbols	2024-02-28 23:19:02.000000000 +0000
@@ -0,0 +1,34 @@
+libvnlog.so.0 libvnlog0t64 #MINVER#
+ _vnlog_clear_fields_ctx at libvnlog.so.0 1.5
+ _vnlog_emit_legend at libvnlog.so.0 1.5
+ _vnlog_emit_record at libvnlog.so.0 1.5
+ _vnlog_flush at libvnlog.so.0 1.5
+ _vnlog_free_ctx at libvnlog.so.0 1.5
+ _vnlog_init_child_ctx at libvnlog.so.0 1.5
+ _vnlog_init_session_ctx at libvnlog.so.0 1.5
+ _vnlog_printf at libvnlog.so.0 1.5
+ _vnlog_set_field_value_binary at libvnlog.so.0 1.5
+ _vnlog_set_field_value_ccharp at libvnlog.so.0 1.6
+ _vnlog_set_field_value_char at libvnlog.so.0 1.6
+ _vnlog_set_field_value_charp at libvnlog.so.0 1.6
+ _vnlog_set_field_value_double at libvnlog.so.0 1.5
+ _vnlog_set_field_value_float at libvnlog.so.0 1.6
+ _vnlog_set_field_value_int16_t at libvnlog.so.0 1.6
+ _vnlog_set_field_value_int32_t at libvnlog.so.0 1.6
+ _vnlog_set_field_value_int64_t at libvnlog.so.0 1.6
+ _vnlog_set_field_value_int8_t at libvnlog.so.0 1.6
+ _vnlog_set_field_value_int at libvnlog.so.0 1.5
+ _vnlog_set_field_value_uint16_t at libvnlog.so.0 1.6
+ _vnlog_set_field_value_uint32_t at libvnlog.so.0 1.6
+ _vnlog_set_field_value_uint64_t at libvnlog.so.0 1.6
+ _vnlog_set_field_value_uint8_t at libvnlog.so.0 1.6
+ _vnlog_set_field_value_unsigned at libvnlog.so.0 1.6
+ _vnlog_set_field_value_unsignedint at libvnlog.so.0 1.6
+ libvnlog.so.0 at libvnlog.so.0 1.5
+ vnlog_base64_encode at libvnlog.so.0 1.21
+ vnlog_parser_free at libvnlog.so.0 1.35
+ vnlog_parser_init at libvnlog.so.0 1.35
+ vnlog_parser_read_record at libvnlog.so.0 1.35
+ vnlog_parser_record_from_key at libvnlog.so.0 1.35
+ vnlog_set_output_FILE at libvnlog.so.0 1.5
+ _vnlog_set_output_FILE at libvnlog.so.0 1.27
