diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2012-02-15 12:46:44 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2012-02-15 12:46:44 +0100 |
| commit | 461dbdcceefd43aaa1369fa92da2481743809656 (patch) | |
| tree | 36b8efba0ce34325e1eb80b1439b64376fa8954f | |
| parent | 2ac2e54b60789ceaf23728011043c8cb1b5b68d6 (diff) | |
| parent | 457b502ab18c391ddf4247299d191c296c988c92 (diff) | |
| download | libayatana-indicator-461dbdcceefd43aaa1369fa92da2481743809656.tar.gz libayatana-indicator-461dbdcceefd43aaa1369fa92da2481743809656.tar.bz2 libayatana-indicator-461dbdcceefd43aaa1369fa92da2481743809656.zip | |
releasing version 0.4.91-0ubuntu2
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rwxr-xr-x | debian/rules | 2 | ||||
| -rw-r--r-- | tests/service-manager-connect-service.c | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 4f941d0..cb4f38a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +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 21:11:29 -0600 + libindicator (0.4.91-0ubuntu1) precise; urgency=low * New upstream release. diff --git a/debian/rules b/debian/rules index e74ddd1..be53e6a 100755 --- a/debian/rules +++ b/debian/rules @@ -7,6 +7,8 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk include /usr/share/cdbs/1/rules/autoreconf.mk +export G_MESSAGES_DEBUG = all + DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@ DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/ diff --git a/tests/service-manager-connect-service.c b/tests/service-manager-connect-service.c index 7f57f96..09a7ba1 100644 --- a/tests/service-manager-connect-service.c +++ b/tests/service-manager-connect-service.c @@ -55,7 +55,7 @@ main (int argc, char ** argv) IndicatorService * is = indicator_service_new("org.ayatana.test"); g_signal_connect(G_OBJECT(is), INDICATOR_SERVICE_SIGNAL_SHUTDOWN, shutdown, NULL); - g_timeout_add_seconds(1, timeout, NULL); + g_timeout_add_seconds(5, timeout, NULL); mainloop = g_main_loop_new(NULL, FALSE); g_main_loop_run(mainloop); |