diff options
| author | Ted Gould <ted@gould.cx> | 2012-02-14 14:21:36 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2012-02-14 14:21:36 -0600 |
| commit | eb803e833096843fa14705494cb91b0adf96fff7 (patch) | |
| tree | 0762fdab61aa1e6865dda9e9f81c74a233713fe5 | |
| parent | b2a5f94bf7807e640d8b11dc33e0025c0f2036d5 (diff) | |
| parent | 45aebde8abddd54f52333fd9cd2462eb0497f5dc (diff) | |
| download | libayatana-indicator-eb803e833096843fa14705494cb91b0adf96fff7.tar.gz libayatana-indicator-eb803e833096843fa14705494cb91b0adf96fff7.tar.bz2 libayatana-indicator-eb803e833096843fa14705494cb91b0adf96fff7.zip | |
* Upstream Merge
* Explicitly add in gmodule as a required library
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | debian/changelog | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 38dd416..3f33d52 100644 --- a/configure.ac +++ b/configure.ac @@ -52,10 +52,12 @@ AC_ARG_WITH([gtk], [with_gtk=3]) AS_IF([test "x$with_gtk" = x3], [PKG_CHECK_MODULES(LIBINDICATOR, gtk+-3.0 >= $GTK3_REQUIRED_VERSION + gmodule-2.0 gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION) ], [test "x$with_gtk" = x2], [PKG_CHECK_MODULES(LIBINDICATOR, gtk+-2.0 >= $GTK_REQUIRED_VERSION + gmodule-2.0 gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION) ], [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])] diff --git a/debian/changelog b/debian/changelog index 090c203..37ed70f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,10 @@ libindicator (0.4.91-0ubuntu1~ppa1) UNRELEASED; urgency=low * Ensure that parent_object is more aggressively set * Fix memory leak on groups of items in desktop files * Dropping debian/patches + * Upstream Merge + * Explicitly add in gmodule as a required library - -- Ted Gould <ted@ubuntu.com> Tue, 14 Feb 2012 11:51:52 -0600 + -- Ted Gould <ted@ubuntu.com> Tue, 14 Feb 2012 14:21:17 -0600 libindicator (0.4.90-0ubuntu4) precise; urgency=low |