Bug#1061900: comedilib: NMU diff for 64-bit time_t transition

[Steve Langasek]

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 comedilib-0.11.0+5/debian/changelog 
comedilib-0.11.0+5/debian/changelog
--- comedilib-0.11.0+5/debian/changelog 2020-07-25 08:48:45.000000000 +0000
+++ comedilib-0.11.0+5/debian/changelog 2024-02-28 17:26:26.000000000 +0000
@@ -1,3 +1,10 @@
+comedilib (0.11.0+5-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1061900
+
+ -- Steve Langasek <vor...@debian.org>  Wed, 28 Feb 2024 17:26:26 +0000
+
 comedilib (0.11.0+5-1) unstable; urgency=medium
 
   * Add gbp.conf
diff -Nru comedilib-0.11.0+5/debian/control comedilib-0.11.0+5/debian/control
--- comedilib-0.11.0+5/debian/control   2020-07-25 08:48:45.000000000 +0000
+++ comedilib-0.11.0+5/debian/control   2024-02-28 17:26:26.000000000 +0000
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Gudjon I. Gudjonsson <gud...@gudjon.org>
-Build-Depends: debhelper (>= 13~),
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper (>= 13~),
                dh-python,
                dpkg-dev (>= 1.16.1~), 
                swig, 
@@ -26,7 +26,7 @@
 Package: libcomedi-dev
 Section: libdevel
 Architecture: any
-Depends: libcomedi0 (= ${binary:Version}), 
+Depends: libcomedi0t64 (= ${binary:Version}), 
          ${misc:Depends}
 Description: Development library for Comedi
  Comedilib is a library for using Comedi, a driver interface for data
@@ -37,7 +37,10 @@
  only need to install it if you plan to develop or compile software
  that uses Comedilib.
 
-Package: libcomedi0
+Package: libcomedi0t64
+Provides: ${t64:Provides}
+Replaces: libcomedi0
+Breaks: libcomedi0 (<< ${source:Version})
 Section: libs
 Architecture: any
 Depends: ${misc:Depends}, 
@@ -69,6 +72,6 @@
 Provides: ${python3:Provides}
 Description: Python3 wrapper for Comedilib
  Comedilib is a library for using Comedi, a driver interface for data
- acquisition hardware.  See the libcomedi0 package for more information.
+ acquisition hardware.  See the libcomedi0t64 package for more information.
  .
  This package provides Python3 bindings to the comedi library.
diff -Nru comedilib-0.11.0+5/debian/libcomedi0.dirs 
comedilib-0.11.0+5/debian/libcomedi0.dirs
--- comedilib-0.11.0+5/debian/libcomedi0.dirs   2020-07-25 08:48:45.000000000 
+0000
+++ comedilib-0.11.0+5/debian/libcomedi0.dirs   1970-01-01 00:00:00.000000000 
+0000
@@ -1,10 +0,0 @@
-usr/lib/
-usr/sbin/
-#usr/lib/ruby/1.8/local/lib/site_ruby/1.8/
-usr/share/man/man1/
-usr/share/man/man7/
-usr/share/man/man8/
-usr/share/doc/libcomedi0/
-etc/pcmcia/
-lib/udev/rules.d/
-var/lib/comedi/calibrations
diff -Nru comedilib-0.11.0+5/debian/libcomedi0.install 
comedilib-0.11.0+5/debian/libcomedi0.install
--- comedilib-0.11.0+5/debian/libcomedi0.install        2020-07-25 
08:48:45.000000000 +0000
+++ comedilib-0.11.0+5/debian/libcomedi0.install        1970-01-01 
00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-usr/lib/libcomedi.so.*
-#usr/lib/ruby/*
-usr/sbin/comedi_config
-usr/bin/comedi_calibrate
-usr/bin/comedi_soft_calibrate
-usr/bin/comedi_test
-usr/bin/comedi_board_info
-usr/share/man/man1/*
-usr/share/man/man7/*
-usr/share/man/man8/*
-usr/share/doc/comedilib/*.conf usr/share/doc/libcomedi0/
-etc/pcmcia/*
-lib/udev/*
-
diff -Nru comedilib-0.11.0+5/debian/libcomedi0.postinst 
comedilib-0.11.0+5/debian/libcomedi0.postinst
--- comedilib-0.11.0+5/debian/libcomedi0.postinst       2020-07-25 
08:48:45.000000000 +0000
+++ comedilib-0.11.0+5/debian/libcomedi0.postinst       1970-01-01 
00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-set -e
-
-test $DEBIAN_SCRIPT_DEBUG && set -v -x
-
-case "$1" in
-  configure|upgrade)
-
-  echo "creating iocard group..."
-  getent group iocard >/dev/null || addgroup --system iocard
-  ;;
-
-  abort-upgrade|abort-remove|abort-deconfigure)
-  ;;
-
-  *)
-    echo "postinst called with unknown argument \`$1'" >&2
-    exit 1
-  ;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff -Nru comedilib-0.11.0+5/debian/libcomedi0.symbols 
comedilib-0.11.0+5/debian/libcomedi0.symbols
--- comedilib-0.11.0+5/debian/libcomedi0.symbols        2020-07-25 
08:48:45.000000000 +0000
+++ comedilib-0.11.0+5/debian/libcomedi0.symbols        1970-01-01 
00:00:00.000000000 +0000
@@ -1,113 +0,0 @@
-libcomedi.so.0 libcomedi0 #MINVER#
-* Build-Depends-Package: libcomedi-dev
- comedi_apply_calibration@v0.7.20 0.8.1
- comedi_apply_parsed_calibration@v0.7.20 0.8.1
- comedi_arm@v0.9.0 0.10.0
- comedi_arm_channel@v0.11.0 0.11.0
- comedi_cancel@v0.7.18 0.8.1
- comedi_cleanup_calibration@v0.7.20 0.8.1
- comedi_close@v0.7.18 0.8.1
- comedi_command@v0.7.18 0.8.1
- comedi_command_test@v0.7.18 0.8.1
- comedi_data_read@v0.7.18 0.8.1
- comedi_data_read_delayed@v0.7.19 0.8.1
- comedi_data_read_hint@v0.7.19 0.8.1
- comedi_data_read_n@v0.7.18 0.8.1
- comedi_data_write@v0.7.18 0.8.1
- comedi_digital_trigger_disable@v0.11.0 0.11.0
- comedi_digital_trigger_enable_edges@v0.11.0 0.11.0
- comedi_digital_trigger_enable_levels@v0.11.0 0.11.0
- comedi_dio_bitfield2@v0.8.0 0.8.1
- comedi_dio_bitfield@v0.7.18 0.8.1
- comedi_dio_config@v0.7.18 0.8.1
- comedi_dio_get_config@v0.8.0 0.8.1
- comedi_dio_read@v0.7.18 0.8.1
- comedi_dio_write@v0.7.18 0.8.1
- comedi_disarm@v0.11.0 0.11.0
- comedi_disarm_channel@v0.11.0 0.11.0
- comedi_do_insn@v0.7.18 0.8.1
- comedi_do_insnlist@v0.7.18 0.8.1
- comedi_errno@v0.7.18 0.8.1
- comedi_fileno@v0.7.18 0.8.1
- comedi_find_range@v0.7.18 0.8.1
- comedi_find_subdevice_by_type@v0.7.18 0.8.1
- comedi_from_phys@v0.7.18 0.8.1
- comedi_from_physical@v0.8.0 0.8.1
- comedi_get_board_name@v0.7.18 0.8.1
- comedi_get_buffer_contents@v0.7.18 0.8.1
- comedi_get_buffer_offset@v0.7.18 0.8.1
- comedi_get_buffer_read_count@v0.11.0 0.11.0
- comedi_get_buffer_read_offset@v0.11.0 0.11.0
- comedi_get_buffer_size@v0.7.18 0.8.1
- comedi_get_buffer_write_count@v0.11.0 0.11.0
- comedi_get_buffer_write_offset@v0.11.0 0.11.0
- comedi_get_clock_source@v0.10.0 0.10.0
- comedi_get_clock_source@v0.9.0 0.10.0
- comedi_get_cmd_generic_timed@v0.7.18 0.8.1
- comedi_get_cmd_generic_timed@v0.9.0 0.8.1
- comedi_get_cmd_src_mask@v0.7.18 0.8.1
- comedi_get_default_calibration_path@v0.7.20 0.8.1
- comedi_get_driver_name@v0.7.18 0.8.1
- comedi_get_front_count@v0.7.18 0.8.1
- comedi_get_gate_source@v0.9.0 0.10.0
- comedi_get_hardcal_converter@v0.8.0 0.8.1
- comedi_get_hardware_buffer_size@v0.9.0 0.10.0
- comedi_get_max_buffer_size@v0.7.18 0.8.1
- comedi_get_maxdata@v0.7.18 0.8.1
- comedi_get_n_channels@v0.7.18 0.8.1
- comedi_get_n_ranges@v0.7.18 0.8.1
- comedi_get_n_subdevices@v0.7.18 0.8.1
- comedi_get_range@v0.7.18 0.8.1
- comedi_get_rangetype@v0.7.18 0.8.1
- comedi_get_read_subdevice@v0.7.19 0.8.1
- comedi_get_routing@v0.9.0 0.10.0
- comedi_get_softcal_converter@v0.8.0 0.8.1
- comedi_get_subdevice_flags@v0.7.18 0.8.1
- comedi_get_subdevice_flags@v0.8.0 0.8.1
- comedi_get_subdevice_type@v0.7.18 0.8.1
- comedi_get_timer@v0.7.18 0.8.1
- comedi_get_version_code@v0.7.18 0.8.1
- comedi_get_write_subdevice@v0.7.19 0.8.1
- comedi_internal_trigger@v0.9.0 0.10.0
- comedi_lock@v0.7.18 0.8.1
- comedi_loglevel@v0.7.18 0.8.1
- comedi_mark_buffer_read@v0.7.18 0.8.1
- comedi_mark_buffer_written@v0.8.0 0.8.1
- comedi_maxdata_is_chan_specific@v0.7.18 0.8.1
- comedi_open@v0.7.18 0.8.1
- comedi_parse_calibration_file@v0.7.20 0.8.1
- comedi_perror@v0.7.18 0.8.1
- comedi_poll@v0.7.18 0.8.1
- comedi_range_is_chan_specific@v0.7.18 0.8.1
- comedi_reset@v0.9.0 0.10.0
- comedi_reset_channel@v0.11.0 0.11.0
- comedi_sampl_from_phys@v0.7.18 0.8.1
- comedi_sampl_to_phys@v0.7.18 0.8.1
- comedi_set_buffer_size@v0.7.18 0.8.1
- comedi_set_clock_source@v0.10.0 0.10.0
- comedi_set_clock_source@v0.9.0 0.10.0
- comedi_set_counter_mode@v0.9.0 0.10.0
- comedi_set_filter@v0.9.0 0.10.0
- comedi_set_gate_source@v0.9.0 0.10.0
- comedi_set_global_oor_behavior@v0.7.18 0.8.1
- comedi_set_max_buffer_size@v0.7.18 0.8.1
- comedi_set_other_source@v0.9.0 0.10.0
- comedi_set_read_subdevice@v0.11.0 0.11.0
- comedi_set_routing@v0.9.0 0.10.0
- comedi_set_write_subdevice@v0.11.0 0.11.0
- comedi_strerror@v0.7.18 0.8.1
- comedi_sv_init@v0.7.18 0.8.1
- comedi_sv_measure@v0.7.18 0.8.1
- comedi_sv_update@v0.7.18 0.8.1
- comedi_timed_1chan@v0.7.18 0.8.1
- comedi_to_phys@v0.7.18 0.8.1
- comedi_to_physical@v0.8.0 0.8.1
- comedi_trigger@v0.7.18 0.8.1
- comedi_unlock@v0.7.18 0.8.1
- v0.10.0@v0.10.0 0.10.0
- v0.11.0@v0.11.0 0.11.0
- v0.7.18@v0.7.18 0.8.1
- v0.7.19@v0.7.19 0.8.1
- v0.7.20@v0.7.20 0.8.1
- v0.8.0@v0.8.0 0.8.1
- v0.9.0@v0.9.0 0.8.1
diff -Nru comedilib-0.11.0+5/debian/libcomedi0t64.dirs 
comedilib-0.11.0+5/debian/libcomedi0t64.dirs
--- comedilib-0.11.0+5/debian/libcomedi0t64.dirs        1970-01-01 
00:00:00.000000000 +0000
+++ comedilib-0.11.0+5/debian/libcomedi0t64.dirs        2020-07-25 
08:48:45.000000000 +0000
@@ -0,0 +1,10 @@
+usr/lib/
+usr/sbin/
+#usr/lib/ruby/1.8/local/lib/site_ruby/1.8/
+usr/share/man/man1/
+usr/share/man/man7/
+usr/share/man/man8/
+usr/share/doc/libcomedi0/
+etc/pcmcia/
+lib/udev/rules.d/
+var/lib/comedi/calibrations
diff -Nru comedilib-0.11.0+5/debian/libcomedi0t64.install 
comedilib-0.11.0+5/debian/libcomedi0t64.install
--- comedilib-0.11.0+5/debian/libcomedi0t64.install     1970-01-01 
00:00:00.000000000 +0000
+++ comedilib-0.11.0+5/debian/libcomedi0t64.install     2020-07-25 
08:48:45.000000000 +0000
@@ -0,0 +1,14 @@
+usr/lib/libcomedi.so.*
+#usr/lib/ruby/*
+usr/sbin/comedi_config
+usr/bin/comedi_calibrate
+usr/bin/comedi_soft_calibrate
+usr/bin/comedi_test
+usr/bin/comedi_board_info
+usr/share/man/man1/*
+usr/share/man/man7/*
+usr/share/man/man8/*
+usr/share/doc/comedilib/*.conf usr/share/doc/libcomedi0/
+etc/pcmcia/*
+lib/udev/*
+
diff -Nru comedilib-0.11.0+5/debian/libcomedi0t64.lintian-overrides 
comedilib-0.11.0+5/debian/libcomedi0t64.lintian-overrides
--- comedilib-0.11.0+5/debian/libcomedi0t64.lintian-overrides   1970-01-01 
00:00:00.000000000 +0000
+++ comedilib-0.11.0+5/debian/libcomedi0t64.lintian-overrides   2024-02-28 
17:20:47.000000000 +0000
@@ -0,0 +1 @@
+libcomedi0t64: package-name-doesnt-match-sonames libcomedi0
diff -Nru comedilib-0.11.0+5/debian/libcomedi0t64.postinst 
comedilib-0.11.0+5/debian/libcomedi0t64.postinst
--- comedilib-0.11.0+5/debian/libcomedi0t64.postinst    1970-01-01 
00:00:00.000000000 +0000
+++ comedilib-0.11.0+5/debian/libcomedi0t64.postinst    2020-07-25 
08:48:45.000000000 +0000
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+set -e
+
+test $DEBIAN_SCRIPT_DEBUG && set -v -x
+
+case "$1" in
+  configure|upgrade)
+
+  echo "creating iocard group..."
+  getent group iocard >/dev/null || addgroup --system iocard
+  ;;
+
+  abort-upgrade|abort-remove|abort-deconfigure)
+  ;;
+
+  *)
+    echo "postinst called with unknown argument \`$1'" >&2
+    exit 1
+  ;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff -Nru comedilib-0.11.0+5/debian/libcomedi0t64.symbols 
comedilib-0.11.0+5/debian/libcomedi0t64.symbols
--- comedilib-0.11.0+5/debian/libcomedi0t64.symbols     1970-01-01 
00:00:00.000000000 +0000
+++ comedilib-0.11.0+5/debian/libcomedi0t64.symbols     2024-02-28 
17:20:47.000000000 +0000
@@ -0,0 +1,113 @@
+libcomedi.so.0 libcomedi0t64 #MINVER#
+* Build-Depends-Package: libcomedi-dev
+ comedi_apply_calibration@v0.7.20 0.8.1
+ comedi_apply_parsed_calibration@v0.7.20 0.8.1
+ comedi_arm@v0.9.0 0.10.0
+ comedi_arm_channel@v0.11.0 0.11.0
+ comedi_cancel@v0.7.18 0.8.1
+ comedi_cleanup_calibration@v0.7.20 0.8.1
+ comedi_close@v0.7.18 0.8.1
+ comedi_command@v0.7.18 0.8.1
+ comedi_command_test@v0.7.18 0.8.1
+ comedi_data_read@v0.7.18 0.8.1
+ comedi_data_read_delayed@v0.7.19 0.8.1
+ comedi_data_read_hint@v0.7.19 0.8.1
+ comedi_data_read_n@v0.7.18 0.8.1
+ comedi_data_write@v0.7.18 0.8.1
+ comedi_digital_trigger_disable@v0.11.0 0.11.0
+ comedi_digital_trigger_enable_edges@v0.11.0 0.11.0
+ comedi_digital_trigger_enable_levels@v0.11.0 0.11.0
+ comedi_dio_bitfield2@v0.8.0 0.8.1
+ comedi_dio_bitfield@v0.7.18 0.8.1
+ comedi_dio_config@v0.7.18 0.8.1
+ comedi_dio_get_config@v0.8.0 0.8.1
+ comedi_dio_read@v0.7.18 0.8.1
+ comedi_dio_write@v0.7.18 0.8.1
+ comedi_disarm@v0.11.0 0.11.0
+ comedi_disarm_channel@v0.11.0 0.11.0
+ comedi_do_insn@v0.7.18 0.8.1
+ comedi_do_insnlist@v0.7.18 0.8.1
+ comedi_errno@v0.7.18 0.8.1
+ comedi_fileno@v0.7.18 0.8.1
+ comedi_find_range@v0.7.18 0.8.1
+ comedi_find_subdevice_by_type@v0.7.18 0.8.1
+ comedi_from_phys@v0.7.18 0.8.1
+ comedi_from_physical@v0.8.0 0.8.1
+ comedi_get_board_name@v0.7.18 0.8.1
+ comedi_get_buffer_contents@v0.7.18 0.8.1
+ comedi_get_buffer_offset@v0.7.18 0.8.1
+ comedi_get_buffer_read_count@v0.11.0 0.11.0
+ comedi_get_buffer_read_offset@v0.11.0 0.11.0
+ comedi_get_buffer_size@v0.7.18 0.8.1
+ comedi_get_buffer_write_count@v0.11.0 0.11.0
+ comedi_get_buffer_write_offset@v0.11.0 0.11.0
+ comedi_get_clock_source@v0.10.0 0.10.0
+ comedi_get_clock_source@v0.9.0 0.10.0
+ comedi_get_cmd_generic_timed@v0.7.18 0.8.1
+ comedi_get_cmd_generic_timed@v0.9.0 0.8.1
+ comedi_get_cmd_src_mask@v0.7.18 0.8.1
+ comedi_get_default_calibration_path@v0.7.20 0.8.1
+ comedi_get_driver_name@v0.7.18 0.8.1
+ comedi_get_front_count@v0.7.18 0.8.1
+ comedi_get_gate_source@v0.9.0 0.10.0
+ comedi_get_hardcal_converter@v0.8.0 0.8.1
+ comedi_get_hardware_buffer_size@v0.9.0 0.10.0
+ comedi_get_max_buffer_size@v0.7.18 0.8.1
+ comedi_get_maxdata@v0.7.18 0.8.1
+ comedi_get_n_channels@v0.7.18 0.8.1
+ comedi_get_n_ranges@v0.7.18 0.8.1
+ comedi_get_n_subdevices@v0.7.18 0.8.1
+ comedi_get_range@v0.7.18 0.8.1
+ comedi_get_rangetype@v0.7.18 0.8.1
+ comedi_get_read_subdevice@v0.7.19 0.8.1
+ comedi_get_routing@v0.9.0 0.10.0
+ comedi_get_softcal_converter@v0.8.0 0.8.1
+ comedi_get_subdevice_flags@v0.7.18 0.8.1
+ comedi_get_subdevice_flags@v0.8.0 0.8.1
+ comedi_get_subdevice_type@v0.7.18 0.8.1
+ comedi_get_timer@v0.7.18 0.8.1
+ comedi_get_version_code@v0.7.18 0.8.1
+ comedi_get_write_subdevice@v0.7.19 0.8.1
+ comedi_internal_trigger@v0.9.0 0.10.0
+ comedi_lock@v0.7.18 0.8.1
+ comedi_loglevel@v0.7.18 0.8.1
+ comedi_mark_buffer_read@v0.7.18 0.8.1
+ comedi_mark_buffer_written@v0.8.0 0.8.1
+ comedi_maxdata_is_chan_specific@v0.7.18 0.8.1
+ comedi_open@v0.7.18 0.8.1
+ comedi_parse_calibration_file@v0.7.20 0.8.1
+ comedi_perror@v0.7.18 0.8.1
+ comedi_poll@v0.7.18 0.8.1
+ comedi_range_is_chan_specific@v0.7.18 0.8.1
+ comedi_reset@v0.9.0 0.10.0
+ comedi_reset_channel@v0.11.0 0.11.0
+ comedi_sampl_from_phys@v0.7.18 0.8.1
+ comedi_sampl_to_phys@v0.7.18 0.8.1
+ comedi_set_buffer_size@v0.7.18 0.8.1
+ comedi_set_clock_source@v0.10.0 0.10.0
+ comedi_set_clock_source@v0.9.0 0.10.0
+ comedi_set_counter_mode@v0.9.0 0.10.0
+ comedi_set_filter@v0.9.0 0.10.0
+ comedi_set_gate_source@v0.9.0 0.10.0
+ comedi_set_global_oor_behavior@v0.7.18 0.8.1
+ comedi_set_max_buffer_size@v0.7.18 0.8.1
+ comedi_set_other_source@v0.9.0 0.10.0
+ comedi_set_read_subdevice@v0.11.0 0.11.0
+ comedi_set_routing@v0.9.0 0.10.0
+ comedi_set_write_subdevice@v0.11.0 0.11.0
+ comedi_strerror@v0.7.18 0.8.1
+ comedi_sv_init@v0.7.18 0.8.1
+ comedi_sv_measure@v0.7.18 0.8.1
+ comedi_sv_update@v0.7.18 0.8.1
+ comedi_timed_1chan@v0.7.18 0.8.1
+ comedi_to_phys@v0.7.18 0.8.1
+ comedi_to_physical@v0.8.0 0.8.1
+ comedi_trigger@v0.7.18 0.8.1
+ comedi_unlock@v0.7.18 0.8.1
+ v0.10.0@v0.10.0 0.10.0
+ v0.11.0@v0.11.0 0.11.0
+ v0.7.18@v0.7.18 0.8.1
+ v0.7.19@v0.7.19 0.8.1
+ v0.7.20@v0.7.20 0.8.1
+ v0.8.0@v0.8.0 0.8.1
+ v0.9.0@v0.9.0 0.8.1