[Pkg-ayatana-devel] Bug#967570: libdbusmenu: depends on deprecated GTK 2
Bastian Germann
bage at debian.org
Fri Aug 11 14:45:35 BST 2023
I am uploading a NMU to DELAYED/10 to fix this. The debdiff is attached.
-------------- next part --------------
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.000000000 +0100
+++ libdbusmenu-18.10.20180917~bzr492+repack1/debian/changelog 2023-08-11 14:59:51.000000000 +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 <bage at debian.org> Fri, 11 Aug 2023 12:59:51 +0000
+
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/control 2022-11-05 11:03:36.000000000 +0100
+++ libdbusmenu-18.10.20180917~bzr492+repack1/debian/control 2023-08-11 14:59:51.000000000 +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.000000000 +0200
+++ libdbusmenu-18.10.20180917~bzr492+repack1/debian/gir1.2-dbusmenu-gtk-0.4.install 1970-01-01 01:00:00.000000000 +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.000000000 +0200
+++ libdbusmenu-18.10.20180917~bzr492+repack1/debian/libdbusmenu-gtk4.install 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/lib/*/libdbusmenu-gtk.so.*
diff -Nru libdbusmenu-18.10.20180917~bzr492+repack1/debian/libdbusmenu-gtk4.symbols libdbusmenu-18.10.20180917~bzr492+repack1/debian/libdbusmenu-gtk4.symbols
--- libdbusmenu-18.10.20180917~bzr492+repack1/debian/libdbusmenu-gtk4.symbols 2019-11-20 16:41:29.000000000 +0100
+++ libdbusmenu-18.10.20180917~bzr492+repack1/debian/libdbusmenu-gtk4.symbols 1970-01-01 01:00:00.000000000 +0100
@@ -1,37 +0,0 @@
-libdbusmenu-gtk.so.4 libdbusmenu-gtk4 #MINVER#
-*Build-Depends-Package: libdbusmenu-gtk-dev
- dbusmenu_gtk_parse_get_cached_item at Base 0.4.2
- dbusmenu_gtk_parse_menu_structure at Base 0.4.2
- dbusmenu_gtkclient_get_accel_group at Base 0.4.2
- dbusmenu_gtkclient_get_type at Base 0.4.2
- dbusmenu_gtkclient_menuitem_get at Base 0.4.2
- dbusmenu_gtkclient_menuitem_get_submenu at Base 0.4.2
- dbusmenu_gtkclient_new at Base 0.4.2
- dbusmenu_gtkclient_newitem_base at Base 0.4.2
- dbusmenu_gtkclient_set_accel_group at Base 0.4.2
- dbusmenu_gtkmenu_get_client at Base 0.4.2
- dbusmenu_gtkmenu_get_type at Base 0.4.2
- dbusmenu_gtkmenu_new at Base 0.4.2
- dbusmenu_menuitem_property_get_image at Base 0.4.2
- dbusmenu_menuitem_property_get_shortcut at Base 0.4.2
- dbusmenu_menuitem_property_set_image at Base 0.4.2
- dbusmenu_menuitem_property_set_shortcut at Base 0.4.2
- dbusmenu_menuitem_property_set_shortcut_menuitem at Base 0.4.2
- dbusmenu_menuitem_property_set_shortcut_string at Base 0.4.2
- genericmenuitem_check_type_get_nick at Base 0.4.92
- genericmenuitem_check_type_get_type at Base 0.4.92
- genericmenuitem_check_type_get_value_from_nick at Base 0.4.92
- genericmenuitem_disposition_get_nick at Base 0.4.92
- genericmenuitem_disposition_get_type at Base 0.4.92
- genericmenuitem_disposition_get_value_from_nick at Base 0.4.92
- genericmenuitem_get_disposition at Base 0.4.92
- genericmenuitem_get_image at Base 0.4.2
- genericmenuitem_get_type at Base 0.4.2
- genericmenuitem_set_check_type at Base 0.4.2
- genericmenuitem_set_disposition at Base 0.4.92
- genericmenuitem_set_image at Base 0.4.2
- genericmenuitem_set_state at Base 0.4.2
- genericmenuitem_state_get_nick at Base 0.4.92
- genericmenuitem_state_get_type at Base 0.4.92
- genericmenuitem_state_get_value_from_nick at Base 0.4.92
- theme_dir_db at Base 0.4.2
diff -Nru libdbusmenu-18.10.20180917~bzr492+repack1/debian/libdbusmenu-gtk-dev.install libdbusmenu-18.10.20180917~bzr492+repack1/debian/libdbusmenu-gtk-dev.install
--- libdbusmenu-18.10.20180917~bzr492+repack1/debian/libdbusmenu-gtk-dev.install 2018-07-16 11:14:39.000000000 +0200
+++ libdbusmenu-18.10.20180917~bzr492+repack1/debian/libdbusmenu-gtk-dev.install 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-usr/include/libdbusmenu-gtk-0.4/libdbusmenu-gtk
-usr/lib/*/libdbusmenu-gtk.a
-usr/lib/*/libdbusmenu-gtk.so
-usr/lib/*/pkgconfig/dbusmenu-gtk-0.4.pc
-usr/share/gir-1.0/DbusmenuGtk-0.4.gir
-usr/share/vala/vapi/DbusmenuGtk-0.4.vapi
diff -Nru libdbusmenu-18.10.20180917~bzr492+repack1/debian/rules libdbusmenu-18.10.20180917~bzr492+repack1/debian/rules
--- libdbusmenu-18.10.20180917~bzr492+repack1/debian/rules 2019-11-20 16:23:10.000000000 +0100
+++ libdbusmenu-18.10.20180917~bzr492+repack1/debian/rules 2023-08-11 14:59:51.000000000 +0200
@@ -4,12 +4,11 @@
DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/buildflags.mk
-FLAVORS = gtk2 gtk3
+FLAVORS = gtk3
-CONFIGURE_FLAGS_gtk2 = --with-gtk=2
CONFIGURE_FLAGS_gtk3 = --with-gtk=3
-CONFIGURE_COMMON_FLAGS += --disable-scrollkeeper --enable-gtk-doc --enable-introspection --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
+CONFIGURE_COMMON_FLAGS += --disable-dumper --disable-scrollkeeper --enable-gtk-doc --enable-introspection --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
INSTALL_COMMON_FLAGS =
MISSING_COMMON_FLAGS = --fail-missing
@@ -52,10 +51,6 @@
endif
override_dh_missing:
- dh_missing $(MISSING_COMMON_FLAGS) -plibdbusmenu-gtk4 --sourcedir=debian/tmp/gtk2
- dh_missing $(MISSING_COMMON_FLAGS) -plibdbusmenu-gtk-dev --sourcedir=debian/tmp/gtk2
- dh_missing $(MISSING_COMMON_FLAGS) -plibdbusmenu-gtk-doc --sourcedir=debian/tmp/gtk2
- dh_missing $(MISSING_COMMON_FLAGS) -pgir1.2-dbusmenu-gtk-0.4 --sourcedir=debian/tmp/gtk2
dh_missing $(MISSING_COMMON_FLAGS) -pgir1.2-dbusmenu-glib-0.4 --sourcedir=debian/tmp/gtk3
dh_missing $(MISSING_COMMON_FLAGS) -pgir1.2-dbusmenu-gtk3-0.4 --sourcedir=debian/tmp/gtk3
dh_missing $(MISSING_COMMON_FLAGS) -plibdbusmenu-glib4 --sourcedir=debian/tmp/gtk3
@@ -69,14 +64,6 @@
override_dh_install:
find debian/tmp -name \*.la -delete
- # Remove gtk2 copies of dbusmenu-tools (we use the gtk3 build)
- rm -f debian/tmp/gtk2/usr/lib/x86_64-linux-gnu/dbusmenu-testapp
- rm -f debian/tmp/gtk2/usr/lib/x86_64-linux-gnu/dbusmenu-dumper
- rm -f debian/tmp/gtk2/usr/lib/x86_64-linux-gnu/dbusmenu-bench
- dh_install $(INSTALL_COMMON_FLAGS) -plibdbusmenu-gtk4 --sourcedir=debian/tmp/gtk2
- dh_install $(INSTALL_COMMON_FLAGS) -plibdbusmenu-gtk-dev --sourcedir=debian/tmp/gtk2
- dh_install $(INSTALL_COMMON_FLAGS) -plibdbusmenu-gtk-doc --sourcedir=debian/tmp/gtk2
- dh_install $(INSTALL_COMMON_FLAGS) -pgir1.2-dbusmenu-gtk-0.4 --sourcedir=debian/tmp/gtk2
dh_install $(INSTALL_COMMON_FLAGS) -pgir1.2-dbusmenu-glib-0.4 --sourcedir=debian/tmp/gtk3
dh_install $(INSTALL_COMMON_FLAGS) -pgir1.2-dbusmenu-gtk3-0.4 --sourcedir=debian/tmp/gtk3
dh_install $(INSTALL_COMMON_FLAGS) -plibdbusmenu-glib4 --sourcedir=debian/tmp/gtk3
@@ -89,7 +76,6 @@
dh_install $(INSTALL_COMMON_FLAGS) -plibdbusmenu-tools --sourcedir=debian/tmp/gtk3
override_dh_shlibdeps:
- dh_shlibdeps -plibdbusmenu-gtk4 -- -xlibgtk2.0-0
dh_shlibdeps -plibdbusmenu-gtk3-4 -- -xlibgtk-3-0
dh_shlibdeps -plibdbusmenu-glib4
dh_shlibdeps -plibdbusmenu-jsonloader4
More information about the Pkg-ayatana-devel
mailing list