diff options
| author | Ted Gould <ted@gould.cx> | 2010-10-15 14:48:53 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-10-15 14:48:53 -0500 |
| commit | 917a1aebfd1a2e023d1eac0f92f6489a75b45e07 (patch) | |
| tree | 3d1864c8502f637e2913d6270643a8e7229b1615 | |
| parent | 879ce4300fc0f749a8998bbf14c2fba925c64a5c (diff) | |
| parent | 022e4bfbcb06a66552007abc8f9f329ce86c9995 (diff) | |
| download | libayatana-indicator-917a1aebfd1a2e023d1eac0f92f6489a75b45e07.tar.gz libayatana-indicator-917a1aebfd1a2e023d1eac0f92f6489a75b45e07.tar.bz2 libayatana-indicator-917a1aebfd1a2e023d1eac0f92f6489a75b45e07.zip | |
* Upstream Merge
* Adding a small file to set debugging environment variables
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | tools/80indicator-debugging | 14 | ||||
| -rw-r--r-- | tools/Makefile.am | 5 |
3 files changed, 26 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index ef85b25..e8edbb3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libindicator (0.3.14-0ubuntu2~ppa1) UNRELEASED; urgency=low + + * Upstream Merge + * Adding a small file to set debugging environment variables + + -- Ted Gould <ted@ubuntu.com> Fri, 15 Oct 2010 14:48:22 -0500 + libindicator (0.3.14-0ubuntu1) maverick; urgency=low * New upstream release. diff --git a/tools/80indicator-debugging b/tools/80indicator-debugging new file mode 100644 index 0000000..f21559c --- /dev/null +++ b/tools/80indicator-debugging @@ -0,0 +1,14 @@ +# These are environment variables that effect the behavior +# of libindicator's service manager and indicator service +# objects. They turn off various robustness features that +# make debugging difficult and are not recommended for +# daily use. Development use only! + +# Timeout after 1 minute +export INDICATOR_SERVICE_SHUTDOWN_TIMEOUT=60000 + +# If no one connects, still stay alive +export INDICATOR_ALLOW_NO_WATCHERS=1 + +# Don't restart the services if they crash +export INDICATOR_SERVICE_RESTART_DISABLE=1 diff --git a/tools/Makefile.am b/tools/Makefile.am index 5e5ef8d..168cea8 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -19,3 +19,8 @@ indicator_loader_LDADD = \ -L$(top_builddir)/libindicator/.libs \ -lindicator +xsessiondir = $(sysconfdir)/X11/Xsession.d + +xsession_DATA = 80indicator-debugging + +EXTRA_DIST = $(xsession_DATA) |