Bug#1062952: mrcal: NMU diff for 64-bit time_t transition

[Graham Inggs]

Source: mrcal
Version: 2.3-4
Severity: serious
Tags: patch pending sid trixie
Justification: library ABI skew on upgrade
User: debian-arm at lists.debian.org
Usertags: time-t

NOTICE: these changes must not be uploaded to unstable yet!

Dear maintainer,

As part of the 64-bit time_t transition required to support 32-bit
architectures in 2038 and beyond
(https://wiki.debian.org/ReleaseGoals/64bit-time), we have identified
mrcal as a source package shipping runtime libraries whose ABI
either is affected by the change in size of time_t, or could not be
analyzed via abi-compliance-checker (and therefore to be on the safe
side we assume is affected).

To ensure that inconsistent combinations of libraries with their
reverse-dependencies are never installed together, it is necessary to
have a library transition, which is most easily done by renaming the
runtime library package.

Since turning on 64-bit time_t is being handled centrally through a change
to the default dpkg-buildflags (https://bugs.debian.org/1037136), it is
important that libraries affected by this ABI change all be uploaded close
together in time.  Therefore I have prepared a 0-day NMU for mrcal
which will initially be uploaded to experimental if possible, then to
unstable after packages have cleared binary NEW.

Please find the patch for this NMU attached.

If you have any concerns about this patch, please reach out ASAP.  Although
this package will be uploaded to experimental immediately, there will be a
period of several days before we begin uploads to unstable; so if information
becomes available that your package should not be included in the transition,
there is time for us to amend the planned uploads.



-- System Information:
Debian Release: trixie/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 6.5.0-15-generic (SMP w/8 CPU threads; PREEMPT)
Kernel taint flags: 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: unable to detect
-------------- next part --------------
diff -Nru mrcal-2.3/debian/changelog mrcal-2.3/debian/changelog
--- mrcal-2.3/debian/changelog	2023-09-07 04:51:00.000000000 +0000
+++ mrcal-2.3/debian/changelog	2024-02-04 06:27:10.000000000 +0000
@@ -1,3 +1,10 @@
+mrcal (2.3-4.1) experimental; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.
+
+ -- Graham Inggs <ginggs at debian.org>  Sun, 04 Feb 2024 06:27:10 +0000
+
 mrcal (2.3-4) unstable; urgency=medium
 
   * Explicitly linking with libsuitesparseconfig. Adds explicit dependency
diff -Nru mrcal-2.3/debian/control mrcal-2.3/debian/control
--- mrcal-2.3/debian/control	2023-07-23 04:44:33.000000000 +0000
+++ mrcal-2.3/debian/control	2024-02-04 06:27:10.000000000 +0000
@@ -34,7 +34,10 @@
 Vcs-Browser: https://salsa.debian.org/science-team/mrcal
 Testsuite: autopkgtest-pkg-python
 
-Package: libmrcal3
+Package: libmrcal3t64
+Provides: ${t64:Provides}
+Replaces: libmrcal3
+Breaks: libmrcal3 (<< ${source:Version})
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -47,7 +50,7 @@
 
 Package: mrcal
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libmrcal3 (= ${binary:Version}),
+Depends: ${shlibs:Depends}, ${misc:Depends}, libmrcal3t64 (= ${binary:Version}),
          python3-mrcal (= ${binary:Version}),
          python3-gnuplotlib (>= 0.38), python3-numpysane (>= 0.35),
          python3-scipy (>= 0.18),  python3-ipython,
@@ -65,7 +68,7 @@
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: ${misc:Depends}, libmrcal3 (= ${binary:Version})
+Depends: ${misc:Depends}, libmrcal3t64 (= ${binary:Version})
 Description: Calibration and SFM library
  A photogrammetry toolkit that provides improved methods for making and using
  camera models (calibration, tracking, mapping, etc). The focus is on
@@ -76,7 +79,7 @@
 Section: python
 Architecture: any
 Multi-Arch: same
-Depends: ${shlibs:Depends}, ${misc:Depends}, libmrcal3 (= ${binary:Version}),
+Depends: ${shlibs:Depends}, ${misc:Depends}, libmrcal3t64 (= ${binary:Version}),
          ${python3:Depends},
          python3-gnuplotlib (>= 0.38), python3-numpysane (>= 0.35),
          python3-opencv, python3-numpy, python3-scipy (>= 0.18),
diff -Nru mrcal-2.3/debian/libmrcal3.install mrcal-2.3/debian/libmrcal3.install
--- mrcal-2.3/debian/libmrcal3.install	2021-11-20 00:40:44.000000000 +0000
+++ mrcal-2.3/debian/libmrcal3.install	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-/usr/lib/*/*.so.*
diff -Nru mrcal-2.3/debian/libmrcal3.lintian-overrides mrcal-2.3/debian/libmrcal3.lintian-overrides
--- mrcal-2.3/debian/libmrcal3.lintian-overrides	2022-10-04 05:14:38.000000000 +0000
+++ mrcal-2.3/debian/libmrcal3.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-# I use GCC trampolines
-shlib-with-executable-stack
-
-# libminimath is licensed under ANY version of the LGPL
-copyright-refers-to-versionless-license-file
diff -Nru mrcal-2.3/debian/libmrcal3.symbols mrcal-2.3/debian/libmrcal3.symbols
--- mrcal-2.3/debian/libmrcal3.symbols	2023-05-05 05:46:50.000000000 +0000
+++ mrcal-2.3/debian/libmrcal3.symbols	1970-01-01 00:00:00.000000000 +0000
@@ -1,89 +0,0 @@
-libmrcal.so.3 libmrcal3 #MINVER#
-* Build-Depends-Package: libmrcal-dev
- libmrcal.so.3 at libmrcal.so.3 2.1
- _mrcal_num_j_nonzero at libmrcal.so.3 2.1
- _mrcal_precompute_lensmodel_data at libmrcal.so.3 2.1
- _mrcal_project_internal at libmrcal.so.3 2.1
- _mrcal_project_internal_opencv at libmrcal.so.3 2.1
- _mrcal_unproject_internal at libmrcal.so.3 2.1
- mrcal_R_from_r_full at libmrcal.so.3 2.1
- mrcal_Rt_from_rt_full at libmrcal.so.3 2.1
- mrcal_compose_Rt_full at libmrcal.so.3 2.1
- mrcal_compose_r_full at libmrcal.so.3 2.2
- mrcal_compose_r_tinyr0_gradientr0_full at libmrcal.so.3 2.2
- mrcal_compose_rt_full at libmrcal.so.3 2.1
- mrcal_corresponding_icam_extrinsics at libmrcal.so.3 2.1
- mrcal_free_cameramodel at libmrcal.so.3 2.1
- mrcal_identity_R_full at libmrcal.so.3 2.1
- mrcal_identity_Rt_full at libmrcal.so.3 2.1
- mrcal_identity_r_full at libmrcal.so.3 2.1
- mrcal_identity_rt_full at libmrcal.so.3 2.1
- mrcal_image_anytype_load at libmrcal.so.3 2.2
- mrcal_image_bgr_load at libmrcal.so.3 2.2
- mrcal_image_bgr_save at libmrcal.so.3 2.2
- mrcal_image_uint16_load at libmrcal.so.3 2.2
- mrcal_image_uint16_save at libmrcal.so.3 2.2
- mrcal_image_uint8_load at libmrcal.so.3 2.2
- mrcal_image_uint8_save at libmrcal.so.3 2.2
- mrcal_invert_R_full at libmrcal.so.3 2.1
- mrcal_invert_Rt_full at libmrcal.so.3 2.1
- mrcal_invert_rt_full at libmrcal.so.3 2.1
- mrcal_knots_for_splined_models at libmrcal.so.3 2.1
- mrcal_lensmodel_from_name at libmrcal.so.3 2.1
- mrcal_lensmodel_metadata at libmrcal.so.3 2.1
- mrcal_lensmodel_name at libmrcal.so.3 2.1
- mrcal_lensmodel_name_unconfigured at libmrcal.so.3 2.1
- mrcal_lensmodel_num_params at libmrcal.so.3 2.1
- mrcal_lensmodel_type_from_name at libmrcal.so.3 2.1
- mrcal_measurement_index_boards at libmrcal.so.3 2.1
- mrcal_measurement_index_points at libmrcal.so.3 2.1
- mrcal_measurement_index_regularization at libmrcal.so.3 2.1
- mrcal_num_intrinsics_optimization_params at libmrcal.so.3 2.1
- mrcal_num_measurements at libmrcal.so.3 2.1
- mrcal_num_measurements_boards at libmrcal.so.3 2.1
- mrcal_num_measurements_points at libmrcal.so.3 2.1
- mrcal_num_measurements_regularization at libmrcal.so.3 2.1
- mrcal_num_states at libmrcal.so.3 2.1
- mrcal_num_states_calobject_warp at libmrcal.so.3 2.1
- mrcal_num_states_extrinsics at libmrcal.so.3 2.1
- mrcal_num_states_frames at libmrcal.so.3 2.1
- mrcal_num_states_intrinsics at libmrcal.so.3 2.1
- mrcal_num_states_points at libmrcal.so.3 2.1
- mrcal_optimize at libmrcal.so.3 2.1
- mrcal_optimizer_callback at libmrcal.so.3 2.1
- mrcal_pack_solver_state_vector at libmrcal.so.3 2.1
- mrcal_project at libmrcal.so.3 2.1
- mrcal_project_latlon at libmrcal.so.3 2.1
- mrcal_project_lonlat at libmrcal.so.3 2.1
- mrcal_project_pinhole at libmrcal.so.3 2.1
- mrcal_project_stereographic at libmrcal.so.3 2.1
- mrcal_r_from_R_full at libmrcal.so.3 2.1
- mrcal_read_cameramodel_file at libmrcal.so.3 2.1
- mrcal_read_cameramodel_string at libmrcal.so.3 2.1
- mrcal_rectification_maps at libmrcal.so.3 2.3
- mrcal_rectified_resolution at libmrcal.so.3 2.3
- mrcal_rectified_system at libmrcal.so.3 2.3
- mrcal_rotate_point_R_full at libmrcal.so.3 2.1
- mrcal_rotate_point_r_full at libmrcal.so.3 2.1
- mrcal_rt_from_Rt_full at libmrcal.so.3 2.1
- mrcal_state_index_calobject_warp at libmrcal.so.3 2.1
- mrcal_state_index_extrinsics at libmrcal.so.3 2.1
- mrcal_state_index_frames at libmrcal.so.3 2.1
- mrcal_state_index_intrinsics at libmrcal.so.3 2.1
- mrcal_state_index_points at libmrcal.so.3 2.1
- mrcal_supported_lensmodel_names at libmrcal.so.3 2.1
- mrcal_transform_point_Rt_full at libmrcal.so.3 2.1
- mrcal_transform_point_rt_full at libmrcal.so.3 2.1
- mrcal_triangulate_geometric at libmrcal.so.3 2.1
- mrcal_triangulate_leecivera_l1 at libmrcal.so.3 2.1
- mrcal_triangulate_leecivera_linf at libmrcal.so.3 2.1
- mrcal_triangulate_leecivera_mid2 at libmrcal.so.3 2.1
- mrcal_triangulate_leecivera_wmid2 at libmrcal.so.3 2.1
- mrcal_triangulate_lindstrom at libmrcal.so.3 2.1
- mrcal_unpack_solver_state_vector at libmrcal.so.3 2.1
- mrcal_unproject at libmrcal.so.3 2.1
- mrcal_unproject_latlon at libmrcal.so.3 2.1
- mrcal_unproject_lonlat at libmrcal.so.3 2.1
- mrcal_unproject_pinhole at libmrcal.so.3 2.1
- mrcal_unproject_stereographic at libmrcal.so.3 2.1
- mrcal_write_cameramodel_file at libmrcal.so.3 2.1
diff -Nru mrcal-2.3/debian/libmrcal3t64.install mrcal-2.3/debian/libmrcal3t64.install
--- mrcal-2.3/debian/libmrcal3t64.install	1970-01-01 00:00:00.000000000 +0000
+++ mrcal-2.3/debian/libmrcal3t64.install	2021-11-20 00:40:44.000000000 +0000
@@ -0,0 +1 @@
+/usr/lib/*/*.so.*
diff -Nru mrcal-2.3/debian/libmrcal3t64.lintian-overrides mrcal-2.3/debian/libmrcal3t64.lintian-overrides
--- mrcal-2.3/debian/libmrcal3t64.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ mrcal-2.3/debian/libmrcal3t64.lintian-overrides	2024-02-04 06:27:10.000000000 +0000
@@ -0,0 +1,6 @@
+# I use GCC trampolines
+shlib-with-executable-stack
+
+# libminimath is licensed under ANY version of the LGPL
+copyright-refers-to-versionless-license-file
+libmrcal3t64: package-name-doesnt-match-sonames libmrcal3
diff -Nru mrcal-2.3/debian/libmrcal3t64.symbols mrcal-2.3/debian/libmrcal3t64.symbols
--- mrcal-2.3/debian/libmrcal3t64.symbols	1970-01-01 00:00:00.000000000 +0000
+++ mrcal-2.3/debian/libmrcal3t64.symbols	2024-02-04 06:27:10.000000000 +0000
@@ -0,0 +1,89 @@
+libmrcal.so.3 libmrcal3t64 #MINVER#
+* Build-Depends-Package: libmrcal-dev
+ libmrcal.so.3 at libmrcal.so.3 2.1
+ _mrcal_num_j_nonzero at libmrcal.so.3 2.1
+ _mrcal_precompute_lensmodel_data at libmrcal.so.3 2.1
+ _mrcal_project_internal at libmrcal.so.3 2.1
+ _mrcal_project_internal_opencv at libmrcal.so.3 2.1
+ _mrcal_unproject_internal at libmrcal.so.3 2.1
+ mrcal_R_from_r_full at libmrcal.so.3 2.1
+ mrcal_Rt_from_rt_full at libmrcal.so.3 2.1
+ mrcal_compose_Rt_full at libmrcal.so.3 2.1
+ mrcal_compose_r_full at libmrcal.so.3 2.2
+ mrcal_compose_r_tinyr0_gradientr0_full at libmrcal.so.3 2.2
+ mrcal_compose_rt_full at libmrcal.so.3 2.1
+ mrcal_corresponding_icam_extrinsics at libmrcal.so.3 2.1
+ mrcal_free_cameramodel at libmrcal.so.3 2.1
+ mrcal_identity_R_full at libmrcal.so.3 2.1
+ mrcal_identity_Rt_full at libmrcal.so.3 2.1
+ mrcal_identity_r_full at libmrcal.so.3 2.1
+ mrcal_identity_rt_full at libmrcal.so.3 2.1
+ mrcal_image_anytype_load at libmrcal.so.3 2.2
+ mrcal_image_bgr_load at libmrcal.so.3 2.2
+ mrcal_image_bgr_save at libmrcal.so.3 2.2
+ mrcal_image_uint16_load at libmrcal.so.3 2.2
+ mrcal_image_uint16_save at libmrcal.so.3 2.2
+ mrcal_image_uint8_load at libmrcal.so.3 2.2
+ mrcal_image_uint8_save at libmrcal.so.3 2.2
+ mrcal_invert_R_full at libmrcal.so.3 2.1
+ mrcal_invert_Rt_full at libmrcal.so.3 2.1
+ mrcal_invert_rt_full at libmrcal.so.3 2.1
+ mrcal_knots_for_splined_models at libmrcal.so.3 2.1
+ mrcal_lensmodel_from_name at libmrcal.so.3 2.1
+ mrcal_lensmodel_metadata at libmrcal.so.3 2.1
+ mrcal_lensmodel_name at libmrcal.so.3 2.1
+ mrcal_lensmodel_name_unconfigured at libmrcal.so.3 2.1
+ mrcal_lensmodel_num_params at libmrcal.so.3 2.1
+ mrcal_lensmodel_type_from_name at libmrcal.so.3 2.1
+ mrcal_measurement_index_boards at libmrcal.so.3 2.1
+ mrcal_measurement_index_points at libmrcal.so.3 2.1
+ mrcal_measurement_index_regularization at libmrcal.so.3 2.1
+ mrcal_num_intrinsics_optimization_params at libmrcal.so.3 2.1
+ mrcal_num_measurements at libmrcal.so.3 2.1
+ mrcal_num_measurements_boards at libmrcal.so.3 2.1
+ mrcal_num_measurements_points at libmrcal.so.3 2.1
+ mrcal_num_measurements_regularization at libmrcal.so.3 2.1
+ mrcal_num_states at libmrcal.so.3 2.1
+ mrcal_num_states_calobject_warp at libmrcal.so.3 2.1
+ mrcal_num_states_extrinsics at libmrcal.so.3 2.1
+ mrcal_num_states_frames at libmrcal.so.3 2.1
+ mrcal_num_states_intrinsics at libmrcal.so.3 2.1
+ mrcal_num_states_points at libmrcal.so.3 2.1
+ mrcal_optimize at libmrcal.so.3 2.1
+ mrcal_optimizer_callback at libmrcal.so.3 2.1
+ mrcal_pack_solver_state_vector at libmrcal.so.3 2.1
+ mrcal_project at libmrcal.so.3 2.1
+ mrcal_project_latlon at libmrcal.so.3 2.1
+ mrcal_project_lonlat at libmrcal.so.3 2.1
+ mrcal_project_pinhole at libmrcal.so.3 2.1
+ mrcal_project_stereographic at libmrcal.so.3 2.1
+ mrcal_r_from_R_full at libmrcal.so.3 2.1
+ mrcal_read_cameramodel_file at libmrcal.so.3 2.1
+ mrcal_read_cameramodel_string at libmrcal.so.3 2.1
+ mrcal_rectification_maps at libmrcal.so.3 2.3
+ mrcal_rectified_resolution at libmrcal.so.3 2.3
+ mrcal_rectified_system at libmrcal.so.3 2.3
+ mrcal_rotate_point_R_full at libmrcal.so.3 2.1
+ mrcal_rotate_point_r_full at libmrcal.so.3 2.1
+ mrcal_rt_from_Rt_full at libmrcal.so.3 2.1
+ mrcal_state_index_calobject_warp at libmrcal.so.3 2.1
+ mrcal_state_index_extrinsics at libmrcal.so.3 2.1
+ mrcal_state_index_frames at libmrcal.so.3 2.1
+ mrcal_state_index_intrinsics at libmrcal.so.3 2.1
+ mrcal_state_index_points at libmrcal.so.3 2.1
+ mrcal_supported_lensmodel_names at libmrcal.so.3 2.1
+ mrcal_transform_point_Rt_full at libmrcal.so.3 2.1
+ mrcal_transform_point_rt_full at libmrcal.so.3 2.1
+ mrcal_triangulate_geometric at libmrcal.so.3 2.1
+ mrcal_triangulate_leecivera_l1 at libmrcal.so.3 2.1
+ mrcal_triangulate_leecivera_linf at libmrcal.so.3 2.1
+ mrcal_triangulate_leecivera_mid2 at libmrcal.so.3 2.1
+ mrcal_triangulate_leecivera_wmid2 at libmrcal.so.3 2.1
+ mrcal_triangulate_lindstrom at libmrcal.so.3 2.1
+ mrcal_unpack_solver_state_vector at libmrcal.so.3 2.1
+ mrcal_unproject at libmrcal.so.3 2.1
+ mrcal_unproject_latlon at libmrcal.so.3 2.1
+ mrcal_unproject_lonlat at libmrcal.so.3 2.1
+ mrcal_unproject_pinhole at libmrcal.so.3 2.1
+ mrcal_unproject_stereographic at libmrcal.so.3 2.1
+ mrcal_write_cameramodel_file at libmrcal.so.3 2.1