Package: release.debian.org
Severity: normal
Tags: bookworm
X-Debbugs-Cc: glib...@packages.debian.org, debian-cr...@lists.debian.org
Control: affects -1 + src:glib2.0
User: release.debian....@packages.debian.org
Usertags: pu
[ Reason ]
Requested by Helmut Grohne on behalf of the cross team.
[ Impact ]
If not approved, backports of packages that participate in bootstrapping
and have had their build-dependency on libglib2.0-dev{,-bin} relaxed to
a build-dependency on the new smaller packages libgio-2.0-dev{,-bin} will
need to revert that change.
[ Tests ]
diffoscope reports that there are no changes to the actual binaries, other
than the new Provides, the version number and some timestamps.
I successfully built
https://salsa.debian.org/debian/libverto/-/tree/wip/smcv/sample-bokworm-backport?ref_type=heads
(which is based on #1082732 and uses libgio-2.0-dev) in a bookworm
environment, and it pulls in libglib2.0-dev instead, as desired.
I also successfully built
https://salsa.debian.org/debian/libportal/-/tree/wip/smcv/nogir
(which uses libgio-2.0-dev and libgio-2.0-dev-bin) in a bookworm
environment without further source changes by using the nogir build-profile,
and it pulls in libglib2.0-dev{,-bin} instead, as desired.
An upgraded bookworm GNOME desktop system runs successfully.
[ Risks ]
Low risk, the changes are trivial.
[ Checklist ]
[x] *all* changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in (old)stable
[x] the issue is verified as fixed in unstable
[ Changes ]
The only change that is not directly part of what Helmut requested is that
I changed the Uploaders field in `debian/control.in` to be identical to
the one in `debian/control`, so that rebuilds with a different version of
gnome-pkg-tools will not alter it. We have stopped using a `debian/control.in`
for this package (and most other GNOME packages) in trixie.
diffstat for glib2.0-2.74.6 glib2.0-2.74.6
changelog | 21 +++++++++++++++++++++
control | 2 ++
control.in | 4 +++-
3 files changed, 26 insertions(+), 1 deletion(-)
diff -Nru glib2.0-2.74.6/debian/changelog glib2.0-2.74.6/debian/changelog
--- glib2.0-2.74.6/debian/changelog 2024-05-14 11:11:32.000000000 +0100
+++ glib2.0-2.74.6/debian/changelog 2024-10-28 08:41:03.000000000 +0000
@@ -1,3 +1,24 @@
+glib2.0 (2.74.6-2+deb12u4) bookworm; urgency=medium
+
+ [ Helmut Grohne ]
+ * Provide libgio-2.0-dev from libglib2.0-dev in bookworm.
+ In unstable, libgio-2.0-dev has been split off from
+ libglib2.0-dev. Some of the build dependencies on libglib2.0-dev
+ will be switched over to libgio-2.0-dev. This causes them to
+ be unsatisfiable in bookworm-backports, unless a bookworm update
+ provides forward compatibility by providing libgio-2.0-dev (which
+ has never been mentioned in bookworm).
+
+ [ Simon McVittie ]
+ * d/control.in: libglib2.0-dev-bin Provides libgio-2.0-dev-bin.
+ Packages backported from trixie/sid might build-depend on
+ libgio-2.0-dev-bin if they participate in bootstrapping and need to
+ run utilities like glib-mkenums or gdbus-codegen during their build.
+ * d/control.in: Freeze Uploaders at the value it previously had in bookworm.
+ This allows `debian/rules clean` to be run without altering d/control.
+
+ -- Simon McVittie <s...@debian.org> Mon, 28 Oct 2024 08:41:03 +0000
+
glib2.0 (2.74.6-2+deb12u3) bookworm; urgency=medium
* d/p/gdbusmessage-Clean-the-cached-arg0-when-setting-the-messa.patch:
diff -Nru glib2.0-2.74.6/debian/control glib2.0-2.74.6/debian/control
--- glib2.0-2.74.6/debian/control 2024-05-14 11:11:32.000000000 +0100
+++ glib2.0-2.74.6/debian/control 2024-10-28 08:41:03.000000000 +0000
@@ -142,6 +142,7 @@
Replaces: libglib2.0-0-dbg (<< 2.51.4-1~)
Suggests: libgirepository1.0-dev (>= 1.62),
libglib2.0-doc
+Provides: libgio-2.0-dev (= ${binary:Version})
Description: Development files for the GLib library
GLib is a library containing many useful C routines for things such
as trees, hashes, lists, and strings. It is a useful general-purpose
@@ -163,6 +164,7 @@
${shlibs:Depends}
Suggests: libgdk-pixbuf2.0-bin,
libxml2-utils
+Provides: libgio-2.0-dev-bin (= ${binary:Version})
Multi-Arch: foreign
Description: Development utilities for the GLib library
GLib is a library containing many useful C routines for things such
diff -Nru glib2.0-2.74.6/debian/control.in glib2.0-2.74.6/debian/control.in
--- glib2.0-2.74.6/debian/control.in 2024-05-14 11:11:32.000000000 +0100
+++ glib2.0-2.74.6/debian/control.in 2024-10-28 08:41:03.000000000 +0000
@@ -2,7 +2,7 @@
Section: libs
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintain...@lists.alioth.debian.org>
-Uploaders: @GNOME_TEAM@, Simon McVittie <s...@debian.org>
+Uploaders: Iain Lane <la...@debian.org>, Jeremy Bicha <jbi...@ubuntu.com>, Simon McVittie <s...@debian.org>
Build-Depends: dbus-daemon <!nocheck> <!noinsttest>,
debhelper-compat (= 13),
dh-sequence-python3,
@@ -138,6 +138,7 @@
Replaces: libglib2.0-0-dbg (<< 2.51.4-1~)
Suggests: libgirepository1.0-dev (>= 1.62),
libglib2.0-doc
+Provides: libgio-2.0-dev (= ${binary:Version})
Description: Development files for the GLib library
GLib is a library containing many useful C routines for things such
as trees, hashes, lists, and strings. It is a useful general-purpose
@@ -159,6 +160,7 @@
${shlibs:Depends}
Suggests: libgdk-pixbuf2.0-bin,
libxml2-utils
+Provides: libgio-2.0-dev-bin (= ${binary:Version})
Multi-Arch: foreign
Description: Development utilities for the GLib library
GLib is a library containing many useful C routines for things such
