[Pkg-ayatana-devel] Bug#967568: libayatana-indicator: depends on deprecated GTK 2

Bastian Germann bage at debian.org
Mon Nov 13 14:53:23 GMT 2023 

Control: tags -1 patch

Please find a patch attached that drops the GTK 2 flavour.
There is no reverse dependency anymore.
-------------- next part --------------
diff -Nru libayatana-indicator-0.9.3/debian/changelog libayatana-indicator-0.9.3/debian/changelog
--- libayatana-indicator-0.9.3/debian/changelog	2022-10-26 00:25:25.000000000 +0200
+++ libayatana-indicator-0.9.3/debian/changelog	2023-11-13 15:27:03.000000000 +0100
@@ -1,3 +1,10 @@
+libayatana-indicator (0.9.3-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Drop GTK 2 support. (Closes: #967568).
+
+ -- Bastian Germann <bage at debian.org>  Mon, 13 Nov 2023 15:27:03 +0100
+
 libayatana-indicator (0.9.3-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru libayatana-indicator-0.9.3/debian/control libayatana-indicator-0.9.3/debian/control
--- libayatana-indicator-0.9.3/debian/control	2022-10-26 00:25:25.000000000 +0200
+++ libayatana-indicator-0.9.3/debian/control	2023-11-13 15:25:22.000000000 +0100
@@ -16,7 +16,6 @@
                xauth,
                xvfb,
                libglib2.0-dev (>= 2.37),
-               libgtk2.0-dev (>= 2.18),
                libgtk-3-dev (>= 2.91.3),
                libayatana-ido3-dev (>= 0.9.0),
 Standards-Version: 4.6.1
@@ -25,31 +24,6 @@
 Vcs-Git: https://salsa.debian.org/debian-ayatana-team/libayatana-indicator.git
 Vcs-Browser: https://salsa.debian.org/debian-edu-ayatana-team/libayatana-indicator
 
-Package: libayatana-indicator7
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-Multi-Arch: same
-Description: panel indicator applet - shared library (GTK-2+ variant)
- The Ayatana Indicators library contains information to build indicators
- to go into modern desktops' indicator applets.
- .
- This package contains the library itself (GTK-2+ variant).
-
-Package: libayatana-indicator-dev
-Section: libdevel
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         libgtk2.0-dev (>= 2.12.0),
-         libayatana-indicator7 (= ${binary:Version}),
-Description: panel indicator applet - library development files (GTK-2+)
- The Ayatana Indicators library contains information to build indicators
- to go into modern desktops' indicator applets.
- .
- This package contains files that are needed to build GTK-2+ applications
- with Ayatana Indicator support.
-
 Package: libayatana-indicator3-7
 Architecture: any
 Depends: ${shlibs:Depends},
diff -Nru libayatana-indicator-0.9.3/debian/libayatana-indicator7.install libayatana-indicator-0.9.3/debian/libayatana-indicator7.install
--- libayatana-indicator-0.9.3/debian/libayatana-indicator7.install	2021-11-18 12:51:24.000000000 +0100
+++ libayatana-indicator-0.9.3/debian/libayatana-indicator7.install	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/lib/*/libayatana-indicator.so.*
diff -Nru libayatana-indicator-0.9.3/debian/libayatana-indicator7.symbols libayatana-indicator-0.9.3/debian/libayatana-indicator7.symbols
--- libayatana-indicator-0.9.3/debian/libayatana-indicator7.symbols	2019-11-20 15:18:48.000000000 +0100
+++ libayatana-indicator-0.9.3/debian/libayatana-indicator7.symbols	1970-01-01 01:00:00.000000000 +0100
@@ -1,36 +0,0 @@
-libayatana-indicator.so.7 libayatana-indicator7 #MINVER#
-*Build-Depends-Package: libayatana-indicator-dev
- ICON_SIZE at Base 0.6.0
- INDICATOR_NAMES_DATA at Base 0.6.0
- indicator_desktop_shortcuts_get_nicks at Base 0.6.0
- indicator_desktop_shortcuts_get_type at Base 0.6.0
- indicator_desktop_shortcuts_new at Base 0.6.0
- indicator_desktop_shortcuts_nick_exec at Base 0.6.0
- indicator_desktop_shortcuts_nick_exec_with_context at Base 0.6.0
- indicator_desktop_shortcuts_nick_get_name at Base 0.6.0
- indicator_image_helper at Base 0.6.0
- indicator_image_helper_update at Base 0.6.0
- indicator_image_helper_update_from_gicon at Base 0.6.0
- indicator_object_check_environment at Base 0.6.0
- indicator_object_entry_activate at Base 0.6.0
- indicator_object_entry_activate_window at Base 0.6.0
- indicator_object_entry_close at Base 0.6.0
- indicator_object_entry_is_visible at Base 0.6.0
- indicator_object_get_entries at Base 0.6.0
- indicator_object_get_environment at Base 0.6.0
- indicator_object_get_location at Base 0.6.0
- indicator_object_get_position at Base 0.6.0
- indicator_object_get_show_now at Base 0.6.0
- indicator_object_get_type at Base 0.6.0
- indicator_object_new_from_file at Base 0.6.0
- indicator_object_set_environment at Base 0.6.0
- indicator_object_set_visible at Base 0.6.0
- indicator_scroll_direction_get_type at Base 0.6.0
- indicator_service_get_type at Base 0.6.0
- indicator_service_manager_connected at Base 0.6.0
- indicator_service_manager_get_type at Base 0.6.0
- indicator_service_manager_new at Base 0.6.0
- indicator_service_manager_new_version at Base 0.6.0
- indicator_service_manager_set_refresh at Base 0.6.0
- indicator_service_new at Base 0.6.0
- indicator_service_new_version at Base 0.6.0
diff -Nru libayatana-indicator-0.9.3/debian/libayatana-indicator-dev.install libayatana-indicator-0.9.3/debian/libayatana-indicator-dev.install
--- libayatana-indicator-0.9.3/debian/libayatana-indicator-dev.install	2021-11-18 12:51:24.000000000 +0100
+++ libayatana-indicator-0.9.3/debian/libayatana-indicator-dev.install	1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-usr/include/libayatana-indicator-0.4/
-usr/lib/*/pkgconfig/ayatana-indicator-0.4.pc
-usr/lib/*/libayatana-indicator.so
diff -Nru libayatana-indicator-0.9.3/debian/rules libayatana-indicator-0.9.3/debian/rules
--- libayatana-indicator-0.9.3/debian/rules	2021-11-19 23:47:38.000000000 +0100
+++ libayatana-indicator-0.9.3/debian/rules	2023-11-13 15:27:03.000000000 +0100
@@ -1,15 +1,10 @@
 #!/usr/bin/make -f
 
-FLAVOURS = gtk2 gtk3
-
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 
-COMMON_CONFIGURE_FLAGS = -DENABLE_TESTS=ON
-
-CONFIGURE_FLAGS_gtk2 = -DFLAVOUR_GTK2=ON -DFLAVOUR_GTK3=OFF -DENABLE_TESTS=ON -DENABLE_COVERAGE=OFF
-CONFIGURE_FLAGS_gtk3 = -DFLAVOUR_GTK3=ON -DFLAVOUR_GTK2=OFF -DENABLE_TESTS=ON -DENABLE_COVERAGE=OFF
+CONFIGURE_FLAGS = -DFLAVOUR_GTK3=ON -DFLAVOUR_GTK2=OFF -DENABLE_TESTS=ON -DENABLE_COVERAGE=OFF
 
 export G_MESSAGES_DEBUG = all
 export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
@@ -17,44 +12,31 @@
 %:
 	dh $@
 
-override_dh_auto_configure: $(FLAVOURS:%=doconfigure-%)
-
-doconfigure-%:
-	DH_VERBOSE=1 dh_auto_configure --builddirectory=builddir/$* -- $(COMMON_CONFIGURE_FLAGS) $(CONFIGURE_FLAGS_$*)
+override_dh_auto_configure:
+	DH_VERBOSE=1 dh_auto_configure --builddirectory=builddir/gtk3 -- $(CONFIGURE_FLAGS)
 
-override_dh_auto_build: $(FLAVOURS:%=dobuild-%)
-
-dobuild-%:
-	dh_auto_build --builddirectory=builddir/$*
+override_dh_auto_build:
+	dh_auto_build --builddirectory=builddir/gtk3
 
 override_dh_auto_test:
-	xvfb-run -a dh_auto_test --no-parallel --builddirectory=builddir/gtk2
 	xvfb-run -a dh_auto_test --no-parallel --builddirectory=builddir/gtk3
 
-override_dh_auto_install: $(FLAVOURS:%=doinstall-%)
-
-doinstall-%:
-	dh_auto_install --builddirectory=builddir/$* --destdir=debian/tmp/$*
+override_dh_auto_install:
+	dh_auto_install --builddirectory=builddir/gtk3 --destdir=debian/tmp/gtk3
 
 override_dh_install:
 	find debian/tmp -name \*.la -delete
 	find debian/tmp -name libdummy-indicator\* -delete
-	rm -f debian/tmp/gtk2/usr/share/libayatana-indicator/80indicator-debugging
-	dh_install -plibayatana-indicator7 --sourcedir=debian/tmp/gtk2
-	dh_install -plibayatana-indicator-dev --sourcedir=debian/tmp/gtk2
 	dh_install -plibayatana-indicator3-7 --sourcedir=debian/tmp/gtk3
 	dh_install -plibayatana-indicator3-dev --sourcedir=debian/tmp/gtk3
 	dh_install -plibayatana-indicator3-tools --sourcedir=debian/tmp/gtk3
 
 override_dh_missing:
-	dh_missing -plibayatana-indicator7 --sourcedir=debian/tmp/gtk2
-	dh_missing -plibayatana-indicator-dev --sourcedir=debian/tmp/gtk2
 	dh_missing -plibayatana-indicator3-7 --sourcedir=debian/tmp/gtk3
 	dh_missing -plibayatana-indicator3-dev --sourcedir=debian/tmp/gtk3
 	dh_missing -plibayatana-indicator3-tools --sourcedir=debian/tmp/gtk3
 
 override_dh_makeshlibs:
-	dh_makeshlibs -plibayatana-indicator7 -V 'libayatana-indicator7 (>= 0.6.0)'
 	dh_makeshlibs -plibayatana-indicator3-7 -V 'libayatana-indicator3-7 (>= 0.6.0)'
 
 override_dh_installchangelogs:

More information about the Pkg-ayatana-devel mailing list