Bug#1063062: vte: NMU diff for 64-bit time_t transition

2024-02-28 Thread 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 vte-0.28.2/debian/changelog vte-0.28.2/debian/changelog
--- vte-0.28.2/debian/changelog 2019-02-02 12:52:36.0 +
+++ vte-0.28.2/debian/changelog 2024-02-28 23:29:46.0 +
@@ -1,3 +1,10 @@
+vte (1:0.28.2-6.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1063062
+
+ -- Steve Langasek   Wed, 28 Feb 2024 23:29:46 +
+
 vte (1:0.28.2-6) unstable; urgency=medium
 
   * Stop building python-vte and libvte-doc
diff -Nru vte-0.28.2/debian/control vte-0.28.2/debian/control
--- vte-0.28.2/debian/control   2019-02-02 12:52:36.0 +
+++ vte-0.28.2/debian/control   2024-02-28 23:29:46.0 +
@@ -6,7 +6,7 @@
 Section: libs
 Priority: optional
 Maintainer: Debian GNOME Maintainers 

-Uploaders: Jeremy Bicha , Jordi Mallach , 
Josselin Mouette , Michael Biebl 
+Uploaders: Jordi Mallach , Josselin Mouette 
, Michael Biebl 
 Build-Depends: debhelper-compat (= 11),
dh-sequence-gnome,
libglib2.0-dev (>= 2.26.0),
@@ -23,7 +23,10 @@
 Vcs-Git: https://salsa.debian.org/gnome-team/vte.git
 Homepage: https://wiki.gnome.org/Apps/Terminal/VTE
 
-Package: libvte9
+Package: libvte9t64
+Provides: ${t64:Provides}
+Replaces: libvte9
+Breaks: libvte9 (<< ${source:Version})
 Architecture: any
 Depends: ${misc:Depends},
  ${shlibs:Depends},
@@ -56,7 +59,7 @@
 Architecture: any
 Section: libdevel
 Depends: ${misc:Depends},
- libvte9 (= ${binary:Version}),
+ libvte9t64 (= ${binary:Version}),
  libcairo2-dev,
  libx11-dev,
  libgtk2.0-dev (>= 2.20.0),
diff -Nru vte-0.28.2/debian/control.in vte-0.28.2/debian/control.in
--- vte-0.28.2/debian/control.in2019-02-02 12:52:36.0 +
+++ vte-0.28.2/debian/control.in2024-02-28 23:29:19.0 +
@@ -19,7 +19,10 @@
 Vcs-Git: https://salsa.debian.org/gnome-team/vte.git
 Homepage: https://wiki.gnome.org/Apps/Terminal/VTE
 
-Package: libvte9
+Package: libvte9t64
+Provides: ${t64:Provides}
+Replaces: libvte9
+Breaks: libvte9 (<< ${source:Version})
 Architecture: any
 Depends: ${misc:Depends},
  ${shlibs:Depends},
@@ -52,7 +55,7 @@
 Architecture: any
 Section: libdevel
 Depends: ${misc:Depends},
- libvte9 (= ${binary:Version}),
+ libvte9t64 (= ${binary:Version}),
  libcairo2-dev,
  libx11-dev,
  libgtk2.0-dev (>= 2.20.0),
diff -Nru vte-0.28.2/debian/libvte9.install vte-0.28.2/debian/libvte9.install
--- vte-0.28.2/debian/libvte9.install   2019-02-02 12:52:36.0 +
+++ vte-0.28.2/debian/libvte9.install   1970-01-01 00:00:00.0 +
@@ -1 +0,0 @@
-usr/lib/*/libvte.so.*
diff -Nru vte-0.28.2/debian/libvte9.lintian-overrides 
vte-0.28.2/debian/libvte9.lintian-overrides
--- vte-0.28.2/debian/libvte9.lintian-overrides 2019-02-02 12:52:36.0 
+
+++ vte-0.28.2/debian/libvte9.lintian-overrides 1970-01-01 00:00:00.0 
+
@@ -1,2 +0,0 @@
-# Setgid on purpose to write the utmp file
-libvte9: setgid-binary usr/lib/libvte9/gnome-pty-helper 2755 root/utmp
diff -Nru vte-0.28.2/debian/libvte9.symbols vte-0.28.2/debian/libvte9.symbols
--- vte-0.28.2/debian/libvte9.symbols   2019-02-02 12:52:36.0 +
+++ vte-0.28.2/debian/libvte9.symbols   1970-01-01 00:00:00.0 +
@@ -1,135 +0,0 @@
-libvte.so.9 libvte9 #MINVER#
- _vte_debug_flags@Base 1:0.24.0
- _vte_debug_init@Base 1:0.24.0
- _vte_pty_close@Base 1:0.24.0
- _vte_pty_get_size@Base 1:0.24.0
- _vte_pty_open@Base 1:0.24.0
- _vte_pty_set_size@Base 1:0.24.0
- _vte_pty_set_utf8@Base 1:0.24.0
- vte_get_user_shell@Base 1:0.28.0
- vte_pty_child_setup@Base 1:0.28.0
- vte_pty_close@Base 1:0.28.0
- vte_pty_error_get_type@Base 1:0.28.0
- vte_pty_error_quark@Base 1:0.28.0
- vte_pty_flags_get_type@Base 1:0.28.0
- vte_pty_get_fd@Base 1:0.28.0
- vte_pty_get_size@Base 1:0.28.0
- vte_pty_get_type@Base 1:0.28.0
- vte_pty_new@Base 1:0.28.0
- vte_pty_new_foreign@Base 1:0.28.0
- vte_pty_set_size@Base 1:0.28.0
- vte_pty_set_term@Base 1:0.28.0
- vte_pty_set_utf8@Base 1:0.28.0
- vte_reaper_add_child@Base 1:0.24.0
- vte_reaper_get@Base 1:0.24.0
- vte_reaper_get_type@Base 1:0.24.0
- vte_terminal_accessible_factory_get_type@Base 1:0.24.0
- vte_terminal_accessible_factory_new@Base 1:0.24.0

Bug#1063062: vte: NMU diff for 64-bit time_t transition

2024-02-04 Thread Sven Joachim
On 2024-02-04 19:50 +, Steve Langasek wrote:

> Source: vte
> Version: 1:0.28.2-6
> Severity: serious
> Tags: patch pending sid trixie
> Justification: library ABI skew on upgrade
> User: debian-...@lists.debian.org
> Usertags: time-t
>
> diff -Nru vte-0.28.2/debian/control vte-0.28.2/debian/control
> --- vte-0.28.2/debian/control 2019-02-02 12:52:36.0 +
> +++ vte-0.28.2/debian/control 2024-02-04 19:24:45.0 +
> @@ -76,7 +79,7 @@
>  Package: libvte-common
>  Architecture: all
>  Depends: ${misc:Depends}
> -Breaks: libvte9 (<< 1:0.28)
> +Breaks: libvte9t64 (<< 1:0.28)

This change (and the corresponding one in control.in) looks incorrect to
me.  Old versions of the library package (in this case versions before
1:0.28) are not going to be renamed retroactively, so the Breaks should
be left alone.

Bug in your conversion script?

Cheers,
   Sven



Bug#1063062: vte: NMU diff for 64-bit time_t transition

2024-02-04 Thread Steve Langasek
Source: vte
Version: 1:0.28.2-6
Severity: serious
Tags: patch pending sid trixie
Justification: library ABI skew on upgrade
User: debian-...@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
vte 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 vte
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')
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 vte-0.28.2/debian/changelog vte-0.28.2/debian/changelog
--- vte-0.28.2/debian/changelog 2019-02-02 12:52:36.0 +
+++ vte-0.28.2/debian/changelog 2024-02-04 19:24:45.0 +
@@ -1,3 +1,10 @@
+vte (1:0.28.2-6.1) experimental; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.
+
+ -- Steve Langasek   Sun, 04 Feb 2024 19:24:45 +
+
 vte (1:0.28.2-6) unstable; urgency=medium
 
   * Stop building python-vte and libvte-doc
diff -Nru vte-0.28.2/debian/control vte-0.28.2/debian/control
--- vte-0.28.2/debian/control   2019-02-02 12:52:36.0 +
+++ vte-0.28.2/debian/control   2024-02-04 19:24:45.0 +
@@ -6,7 +6,7 @@
 Section: libs
 Priority: optional
 Maintainer: Debian GNOME Maintainers 

-Uploaders: Jeremy Bicha , Jordi Mallach , 
Josselin Mouette , Michael Biebl 
+Uploaders: Jordi Mallach , Josselin Mouette 
, Michael Biebl 
 Build-Depends: debhelper-compat (= 11),
dh-sequence-gnome,
libglib2.0-dev (>= 2.26.0),
@@ -23,7 +23,10 @@
 Vcs-Git: https://salsa.debian.org/gnome-team/vte.git
 Homepage: https://wiki.gnome.org/Apps/Terminal/VTE
 
-Package: libvte9
+Package: libvte9t64
+Provides: ${t64:Provides}
+Replaces: libvte9
+Breaks: libvte9 (<< ${source:Version})
 Architecture: any
 Depends: ${misc:Depends},
  ${shlibs:Depends},
@@ -56,7 +59,7 @@
 Architecture: any
 Section: libdevel
 Depends: ${misc:Depends},
- libvte9 (= ${binary:Version}),
+ libvte9t64 (= ${binary:Version}),
  libcairo2-dev,
  libx11-dev,
  libgtk2.0-dev (>= 2.20.0),
@@ -76,7 +79,7 @@
 Package: libvte-common
 Architecture: all
 Depends: ${misc:Depends}
-Breaks: libvte9 (<< 1:0.28)
+Breaks: libvte9t64 (<< 1:0.28)
 Description: Terminal emulator widget for GTK+ 2.x - common files
  The VTE library provides a terminal emulator widget VteTerminal for
  applications using the GTK+ toolkit. It also provides the VtePTY object
diff -Nru vte-0.28.2/debian/control.in vte-0.28.2/debian/control.in
--- vte-0.28.2/debian/control.in2019-02-02 12:52:36.0 +
+++ vte-0.28.2/debian/control.in2024-02-04 19:24:44.0 +
@@ -19,7 +19,10 @@
 Vcs-Git: https://salsa.debian.org/gnome-team/vte.git
 Homepage: https://wiki.gnome.org/Apps/Terminal/VTE
 
-Package: libvte9
+Package: libvte9t64
+Provides: ${t64:Provides}
+Replaces: libvte9
+Breaks: libvte9 (<< ${source:Version})
 Architecture: any
 Depends: ${misc:Depends},
  ${shlibs:Depends},
@@ -52,7 +55,7 @@
 Architecture: any
 Section: libdevel
 Depends: ${misc:Depends},
- libvte9 (= ${binary:Version}),
+ libvte9t64 (= ${binary:Version}),
  libcairo2-dev,
  libx11-dev,
  libgtk2.0-dev (>= 2.20.0),
@@ -72,7 +75,7 @@
 Package: libvte-common
 Architecture: all
 Depends: ${misc:Depends}
-Breaks: libvte9 (<<