update notifier

Merge update-notifier:use-ayatana-indicators into update-notifier:master

  1. Git
  2. lp:update-notifier
  3. use-ayatana-indicators
  4. Merge into master
Proposed by Sebastien Bacher
Status: Merged
Merged at revision: b1a3a54a1809bd6446ae9455e2bfd8619317198a
Proposed branch: update-notifier:use-ayatana-indicators
Merge into: update-notifier:master
Diff against target: 51 lines (+6/-6)
3 files modified
configure.ac (+4/-4)
debian/control (+1/-1)
src/update-notifier.h (+1/-1)
Reviewer Review Type Date Requested Status
Brian Murray Approve
Review via email: mp+404404@code.launchpad.net

Description of the change

The ayatana indicators are the one maintained and other main component already transitioned in impish following Debian

To post a comment you must log in.
Revision history for this message
Brian Murray (brian-murray) wrote :

This looks good to me, thanks for working on it.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/configure.ac b/configure.ac
2index 0ec6947..100e7ad 100644
3--- a/configure.ac
4+++ b/configure.ac
5@@ -72,16 +72,16 @@ AC_ARG_ENABLE(appindicator,
6 [enable_appindicator="auto"])
7
8 if test x$enable_appindicator = xauto ; then
9- PKG_CHECK_EXISTS([appindicator3-0.1 >= $APPINDICATOR_REQUIRED],
10+ PKG_CHECK_EXISTS([ayatana-appindicator3-0.1 >= $APPINDICATOR_REQUIRED],
11 enable_appindicator="yes",
12 enable_appindicator="no")
13 fi
14
15 if test x$enable_appindicator = xyes ; then
16- PKG_CHECK_EXISTS([appindicator3-0.1 >= $APPINDICATOR_REQUIRED],,
17- AC_MSG_ERROR([appindicator3-0.1 is not installed]))
18+ PKG_CHECK_EXISTS([ayatana-appindicator3-0.1 >= $APPINDICATOR_REQUIRED],,
19+ AC_MSG_ERROR([ayatana-appindicator3-0.1 is not installed]))
20 PKG_CHECK_MODULES(APP_INDICATOR,
21- appindicator3-0.1 >= $APPINDICATOR_REQUIRED)
22+ ayatana-appindicator3-0.1 >= $APPINDICATOR_REQUIRED)
23 AC_SUBST(APP_INDICATOR_CFLAGS)
24 AC_SUBST(APP_INDICATOR_LIBS)
25 AC_DEFINE(HAVE_APP_INDICATOR, 1, [Have AppIndicator])
26diff --git a/debian/control b/debian/control
27index 9887a18..d07d4b0 100644
28--- a/debian/control
29+++ b/debian/control
30@@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 11~),
31 libnotify-dev (>= 0.7),
32 libgudev-1.0-dev,
33 libx11-dev,
34- libappindicator3-dev,
35+ libayatana-appindicator3-dev,
36 lsb-release,
37 po-debconf,
38 python3,
39diff --git a/src/update-notifier.h b/src/update-notifier.h
40index a77c21b..49a19c4 100644
41--- a/src/update-notifier.h
42+++ b/src/update-notifier.h
43@@ -26,7 +26,7 @@
44 #include "config.h"
45
46 #ifdef HAVE_APP_INDICATOR
47-#include <libappindicator/app-indicator.h>
48+#include <libayatana-appindicator/app-indicator.h>
49 #endif
50
51 #define CLIPBOARD_NAME "UPGRADE_NOTIFIER_SELECTION"

Subscribers

People subscribed via source and target branches