Control: tags -1 + patch
On Sat, 25 Oct 2025 at 16:12:03 +0100, Simon McVittie wrote:
As announced in [MBF] and [#1117130] the GNOME team would like to remove
libgirepository1.0-dev during the forky cycle. According to dak, this
source package contains a Depends or Build-Depends on
libgirepository1.0-dev which blocks its removal.
Please consider the attached patches.
I've confirmed using diffoscope that the only change to the contents of
the binary packages is the addition of missing Depends/Provides in the
-dev package:
│ │ │ │ Package: libsugarext-dev
│ │ │ │ ...
│ │ │ │ -Depends: gir1.2-sugarext-1.0 (= 0.121-1), libsugarext0 (= 0.121-1),
libasound2-dev, libglib2.0-dev, libgtk-3-dev, libice-dev, libsm-dev,
libx11-dev, libxfixes-dev, libxi-dev
│ │ │ │ +Depends: libsugarext0 (= 0.121-1), libasound2-dev, libglib2.0-dev,
libgtk-3-dev, libice-dev, libsm-dev, libx11-dev, libxfixes-dev, libxi-dev,
gir1.2-gdk-3.0-dev, gir1.2-gtk-3.0-dev, gir1.2-sugarext-1.0 (= 0.121-1)
│ │ │ │ +Provides: gir1.2-sugarext-1.0-dev (= 0.121-1),
gir1.2-sugargestures-1.0-dev (= 0.121-1)
piuparts also passes. Not tested beyond that.
Thanks,
smcv
>From ebe4d27a246b833c2d14c6f56ccf90ace1ab1598 Mon Sep 17 00:00:00 2001
From: Simon McVittie <[email protected]>
Date: Thu, 20 Aug 2026 10:30:46 +0100
Subject: [PATCH 1/5] d/control: Build-Depend on required GIR XML by their
systematic names
As recommended by warnings shown by dh_girepository during build.
---
debian/control | 2 ++
1 file changed, 2 insertions(+)
diff --git a/debian/control b/debian/control
index 6e69257c..1616b667 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,8 @@ Build-Depends:
dh-sequence-gir,
dh-sequence-python3,
gettext,
+ gir1.2-gdk-3.0-dev,
+ gir1.2-gtk-3.0-dev,
# linux-libc-dev/hurd-dev needed by sugar-fatattr
hurd-dev [hurd-any],
intltool,
--
2.55.0
>From e7c1f9e6510a57947b400ab710b5996ad27e1b30 Mon Sep 17 00:00:00 2001
From: Simon McVittie <[email protected]>
Date: Thu, 20 Aug 2026 10:32:13 +0100
Subject: [PATCH 2/5] d/control: Automate typelib Provides via ${gir:Provides}
This avoids needing to hard-code the name of the provided typelib,
which is a potential source of mistakes.
---
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index 1616b667..dbf5c180 100644
--- a/debian/control
+++ b/debian/control
@@ -171,7 +171,7 @@ Depends:
${gir:Depends},
${misc:Depends},
Provides:
- gir1.2-sugargestures-1.0 (= ${binary:Version}),
+ ${gir:Provides},
Description: Sugar Learning Platform - toolkit GObject introspection
Sugar Learning Platform promotes collaborative learning
through Sugar Activities that encourage critical thinking,
--
2.55.0
>From a6e024f4a0c8c79af887b44b79ca3cb38374ce06 Mon Sep 17 00:00:00 2001
From: Simon McVittie <[email protected]>
Date: Thu, 20 Aug 2026 10:33:09 +0100
Subject: [PATCH 3/5] d/control: Use ${gir:Depends} in -dev package
This automatically depends on the corresponding typelib, and also
adds dependencies on required GIR XML files by their systematic names.
---
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index dbf5c180..c3468f1b 100644
--- a/debian/control
+++ b/debian/control
@@ -85,9 +85,9 @@ Section: libdevel
Architecture: any
Multi-Arch: same
Depends:
- gir1.2-sugarext-1.0 (= ${binary:Version}),
libsugarext0 (= ${binary:Version}),
${devlibs:Depends},
+ ${gir:Depends},
${misc:Depends},
Description: Sugar Learning Platform - toolkit development files
Sugar Learning Platform promotes collaborative learning
--
2.55.0
>From 634c288c5175b76dd20c7da7cfc826066c66fa68 Mon Sep 17 00:00:00 2001
From: Simon McVittie <[email protected]>
Date: Thu, 20 Aug 2026 10:33:55 +0100
Subject: [PATCH 4/5] d/control: Add ${gir:Provides} to -dev package
This gives it a Provides for the systematic names representing the GIR
XML, gir1.2-sugarext-1.0-dev and gir1.2-sugargestures-1.0-dev.
---
debian/control | 2 ++
1 file changed, 2 insertions(+)
diff --git a/debian/control b/debian/control
index c3468f1b..6f7fdeec 100644
--- a/debian/control
+++ b/debian/control
@@ -89,6 +89,8 @@ Depends:
${devlibs:Depends},
${gir:Depends},
${misc:Depends},
+Provides:
+ ${gir:Provides},
Description: Sugar Learning Platform - toolkit development files
Sugar Learning Platform promotes collaborative learning
through Sugar Activities that encourage critical thinking,
--
2.55.0
>From 5840444533a3b2c5e7dd2935b6d54cd687498ad6 Mon Sep 17 00:00:00 2001
From: Simon McVittie <[email protected]>
Date: Thu, 20 Aug 2026 10:34:48 +0100
Subject: [PATCH 5/5] d/control: Replace deprecated B-D libgirepository1.0-dev
Closes: #1118922
---
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index 6f7fdeec..7b596c8e 100644
--- a/debian/control
+++ b/debian/control
@@ -13,12 +13,12 @@ Build-Depends:
gettext,
gir1.2-gdk-3.0-dev,
gir1.2-gtk-3.0-dev,
+ gobject-introspection (>= 1.80),
# linux-libc-dev/hurd-dev needed by sugar-fatattr
hurd-dev [hurd-any],
intltool,
libasound2-dev | libasound-dev,
libgdk-pixbuf-2.0-dev,
- libgirepository1.0-dev,
libgtk-3-dev,
libice-dev,
librsvg2-dev,
--
2.55.0
