diff options
author | Ted Gould <ted@gould.cx> | 2011-10-13 13:07:24 -0500 |
---|---|---|
committer | Ted Gould <ted@gould.cx> | 2011-10-13 13:07:24 -0500 |
commit | 5cd2a887b9d0ea7995450a975e4b0527dcd9b1a2 (patch) | |
tree | a09dcdc92e983c53e0d6c0026cbbdd1f86440c69 | |
parent | a3fd1aa6abf470016825dbb288565018cf834c12 (diff) | |
parent | e386410ad848c62080673eb7ff584bf0b39b765b (diff) | |
download | ayatana-indicator-session-5cd2a887b9d0ea7995450a975e4b0527dcd9b1a2.tar.gz ayatana-indicator-session-5cd2a887b9d0ea7995450a975e4b0527dcd9b1a2.tar.bz2 ayatana-indicator-session-5cd2a887b9d0ea7995450a975e4b0527dcd9b1a2.zip |
Merge from U. Desktop
-rw-r--r-- | data/indicator-session.convert | 8 | ||||
-rw-r--r-- | debian/changelog | 9 |
2 files changed, 12 insertions, 5 deletions
diff --git a/data/indicator-session.convert b/data/indicator-session.convert index 8cf9e12..c98eddb 100644 --- a/data/indicator-session.convert +++ b/data/indicator-session.convert @@ -1,5 +1,5 @@ [com.canonical.indicator.session] -suppress_logout_restart_shutdown = /apps/indicator-session/suppress-logout-restart-shutdown -suppress_logout_menuitem = /apps/indicator-session/suppress-logout-menuitem -suppress_restart_menuitem = /apps/indicator-session/suppress-restart-menuitem -suppress_shutdown_menuitem = /apps/indicator-session/suppress-shutdown-menuitem +suppress-logout-restart-shutdown = /apps/indicator-session/suppress_logout_restart_shutdown +suppress-logout-menuitem = /apps/indicator-session/suppress_logout_menuitem +suppress-restart-menuitem = /apps/indicator-session/suppress_restart_menuitem +suppress-shutdown-menuitem = /apps/indicator-session/suppress_shutdown_menuitem diff --git a/debian/changelog b/debian/changelog index 6ab2133..49bfb00 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,11 @@ -indicator-session (0.3.6-0ubuntu1~ppa1) oneiric; urgency=low +indicator-session (0.3.6-0ubuntu2) oneiric; urgency=low + + * data/indicator-session.convert + - Fixed improperly mapped gconf to gsettings keys (LP: #858798) + + -- Ken VanDine <ken.vandine@canonical.com> Mon, 03 Oct 2011 10:26:54 -0400 + +indicator-session (0.3.6-0ubuntu1) oneiric; urgency=low * New upstream release. * Fix convert file key naming (LP: #847807) |