Bug#967570: libdbusmenu: depends on deprecated GTK 2

2023-08-11 Thread Bastian Germann 

I am uploading a NMU to DELAYED/10 to fix this. The debdiff is attached.diff -Nru libdbusmenu-18.10.20180917~bzr492+repack1/debian/changelog 
libdbusmenu-18.10.20180917~bzr492+repack1/debian/changelog
--- libdbusmenu-18.10.20180917~bzr492+repack1/debian/changelog  2022-11-05 
11:04:11.0 +0100
+++ libdbusmenu-18.10.20180917~bzr492+repack1/debian/changelog  2023-08-11 
14:59:51.0 +0200
@@ -1,3 +1,12 @@
+libdbusmenu (18.10.20180917~bzr492+repack1-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload
+  * Replace libgdk-pixbuf2.0-dev with libgdk-pixbuf-2.0-dev (Closes: #1037384)
+  * Drop GTK2 packages and dbusmenu-dumper tool (Closes: #967570)
+  * Actually drop build dependency on quilt
+
+ -- Bastian Germann   Fri, 11 Aug 2023 12:59:51 +
+
 libdbusmenu (18.10.20180917~bzr492+repack1-3) unstable; urgency=medium
 
   * debian/control:
diff -Nru libdbusmenu-18.10.20180917~bzr492+repack1/debian/control 
libdbusmenu-18.10.20180917~bzr492+repack1/debian/control
--- libdbusmenu-18.10.20180917~bzr492+repack1/debian/control2022-11-05 
11:03:36.0 +0100
+++ libdbusmenu-18.10.20180917~bzr492+repack1/debian/control2023-08-11 
14:59:51.0 +0200
@@ -12,15 +12,13 @@
  gtk-doc-tools,
  intltool,
  libatk1.0-dev,
- libgdk-pixbuf2.0-dev (>= 2.22.1-0ubuntu4),
+ libgdk-pixbuf-2.0-dev,
  libgirepository1.0-dev (>= 0.9.3),
  libglib2.0-dev (>= 2.35.4),
  libgtk-3-dev (>= 2.99.2-1ubuntu2),
- libgtk2.0-dev (>= 2.24.4-1~),
  libjson-glib-dev (>= 0.13.4),
  libtool,
  libx11-dev (>= 1.3),
- quilt,
  valac (>= 0.16),
  valgrind-if-available,
  xauth,
@@ -29,7 +27,7 @@
 Rules-Requires-Root: no
 Homepage: https://launchpad.net/dbusmenu
 Vcs-Git: https://salsa.debian.org/debian-ayatana-team/libdbusmenu.git
-Vcs-Browser: https://salsa.debian.org/debian-edu-ayatana-team/libdbusmenu
+Vcs-Browser: https://salsa.debian.org/debian-ayatana-team/libdbusmenu
 
 Package: gir1.2-dbusmenu-glib-0.4
 Section: introspection
@@ -46,21 +44,6 @@
  This package can be used by other packages using the GIRepository format to
  generate dynamic bindings for libdbusmenu-glib4.
 
-Package: gir1.2-dbusmenu-gtk-0.4
-Section: introspection
-Architecture: any
-Multi-Arch: same
-Depends: libdbusmenu-gtk4 (= ${binary:Version}),
- ${gir:Depends},
- ${misc:Depends},
-Description: typelib file for libdbusmenu-gtk4 (GTK-2 variant)
- libdbusmenu passes a menu structure across DBus so that a program can
- create a menu simply without worrying about how it is displayed on the
- other side of the bus.
- .
- This package can be used by other packages using the GIRepository format to
- generate dynamic bindings for libdbusmenu-gtk4.
-
 Package: gir1.2-dbusmenu-gtk3-0.4
 Section: introspection
 Architecture: any
@@ -114,23 +97,6 @@
  .
  This package contains shared libraries to be used by applications.
 
-Package: libdbusmenu-gtk-dev
-Section: libdevel
-Architecture: any
-Depends: gir1.2-dbusmenu-gtk-0.4 (= ${binary:Version}),
- libdbusmenu-glib-dev,
- libdbusmenu-gtk4 (= ${binary:Version}),
- libgtk2.0-dev (>= 2.12.0),
- ${misc:Depends},
- ${shlibs:Depends},
-Multi-Arch: same
-Description: library for passing menus over DBus - GTK-2+ version development 
files
- libdbusmenu passes a menu structure across DBus so that a program can
- create a menu simply without worrying about how it is displayed on the
- other side of the bus.
- .
- This package contains files that are needed to build GTK-2+ applications.
-
 Package: libdbusmenu-gtk-doc
 Section: doc
 Architecture: all
@@ -170,17 +136,6 @@
  .
  This package contains files that are needed to build GTK-3+ applications.
 
-Package: libdbusmenu-gtk4
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Multi-Arch: same
-Description: library for passing menus over DBus - GTK-2+ version
- libdbusmenu passes a menu structure across DBus so that a program can
- create a menu simply without worrying about how it is displayed on the
- other side of the bus.
- .
- This package contains shared libraries to be used by GTK-2+ applications.
-
 Package: libdbusmenu-jsonloader-dev
 Section: libdevel
 Architecture: any
diff -Nru 
libdbusmenu-18.10.20180917~bzr492+repack1/debian/gir1.2-dbusmenu-gtk-0.4.install
 
libdbusmenu-18.10.20180917~bzr492+repack1/debian/gir1.2-dbusmenu-gtk-0.4.install
--- 
libdbusmenu-18.10.20180917~bzr492+repack1/debian/gir1.2-dbusmenu-gtk-0.4.install
2018-07-16 11:14:39.0 +0200
+++ 
libdbusmenu-18.10.20180917~bzr492+repack1/debian/gir1.2-dbusmenu-gtk-0.4.install
1970-01-01 01:00:00.0 +0100
@@ -1 +0,0 @@
-usr/lib/*/girepository-1.0/DbusmenuGtk-0.4.typelib
diff -Nru 
libdbusmenu-18.10.20180917~bzr492+repack1/debian/libdbusmenu-gtk4.install 
libdbusmenu-18.10.20180917~bzr492+repack1/debian/libdbusmenu-gtk4.install
--- libdbusmenu-18.10.20180917~bzr492+repack1/debian/libdbusmenu-gtk4.install   
2018-07-16 11:14:39.0 +0200
+++ libdbusmenu-18.10.20180917~bzr492+repack1/debian/libdbusmenu-gtk4.install   
1970-01-01 01:00:00.0

Bug#967570: libdbusmenu: depends on deprecated GTK 2

2023-07-23 Thread Simon McVittie 
On Tue, 04 Aug 2020 at 11:51:24 +0100, s...@debian.org wrote:
> This package has Build-Depends on GTK 2 (libgtk2.0-dev), or produces
> binary packages with a Depends on GTK 2.

It seems there are only two blockers for disabling the GTK 2 parts
of libdbusmenu:

1. libayatana-appindicator still builds GTK 2 libraries that depend
   on libdbusmenu (#967567)
2. waybar has an apparently unnecessary build-dependency on
   libdbusmenu-gtk-dev (bug filed)

After those are both resolved, please drop the gir1.2-dbusmenu-gtk-0.4,
libdbusmenu-gtk-dev, libdbusmenu-gtk-doc, libdbusmenu-gtk4 binary packages
and any build-dependencies that were only needed for those (in particular
libgtk2.0-dev).

The GTK 3 parts of libdbusmenu are out of scope for this bug.

Thanks,
smcv