diff options
| author | Ted Gould <ted@gould.cx> | 2010-02-23 10:27:36 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-02-23 10:27:36 -0600 |
| commit | 50aff10037c55ba990d76706f898606180f33cc6 (patch) | |
| tree | 9e742a667f0e0e41113850fb7ad8cf53f6cdc78d | |
| parent | 8af2c8c7ad133cf7b98040ad0e11088594eb7a37 (diff) | |
| parent | 1572f64f0a8329cfecd5395e643c538ad04ce54f (diff) | |
| download | ayatana-indicator-application-50aff10037c55ba990d76706f898606180f33cc6.tar.gz ayatana-indicator-application-50aff10037c55ba990d76706f898606180f33cc6.tar.bz2 ayatana-indicator-application-50aff10037c55ba990d76706f898606180f33cc6.zip | |
* Upstream Merge
* Checking for dbus-glib version 0.82
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | debian/changelog | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 51ebf3e..a3c26e5 100644 --- a/configure.ac +++ b/configure.ac @@ -41,10 +41,12 @@ GTK_REQUIRED_VERSION=2.12 INDICATOR_REQUIRED_VERSION=0.3.1 DBUSMENUGTK_REQUIRED_VERSION=0.2.2 JSON_GLIB_REQUIRED_VERSION=0.7.6 +DBUS_GLIB_REQUIRED_VERSION=0.82 PKG_CHECK_MODULES(INDICATOR, gtk+-2.0 >= $GTK_REQUIRED_VERSION indicator >= $INDICATOR_REQUIRED_VERSION json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION + dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION) AC_SUBST(INDICATOR_CFLAGS) diff --git a/debian/changelog b/debian/changelog index 1824fbf..764015f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-application (0.0.13-0ubuntu8~ppa1) UNRELEASED; urgency=low + + * Upstream Merge + * Checking for dbus-glib version 0.82 + + -- Ted Gould <ted@ubuntu.com> Tue, 23 Feb 2010 10:27:09 -0600 + indicator-application (0.0.13-0ubuntu7) lucid; urgency=low * Backported upstream change to fix menu item sensitivity update, |