Bug#1061884: allegro4.4: NMU diff for 64-bit time_t transition

2024-01-30 Thread Steve Langasek
On Tue, Jan 30, 2024 at 09:49:40AM +, Simon McVittie wrote:
> On Mon, 29 Jan 2024 at 23:45:11 +, Steve Langasek wrote:
> > Dear maintainer,

> (I am a games team member but not a maintainer of this particular package)

> > diff -Nru allegro4.4-4.4.3.1/debian/liballeggl4.4t64.4.install 
> > allegro4.4-4.4.3.1/debian/liballeggl4.4t64.4.install
> > --- allegro4.4-4.4.3.1/debian/liballeggl4.4t64.4.install1970-01-01 
> > 00:00:00.0 +
> > +++ allegro4.4-4.4.3.1/debian/liballeggl4.4t64.4.install2023-08-28 
> > 13:02:32.0 +

> Should this have been liballeggl4.4t64.install, without the last ".4"?

Yes, sorry!  Found a bug in the 'time-t-me' conversion script yesterday
(handling of ${foo#pattern} vs ${foo##pattern}, sigh) because it had caused
a build failure in another package, but hadn't noticed it already broke any
other packages before this that were wrong but didn't ftbfs.

Please find an updated patch which picks up this fix, and also some relevant
fixes to strict versioned dependency references in debian/control.

And fixed NMU uploaded to experimental.

-- 
Steve Langasek   Give me a lever long enough and a Free OS
Debian Developer   to set it on, and I can move the world.
Ubuntu Developer   https://www.debian.org/
slanga...@ubuntu.com vor...@debian.org
diff -Nru allegro4.4-4.4.3.1/debian/changelog 
allegro4.4-4.4.3.1/debian/changelog
--- allegro4.4-4.4.3.1/debian/changelog 2023-08-28 13:02:32.0 +
+++ allegro4.4-4.4.3.1/debian/changelog 2024-01-30 16:25:24.0 +
@@ -1,3 +1,10 @@
+allegro4.4 (2:4.4.3.1-4.1) experimental; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.
+
+ -- Steve Langasek   Tue, 30 Jan 2024 16:25:24 +
+
 allegro4.4 (2:4.4.3.1-4) unstable; urgency=medium
 
   * Add a clean dh target to remove CHANGES - fixes building after a
diff -Nru allegro4.4-4.4.3.1/debian/control allegro4.4-4.4.3.1/debian/control
--- allegro4.4-4.4.3.1/debian/control   2023-08-28 13:02:32.0 +
+++ allegro4.4-4.4.3.1/debian/control   2024-01-30 16:25:24.0 +
@@ -26,15 +26,16 @@
 Vcs-Browser: https://salsa.debian.org/games-team/allegro4.4
 Vcs-Git: https://salsa.debian.org/games-team/allegro4.4.git
 
-Package: liballegro4.4
+Package: liballegro4.4t64
+Provides: ${t64:Provides}
 Section: libs
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
  ${shlibs:Depends}
-Breaks: liballegro4.4-plugin-alsa (<= 2:4.4.2-4)
-Replaces: liballegro4.4-plugin-alsa (<= 2:4.4.2-4)
+Breaks: liballegro4.4 (<< ${source:Version}), liballegro4.4-plugin-alsa (<= 
2:4.4.2-4)
+Replaces: liballegro4.4, liballegro4.4-plugin-alsa (<= 2:4.4.2-4)
 Description: portable library for cross-platform game and multimedia 
development
  Allegro is a cross-platform library mainly aimed at video game and multimedia
  programming. It handles common, low-level tasks such as creating windows,
@@ -46,7 +47,7 @@
 Architecture: any
 Depends: ${misc:Depends},
  ${shlibs:Depends},
- liballegro4.4 (= ${binary:Version}),
+ liballegro4.4t64 (= ${binary:Version}),
  libxext-dev,
  libx11-dev,
  libxpm-dev,
@@ -81,14 +82,17 @@
  accepting user input, loading data, drawing images, playing sounds, etc. and
  generally abstracting away the underlying platform.
 
-Package: liballeggl4.4
+Package: liballeggl4.4t64
+Provides: ${t64:Provides}
+Replaces: liballeggl4.4
+Breaks: liballeggl4.4 (<< ${source:Version})
 Section: libs
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
  ${shlibs:Depends},
- liballegro4.4 (= ${binary:Version})
+ liballegro4.4t64 (= ${binary:Version})
 Description: library to mix OpenGL graphics with Allegro routines
  AllegroGL is an Allegro add-on that allows you to use OpenGL alongside
  Allegro -- you use OpenGL for your rendering to the screen, and Allegro for
@@ -109,7 +113,7 @@
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends},
- liballeggl4.4 (= ${binary:Version}),
+ liballeggl4.4t64 (= ${binary:Version}),
  liballegro4-dev
 Replaces: liballegro4.2-dev (<< 2:4.4.2-3)
 Breaks: liballegro4.2-dev (<< 2:4.4.2-3)
@@ -132,7 +136,10 @@
  accepting user input, loading data, drawing images, playing sounds, etc. and
  generally abstracting away the underlying platform.
 
-Package: libjpgalleg4.4
+Package: libjpgalleg4.4t64
+Provides: ${t64:Provides}
+Replaces: libjpgalleg4.4
+Breaks: libjpgalleg4.4 (<< ${source:Version})
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -152,7 +159,7 @@
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends},
- libjpgalleg4.4 (= ${binary:Version}),
+ libjpgalleg4.4t64 (= ${binary:Version}),
  liballegro4-dev
 Multi-Arch: same
 Description: development

Bug#1061884: allegro4.4: NMU diff for 64-bit time_t transition

2024-01-30 Thread Simon McVittie
On Mon, 29 Jan 2024 at 23:45:11 +, Steve Langasek wrote:
> Dear maintainer,

(I am a games team member but not a maintainer of this particular package)

> diff -Nru allegro4.4-4.4.3.1/debian/liballeggl4.4t64.4.install 
> allegro4.4-4.4.3.1/debian/liballeggl4.4t64.4.install
> --- allegro4.4-4.4.3.1/debian/liballeggl4.4t64.4.install  1970-01-01 
> 00:00:00.0 +
> +++ allegro4.4-4.4.3.1/debian/liballeggl4.4t64.4.install  2023-08-28 
> 13:02:32.0 +

Should this have been liballeggl4.4t64.install, without the last ".4"?

> diff -Nru allegro4.4-4.4.3.1/debian/liballeggl4.4t64.4.lintian-overrides 
> allegro4.4-4.4.3.1/debian/liballeggl4.4t64.4.lintian-overrides
> --- allegro4.4-4.4.3.1/debian/liballeggl4.4t64.4.lintian-overrides
> 1970-01-01 00:00:00.0 +
> +++ allegro4.4-4.4.3.1/debian/liballeggl4.4t64.4.lintian-overrides
> 2024-01-29 23:44:39.0 +

Similarly this, and:

> --- allegro4.4-4.4.3.1/debian/liballegro4.4t64.4.examples 1970-01-01 
> 00:00:00.0 +
> +++ allegro4.4-4.4.3.1/debian/liballegro4.4t64.4.examples 2023-08-28 
> 13:02:32.0 +

> --- allegro4.4-4.4.3.1/debian/liballegro4.4t64.4.install  1970-01-01 
> 00:00:00.0 +
> +++ allegro4.4-4.4.3.1/debian/liballegro4.4t64.4.install  2023-08-28 
> 13:02:32.0 +

> --- allegro4.4-4.4.3.1/debian/liballegro4.4t64.4.lintian-overrides
> 1970-01-01 00:00:00.0 +
> +++ allegro4.4-4.4.3.1/debian/liballegro4.4t64.4.lintian-overrides
> 2024-01-29 23:44:39.0 +

> --- allegro4.4-4.4.3.1/debian/libjpgalleg4.4t64.4.install 1970-01-01 
> 00:00:00.0 +
> +++ allegro4.4-4.4.3.1/debian/libjpgalleg4.4t64.4.install 2023-08-28 
> 13:02:32.0 +

> --- allegro4.4-4.4.3.1/debian/libjpgalleg4.4t64.4.lintian-overrides   
> 1970-01-01 00:00:00.0 +
> +++ allegro4.4-4.4.3.1/debian/libjpgalleg4.4t64.4.lintian-overrides   
> 2024-01-29 23:44:39.0 +

> --- allegro4.4-4.4.3.1/debian/libloadpng4.4t64.4.lintian-overrides
> 1970-01-01 00:00:00.0 +
> +++ allegro4.4-4.4.3.1/debian/libloadpng4.4t64.4.lintian-overrides
> 2024-01-29 23:44:39.0 +

> --- allegro4.4-4.4.3.1/debian/liblogg4.4t64.4.install 1970-01-01 
> 00:00:00.0 +
> +++ allegro4.4-4.4.3.1/debian/liblogg4.4t64.4.install 2023-08-28 
> 13:02:32.0 +

> --- allegro4.4-4.4.3.1/debian/liblogg4.4t64.4.lintian-overrides   
> 1970-01-01 00:00:00.0 +
> +++ allegro4.4-4.4.3.1/debian/liblogg4.4t64.4.lintian-overrides   
> 2024-01-29 23:44:39.0 +



Bug#1061884: allegro4.4: NMU diff for 64-bit time_t transition

2024-01-29 Thread Steve Langasek
Source: allegro4.4
Version: 2:4.4.3.1-4
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
allegro4.4 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 allegro4.4
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-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 allegro4.4-4.4.3.1/debian/changelog 
allegro4.4-4.4.3.1/debian/changelog
--- allegro4.4-4.4.3.1/debian/changelog 2023-08-28 13:02:32.0 +
+++ allegro4.4-4.4.3.1/debian/changelog 2024-01-29 23:44:39.0 +
@@ -1,3 +1,10 @@
+allegro4.4 (2:4.4.3.1-4.1) experimental; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.
+
+ -- Steve Langasek   Mon, 29 Jan 2024 23:44:39 +
+
 allegro4.4 (2:4.4.3.1-4) unstable; urgency=medium
 
   * Add a clean dh target to remove CHANGES - fixes building after a
diff -Nru allegro4.4-4.4.3.1/debian/control allegro4.4-4.4.3.1/debian/control
--- allegro4.4-4.4.3.1/debian/control   2023-08-28 13:02:32.0 +
+++ allegro4.4-4.4.3.1/debian/control   2024-01-29 23:44:39.0 +
@@ -26,15 +26,16 @@
 Vcs-Browser: https://salsa.debian.org/games-team/allegro4.4
 Vcs-Git: https://salsa.debian.org/games-team/allegro4.4.git
 
-Package: liballegro4.4
+Package: liballegro4.4t64
+Provides: ${t64:Provides}
 Section: libs
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
  ${shlibs:Depends}
-Breaks: liballegro4.4-plugin-alsa (<= 2:4.4.2-4)
-Replaces: liballegro4.4-plugin-alsa (<= 2:4.4.2-4)
+Breaks: liballegro4.4 (<< ${source:Version}), liballegro4.4-plugin-alsa (<= 
2:4.4.2-4)
+Replaces: liballegro4.4, liballegro4.4-plugin-alsa (<= 2:4.4.2-4)
 Description: portable library for cross-platform game and multimedia 
development
  Allegro is a cross-platform library mainly aimed at video game and multimedia
  programming. It handles common, low-level tasks such as creating windows,
@@ -81,7 +82,10 @@
  accepting user input, loading data, drawing images, playing sounds, etc. and
  generally abstracting away the underlying platform.
 
-Package: liballeggl4.4
+Package: liballeggl4.4t64
+Provides: ${t64:Provides}
+Replaces: liballeggl4.4
+Breaks: liballeggl4.4 (<< ${source:Version})
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -132,7 +136,10 @@
  accepting user input, loading data, drawing images, playing sounds, etc. and
  generally abstracting away the underlying platform.
 
-Package: libjpgalleg4.4
+Package: libjpgalleg4.4t64
+Provides: ${t64:Provides}
+Replaces: libjpgalleg4.4
+Breaks: libjpgalleg4.4 (<< ${source:Version})
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -166,7 +173,10 @@
  accepting user input, loading data, drawing images, playing sounds, etc. and
  generally abstracting away the underlying platform.
 
-Package: libloadpng4.4
+Package: libloadpng4.4t64
+Provides: ${t64:Provides}
+Replaces: libloadpng4.4
+Breaks: libloadpng4.4 (<< ${source:Version})
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -200,7 +210,10 @@
  accepting user input, loading data, drawing images, playing sounds, etc. and
  generally abstracting away the underlying platform.
 
-Package: liblogg4.4
+Package: li