aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-07-13 10:55:44 -0500
committerTed Gould <ted@gould.cx>2010-07-13 10:55:44 -0500
commitc95f5174418c33c4c3756d42f365844f46f34368 (patch)
tree4546119ab3328fd2723ad64721ef9db919d6a4b3
parent35cad52a3ea23e26761a2647241c47c4c3122761 (diff)
downloadlibayatana-appindicator-c95f5174418c33c4c3756d42f365844f46f34368.tar.gz
libayatana-appindicator-c95f5174418c33c4c3756d42f365844f46f34368.tar.bz2
libayatana-appindicator-c95f5174418c33c4c3756d42f365844f46f34368.zip
Autogen update
-rw-r--r--debian/changelog3
-rw-r--r--tests/Makefile.in1
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 8f23d32..ecd0b80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ indicator-application (0.2.2-0ubuntu2~ppa2) UNRELEASED; urgency=low
* Merge upstream
* Fixing test for slower machines
+ * Autogen update
- -- Ted Gould <ted@ubuntu.com> Tue, 13 Jul 2010 10:55:02 -0500
+ -- Ted Gould <ted@ubuntu.com> Tue, 13 Jul 2010 10:55:35 -0500
indicator-application (0.2.2-0ubuntu2~ppa1) lucid; urgency=low
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 0630ac0..dc4be9b 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1055,6 +1055,7 @@ uninstall-am:
test-approver-tester: test-approver Makefile.am
@echo "#!/bin/bash" > $@
+ @echo export INDICATOR_SERVICE_SHUTDOWN_TIMEOUT=1000 >> $@
@echo . $(srcdir)/run-xvfb.sh >> $@
@echo $(DBUS_RUNNER) --task $(builddir)/test-approver --task-name Approver --task $(top_builddir)/src/indicator-application-service --task-name Service --ignore-return >> $@
@chmod +x $@