diff options
| author | Ted Gould <ted@gould.cx> | 2012-02-23 00:23:06 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2012-02-23 00:23:06 -0600 |
| commit | 87c4364e84d6647b0f74ce3a8a91c6d46dfceb23 (patch) | |
| tree | 234fbd48ecfcd15a952107fbdb6f68b34df80646 | |
| parent | 1474099e50552a8b3fba5c41a705913be8c818cf (diff) | |
| parent | 55ae52666c1c85127ba6d710ad2e02e0205e736c (diff) | |
| download | libayatana-indicator-87c4364e84d6647b0f74ce3a8a91c6d46dfceb23.tar.gz libayatana-indicator-87c4364e84d6647b0f74ce3a8a91c6d46dfceb23.tar.bz2 libayatana-indicator-87c4364e84d6647b0f74ce3a8a91c6d46dfceb23.zip | |
Merge with U. Desktop
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | debian/changelog | 17 | ||||
| -rw-r--r-- | debian/source/format | 2 |
3 files changed, 12 insertions, 9 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 54d56a7..2a8ae14 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,22 +1,23 @@ -libindicator (0.4.91-0ubuntu1~ppa3) precise; urgency=low +libindicator (0.4.91-0ubuntu3) precise; urgency=low - * Upstream Merge - * Increasing the test timeout to ensure that's not our issue + * Restore revision dropped by error, change to format v1 for that - -- Ted Gould <ted@ubuntu.com> Tue, 14 Feb 2012 21:11:29 -0600 + -- Sebastien Bacher <seb128@ubuntu.com> Wed, 15 Feb 2012 13:09:05 +0100 -libindicator (0.4.91-0ubuntu1~ppa2) precise; urgency=low +libindicator (0.4.91-0ubuntu2) precise; urgency=low + * Upstream Merge + * Increasing the test timeout to ensure that's not our issue * debian/rules: Adding messages - -- Ted Gould <ted@ubuntu.com> Tue, 14 Feb 2012 16:48:11 -0600 + -- Ted Gould <ted@ubuntu.com> Tue, 14 Feb 2012 21:11:29 -0600 -libindicator (0.4.91-0ubuntu1~ppa1) precise; urgency=low +libindicator (0.4.91-0ubuntu1) precise; urgency=low * New upstream release. * Visibility fixes for indicators using that functionality * Ensure that parent_object is more aggressively set - * Fix memory leak on groups of items in desktop files + * Fix memory leak on groups of items in desktop files (lp: #923629) * Dropping debian/patches * Upstream Merge * Explicitly add in gmodule as a required library diff --git a/debian/source/format b/debian/source/format index 163aaf8..d3827e7 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (quilt) +1.0 |