Port to libayatana-appindicator

4 files changed, 32 insertions, 2 deletions

diff --git a/configure.ac b/configure.ac
index 0055d17..7cae9f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -134,7 +134,7 @@ AC_SUBST(MDOC)
 
 AM_CONDITIONAL(ENABLE_MONODOC, test "$enable_monodoc" = "yes")
 dnl Check for AppIndicator3
-PKG_CHECK_MODULES(APPINDICATOR3, appindicator3-0.1)
+PKG_CHECK_MODULES(APPINDICATOR3, ayatana-appindicator3-0.1)
 appindicator3_prefix=/usr
 AC_SUBST(appindicator3_prefix)
 AC_SUBST(APPINDICATOR3_LIBS)
diff --git a/debian/control b/debian/control
index cf995d9..d7c49ad 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: cli-common-dev (>= 0.8~),
                debhelper (>= 9),
                dh-autoreconf,
                gtk-sharp3,
-               libappindicator3-dev,
+               libayatana-appindicator3-dev,
                libdbusmenu-glib-dev,
                libgtk-3-dev,
                mono-devel (>= 1.0.0),
diff --git a/debian/patches/04-link_against_ayatana.patch b/debian/patches/04-link_against_ayatana.patch
new file mode 100644
index 0000000..0f5a651
--- /dev/null
+++ b/debian/patches/04-link_against_ayatana.patch
@@ -0,0 +1,29 @@
+From: Andrej Shadura <andrewsh@debian.org>
+Subject: Port to the actually maintained fork of libappindicator
+
+diff --git a/configure.ac b/configure.ac
+index 0055d17..7cae9f3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -134,7 +134,7 @@ AC_SUBST(MDOC)
+ 
+ AM_CONDITIONAL(ENABLE_MONODOC, test "$enable_monodoc" = "yes")
+ dnl Check for AppIndicator3
+-PKG_CHECK_MODULES(APPINDICATOR3, appindicator3-0.1)
++PKG_CHECK_MODULES(APPINDICATOR3, ayatana-appindicator3-0.1)
+ appindicator3_prefix=/usr
+ AC_SUBST(appindicator3_prefix)
+ AC_SUBST(APPINDICATOR3_LIBS)
+diff --git a/debian/control b/debian/control
+index cf995d9..d7c49ad 100644
+--- a/debian/control
++++ b/debian/control
+@@ -9,7 +9,7 @@ Build-Depends: cli-common-dev (>= 0.8~),
+                debhelper (>= 9),
+                dh-autoreconf,
+                gtk-sharp3,
+-               libappindicator3-dev,
++               libayatana-appindicator3-dev,
+                libdbusmenu-glib-dev,
+                libgtk-3-dev,
+                mono-devel (>= 1.0.0),
diff --git a/debian/patches/series b/debian/patches/series
index 9b2a90b..e87268a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01-pkgconfig_fixes.patch
 02-dllmap_fix.patch
 03-parallel_mdoc.patch
+04-link_against_ayatana.patch