diffstat for libayatana-appindicator-0.5.94 libayatana-appindicator-0.5.94

 changelog |   38 ++++++++++++++++++++++++++++++++++++++
 control   |   15 ++++++++++-----
 rules     |    8 +++++++-
 3 files changed, 55 insertions(+), 6 deletions(-)

diff -Nru libayatana-appindicator-0.5.94/debian/changelog libayatana-appindicator-0.5.94/debian/changelog
--- libayatana-appindicator-0.5.94/debian/changelog	2025-03-12 08:33:12.000000000 +0000
+++ libayatana-appindicator-0.5.94/debian/changelog	2026-05-10 13:25:49.000000000 +0100
@@ -1,3 +1,41 @@
+libayatana-appindicator (0.5.94-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload
+
+  [ Mike Gabriel ]
+  * debian/control: Add more Multi-Arch: {same,foreign} declarations.
+    Thanks, Multi-Arch Hinter.
+
+  [ Simon McVittie ]
+  * d/patches/series: Apply the patch.
+    This file was present in the 0.5.94-1 upload to the archive, but
+    not in the packaging git repo.
+  * d/control: Use ${gir:Depends} in -dev package instead of hard-coding.
+    This avoids mistakes, and will make it easier to implement the <!nogir>
+    build-profile at a later date, if desired.
+  * d/control: Add ${gir:Provides} to -dev package.
+    This ensures that it will provide the appropriate systematic name
+    derived from its .gir file, and signals that it was not built with
+    GObject-Introspection disabled (which is not currently set up,
+    but could be added later via the nogir build-profile).
+  * d/control: Explicitly build-depend on gir1.2-*-dev packages.
+    These virtual package names can be mechanically derived from the uses
+    of --include=GObject-2.0 and --include=Gtk-3.0 in the build system,
+    and are the preferred way to ensure that the required GIR XML is
+    present at build-time.
+  * d/control: Drop obsolete B-D on libgirepository1.0-dev.
+    This transitional package can't be multiarch-friendly for historical
+    reasons. In this package, its only value was to pull in the code
+    generation tools and GLib's own GIR XML, but those are now depended
+    on via gobject-introspection and gir1.2-gobject-2.0-dev respectively.
+    (Closes: #1131260)
+  * d/control: Drop obsolete B-D on libdbus-glib-dev (Closes: #955911)
+
+  [ Helmut Grohne ]
+  * Fix FTCBFS: Disable gtkdoc in the arch-only build (Closes: #1117668)
+
+ -- Simon McVittie <smcv@debian.org>  Sun, 10 May 2026 13:25:49 +0100
+
 libayatana-appindicator (0.5.94-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru libayatana-appindicator-0.5.94/debian/control libayatana-appindicator-0.5.94/debian/control
--- libayatana-appindicator-0.5.94/debian/control	2025-03-12 08:33:12.000000000 +0000
+++ libayatana-appindicator-0.5.94/debian/control	2026-05-10 13:25:49.000000000 +0100
@@ -8,7 +8,9 @@
                cmake-extras (>= 1.5-8~),
                debhelper-compat (= 13),
                at-spi2-core,
-               gobject-introspection,
+               gir1.2-gobject-2.0-dev,
+               gir1.2-gtk-3.0-dev,
+               gobject-introspection (>= 1.80),
                intltool,
                gtk-doc-tools,
                libxml2-utils,
@@ -18,11 +20,9 @@
                libglib2.0-dev,
                libgtk-3-dev,
                procps,
-               libdbus-glib-1-dev,
                libayatana-indicator3-dev,
                libdbusmenu-glib-dev,
                libdbusmenu-gtk3-dev,
-               libgirepository1.0-dev,
 Standards-Version: 4.7.2
 Rules-Requires-Root: no
 Homepage: https://github.com/AyatanaIndicators/libayatana-appindicator
@@ -32,6 +32,7 @@
 Package: libayatana-appindicator-doc
 Section: doc
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends},
 Description: Ayatana Application Indicators (documentation files, GTK-2+ version)
  A library and indicator to take menus from applications and place them in
@@ -41,6 +42,7 @@
 
 Package: libayatana-appindicator3-1
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends},
          ${misc:Depends},
 Provides: libappindicator3-1 (= 12.10)
@@ -56,14 +58,16 @@
 Package: libayatana-appindicator3-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends},
          ${misc:Depends},
+         ${gir:Depends},
          libayatana-indicator3-dev (>= 0.9.0),
          libdbusmenu-glib-dev,
          libgtk-3-dev,
-         gir1.2-ayatanaappindicator3-0.1 (= ${binary:Version}),
          libayatana-appindicator3-1 (= ${binary:Version}),
-Provides: libappindicator3-dev (= 12.10)
+Provides: ${gir:Provides},
+          libappindicator3-dev (= 12.10),
 Conflicts: libappindicator3-dev,
 Replaces: libappindicator3-dev,
 Description: Ayatana Application Indicators (development files, GTK-3+ version)
@@ -76,6 +80,7 @@
 Package: gir1.2-ayatanaappindicator3-0.1
 Section: introspection
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends},
          ${gir:Depends},
 Description: Typelib files for libayatana-appindicator3-1 (GTK-3+ version)
diff -Nru libayatana-appindicator-0.5.94/debian/rules libayatana-appindicator-0.5.94/debian/rules
--- libayatana-appindicator-0.5.94/debian/rules	2023-10-29 09:10:53.000000000 +0000
+++ libayatana-appindicator-0.5.94/debian/rules	2026-05-10 13:25:49.000000000 +0100
@@ -10,8 +10,12 @@
 
 API_VERSION = 0.1
 
+DO_PACKAGES := $(shell dh_listpackages)
+
 CONFIGURE_COMMON_FLAGS = -DENABLE_TESTS=ON -DENABLE_BINDINGS_MONO=OFF
-CONFIGURE_FLAGS_gtk3 = -DFLAVOUR_GTK3=ON -DENABLE_GTKDOC=ON
+CONFIGURE_FLAGS_gtk3 = \
+	-DFLAVOUR_GTK3=ON \
+	-DENABLE_GTKDOC=$(if $(filter libayatana-appindicator-doc,$(DO_PACKAGES)),ON,OFF)
 
 export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
 
@@ -41,7 +45,9 @@
 	rm -rf debian/tmp/*/usr/lib/mono
 	rm -rf debian/tmp/*/usr/share/vala/vapi/ayatana-appindicator*-0.1.deps
 	mkdir -p debian/tmp/gtk3/usr/share/doc/libayatana-appindicator3-dev/
+ifneq ($(filter libayatana-appindicator-doc,$(DO_PACKAGES)),)
 	mv debian/tmp/gtk3/usr/share/gtk-doc/html/libayatana-appindicator3 debian/tmp/gtk3/usr/share/doc/libayatana-appindicator3-dev/html
+endif
 
 	ln -s libayatana-appindicator3.so   debian/tmp/gtk3/usr/lib/$(DEB_HOST_MULTIARCH)/libappindicator3.so
 	ln -s libayatana-appindicator3.so.1 debian/tmp/gtk3/usr/lib/$(DEB_HOST_MULTIARCH)/libappindicator3.so.1
