Bug#1061914: cuneiform: NMU diff for 64-bit time_t transition

2024-01-31 Thread mwhudson
Source: cuneiform
Followup-For: Bug #1061914

Apologies, thanks to operator error (i.e. I messed up) the diff attached to
this bug is not the one that was uploaded to experimental. Please see the patch
attached to this message.


-- 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/16 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_WARN, TAINT_OOT_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru cuneiform-1.1.0+dfsg/debian/changelog 
cuneiform-1.1.0+dfsg/debian/changelog
--- cuneiform-1.1.0+dfsg/debian/changelog   2021-11-01 17:32:53.0 
+
+++ cuneiform-1.1.0+dfsg/debian/changelog   2024-01-30 17:59:35.0 
+
@@ -1,3 +1,10 @@
+cuneiform (1.1.0+dfsg-9.1~exp1) experimental; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.
+
+ -- Michael Hudson-Doyle   Tue, 30 Jan 2024 17:59:35 +
+
 cuneiform (1.1.0+dfsg-9) unstable; urgency=medium
 
   * QA upload.
diff -Nru cuneiform-1.1.0+dfsg/debian/control 
cuneiform-1.1.0+dfsg/debian/control
--- cuneiform-1.1.0+dfsg/debian/control 2021-11-01 14:07:04.0 +
+++ cuneiform-1.1.0+dfsg/debian/control 2024-01-30 17:59:35.0 +
@@ -50,7 +50,7 @@
 Architecture: any
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6)
-Depends: ${misc:Depends}, libcuneiform0 (= ${binary:Version})
+Depends: ${misc:Depends}, libcuneiform0t64 (= ${binary:Version})
 Description: multi-language OCR system (development)
  Cuneiform is an OCR system. In addition to text recognition it also does 
layout
  analysis and text format recognition.
@@ -62,14 +62,15 @@
  .
  This package contains the development support files.
 
-Package: libcuneiform0
+Package: libcuneiform0t64
+Provides: ${t64:Provides}
 Section: non-free/libs
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}, dpkg (>= 1.15.6)
 Depends: ${misc:Depends}, ${shlibs:Depends}, cuneiform-common
-Breaks: cuneiform (<< 1.0.0+dfsg-3~)
-Replaces: cuneiform (<< 1.0.0+dfsg-3~)
+Breaks: libcuneiform0 (<< ${source:Version}), cuneiform (<< 1.0.0+dfsg-3~)
+Replaces: libcuneiform0, cuneiform (<< 1.0.0+dfsg-3~)
 Description: multi-language OCR system (shared library)
  Cuneiform is an OCR system. In addition to text recognition it also does 
layout
  analysis and text format recognition.
diff -Nru cuneiform-1.1.0+dfsg/debian/libcuneiform0.symbols 
cuneiform-1.1.0+dfsg/debian/libcuneiform0.symbols
--- cuneiform-1.1.0+dfsg/debian/libcuneiform0.symbols   2021-11-01 
14:15:57.0 +
+++ cuneiform-1.1.0+dfsg/debian/libcuneiform0.symbols   1970-01-01 
00:00:00.0 +
@@ -1,28 +0,0 @@
-libcuneiform.so.0 libcuneiform0 #MINVER#
-* Build-Depends-Package: libcuneiform-dev
- PUMA_Done@Base 1.0
- PUMA_EnumCodes@Base 1.0
- PUMA_EnumFormatMode@Base 1.0
- PUMA_EnumFormats@Base 1.0
- PUMA_EnumLanguages@Base 1.0
- PUMA_EnumPicture@Base 1.0
- PUMA_EnumTable@Base 1.0
- PUMA_GetExportData@Base 1.0
- PUMA_GetReturnCode@Base 1.0
- PUMA_GetReturnString@Base 1.0
- PUMA_GetSpecialBuffer@Base 1.0
- PUMA_Init@Base 1.0
- PUMA_RenameImageName@Base 1.0
- PUMA_Save@Base 1.0
- PUMA_SaveToMemory@Base 1.0
- PUMA_SetImportData@Base 1.0
- PUMA_SetSpecialProject@Base 1.0
- PUMA_XClose@Base 1.0
- PUMA_XFinalRecognition@Base 1.0
- PUMA_XGetRotateDIB@Base 1.0
- PUMA_XGetTemplate@Base 1.0
- PUMA_XOpen@Base 1.0
- PUMA_XOpenClbk@Base 1.0
- PUMA_XPageAnalysis@Base 1.0
- PUMA_XSave@Base 1.0
- PUMA_XSetTemplate@Base 1.0
diff -Nru cuneiform-1.1.0+dfsg/debian/libcuneiform0t64.lintian-overrides 
cuneiform-1.1.0+dfsg/debian/libcuneiform0t64.lintian-overrides
--- cuneiform-1.1.0+dfsg/debian/libcuneiform0t64.lintian-overrides  
1970-01-01 00:00:00.0 +
+++ cuneiform-1.1.0+dfsg/debian/libcuneiform0t64.lintian-overrides  
2024-01-30 17:59:35.0 +
@@ -0,0 +1 @@
+libcuneiform0t64: package-name-doesnt-match-sonames libcuneiform0
diff -Nru cuneiform-1.1.0+dfsg/debian/libcuneiform0t64.symbols 
cuneiform-1.1.0+dfsg/debian/libcuneiform0t64.symbols
--- cuneiform-1.1.0+dfsg/debian/libcuneiform0t64.symbols1970-01-01 
00:00:00.0 +
+++ cuneiform-1.1.0+dfsg/debian/libcuneiform0t64.symbols2024-01-30 
17:59:35.0 +
@@ -0,0 +1,28 @@
+libcuneiform.so.0 libcuneiform0t64 #MINVER#
+* Build-Depends-Package: libcuneiform-dev
+ PUMA_Done@Base 1.0
+ PUMA_EnumCodes@Base 1.0
+ PUMA_EnumFormatMode@Base 1.0
+ PUMA_EnumFormats@Base 1.0
+ PUMA_EnumLanguages@Base 1.0
+ PUMA_EnumPicture@Base 1.0
+ PUMA_EnumTable@Base 1.0
+ PUMA_GetExportData@Base 1.0
+ PUMA_GetReturnCode@Base 1.0
+ PUMA_GetReturnString@Base 1.0
+ PUMA_GetSpecialBuffer@Base 1.0
+ PUMA_Init@Base 1.0
+ PUMA_RenameImageName@Base 1.0
+ PUMA_Save@Base 1.0
+ PUMA_SaveToMemory@Base 1.0
+ 

Bug#1061914: cuneiform: NMU diff for 64-bit time_t transition

2024-01-29 Thread mwhudson
Source: cuneiform
Version: 1.1.0+dfsg-9
Severity: serious
Tags: patch pending
Justification: library ABI skew on upgrade
User: debian-...@lists.debian.org
Usertags: time-t

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
cuneiform 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 cuneiform
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/16 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_WARN, TAINT_OOT_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru cuneiform-1.1.0+dfsg/debian/changelog 
cuneiform-1.1.0+dfsg/debian/changelog
--- cuneiform-1.1.0+dfsg/debian/changelog   2021-11-01 17:32:53.0 
+
+++ cuneiform-1.1.0+dfsg/debian/changelog   2024-01-30 01:27:15.0 
+
@@ -1,3 +1,10 @@
+cuneiform (1.1.0+dfsg-9.1) experimental; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.
+
+ -- Michael Hudson-Doyle   Tue, 30 Jan 2024 01:27:15 +
+
 cuneiform (1.1.0+dfsg-9) unstable; urgency=medium
 
   * QA upload.
diff -Nru cuneiform-1.1.0+dfsg/debian/control 
cuneiform-1.1.0+dfsg/debian/control
--- cuneiform-1.1.0+dfsg/debian/control 2021-11-01 14:07:04.0 +
+++ cuneiform-1.1.0+dfsg/debian/control 2024-01-30 01:27:15.0 +
@@ -62,14 +62,15 @@
  .
  This package contains the development support files.
 
-Package: libcuneiform0
+Package: libcuneiform0t64
+Provides: ${t64:Provides}
 Section: non-free/libs
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}, dpkg (>= 1.15.6)
 Depends: ${misc:Depends}, ${shlibs:Depends}, cuneiform-common
-Breaks: cuneiform (<< 1.0.0+dfsg-3~)
-Replaces: cuneiform (<< 1.0.0+dfsg-3~)
+Breaks: libcuneiform0 (<< ${source:Version}), cuneiform (<< 1.0.0+dfsg-3~)
+Replaces: libcuneiform0, cuneiform (<< 1.0.0+dfsg-3~)
 Description: multi-language OCR system (shared library)
  Cuneiform is an OCR system. In addition to text recognition it also does 
layout
  analysis and text format recognition.
diff -Nru cuneiform-1.1.0+dfsg/debian/libcuneiform0.symbols 
cuneiform-1.1.0+dfsg/debian/libcuneiform0.symbols
--- cuneiform-1.1.0+dfsg/debian/libcuneiform0.symbols   2021-11-01 
14:15:57.0 +
+++ cuneiform-1.1.0+dfsg/debian/libcuneiform0.symbols   1970-01-01 
00:00:00.0 +
@@ -1,28 +0,0 @@
-libcuneiform.so.0 libcuneiform0 #MINVER#
-* Build-Depends-Package: libcuneiform-dev
- PUMA_Done@Base 1.0
- PUMA_EnumCodes@Base 1.0
- PUMA_EnumFormatMode@Base 1.0
- PUMA_EnumFormats@Base 1.0
- PUMA_EnumLanguages@Base 1.0
- PUMA_EnumPicture@Base 1.0
- PUMA_EnumTable@Base 1.0
- PUMA_GetExportData@Base 1.0
- PUMA_GetReturnCode@Base 1.0
- PUMA_GetReturnString@Base 1.0
- PUMA_GetSpecialBuffer@Base 1.0
- PUMA_Init@Base 1.0
- PUMA_RenameImageName@Base 1.0
- PUMA_Save@Base 1.0
- PUMA_SaveToMemory@Base 1.0
- PUMA_SetImportData@Base 1.0
- PUMA_SetSpecialProject@Base 1.0
- PUMA_XClose@Base 1.0
- PUMA_XFinalRecognition@Base 1.0
- PUMA_XGetRotateDIB@Base 1.0
- PUMA_XGetTemplate@Base 1.0
- PUMA_XOpen@Base 1.0
- PUMA_XOpenClbk@Base 1.0
- PUMA_XPageAnalysis@Base 1.0
- PUMA_XSave@Base 1.0
- PUMA_XSetTemplate@Base 1.0
diff -Nru cuneiform-1.1.0+dfsg/debian/libcuneiform0t64.lintian-overrides 
cuneiform-1.1.0+dfsg/debian/libcuneiform0t64.lintian-overrides
--- cuneiform-1.1.0+dfsg/debian/libcuneiform0t64.lintian-overrides  
1970-01-01 00:00:00.0 +
+++