From a54ccde60a40f3c875eb57a371750c7d1c1f62f2 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Fri, 9 Apr 2010 21:02:15 +0200 Subject: releasing version 0.2.8-0ubuntu2 --- debian/changelog | 32 +++++++++++++++++++++++++++++--- debian/control | 3 ++- debian/patches/restore_lock_screen.patch | 19 +++++++++++++++++++ 3 files changed, 50 insertions(+), 4 deletions(-) create mode 100644 debian/patches/restore_lock_screen.patch diff --git a/debian/changelog b/debian/changelog index 021b738..d5c3e57 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,10 @@ -indicator-session (0.2.8-0ubuntu1~ppa1) lucid; urgency=low +indicator-session (0.2.8-0ubuntu2) lucid; urgency=low + + * Restore debian directory changes dropped by error + + -- Sebastien Bacher Fri, 09 Apr 2010 19:29:00 +0200 + +indicator-session (0.2.8-0ubuntu1) lucid; urgency=low * New upstream release. * Making restart and shutdown items configurable (LP: #548810) @@ -9,8 +15,28 @@ indicator-session (0.2.8-0ubuntu1~ppa1) lucid; urgency=low -- Ted Gould Fri, 09 Apr 2010 11:08:47 -0500 -indicator-session (0.2.7-0ubuntu1~ppa1) lucid; urgency=low +indicator-session (0.2.7-0ubuntu3) lucid; urgency=low + + * debian/control + - Changed depends on indicator-applet to recommends + * debian/patches/suspend_string.patch + - Change the string back to "Suspend" + + -- Ken VanDine Fri, 26 Mar 2010 11:39:35 -0400 + +indicator-session (0.2.7-0ubuntu2) lucid; urgency=low + + * debian/patches/restore_lock_screen.patch + - re-added patch that got dropped in the merge + + -- Ken VanDine Thu, 25 Mar 2010 17:12:14 -0400 + +indicator-session (0.2.7-0ubuntu1) lucid; urgency=low + + * debian/control + - Dropped Vcs-Bzr and Vcs-Browser + [Ted Gould] * Upstream release 0.2.7 * Adding a switch for translators if the "Switch From" translation doesn't make sense (LP: #545893) @@ -19,7 +45,7 @@ indicator-session (0.2.7-0ubuntu1~ppa1) lucid; urgency=low * Remove debian/patches/restore_lock_screen.patch added by downstream. - -- Ted Gould Thu, 25 Mar 2010 09:40:31 -0500 + -- Ken VanDine Thu, 25 Mar 2010 11:23:13 -0400 indicator-session (0.2.6-0ubuntu2) lucid; urgency=low diff --git a/debian/control b/debian/control index c1b4123..82e6438 100644 --- a/debian/control +++ b/debian/control @@ -20,7 +20,8 @@ Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-session/ubunt Package: indicator-session Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, indicator-applet (>= 0.2), upower +Depends: ${shlibs:Depends}, ${misc:Depends}, upower +Recommends: indicator-applet (>= 0.2) | indicator-renderer Suggests: gdm Conflicts: gdm (<= 2.27.4-0ubuntu9), indicator-sus Replaces: indicator-sus diff --git a/debian/patches/restore_lock_screen.patch b/debian/patches/restore_lock_screen.patch new file mode 100644 index 0000000..12a24d4 --- /dev/null +++ b/debian/patches/restore_lock_screen.patch @@ -0,0 +1,19 @@ +=== modified file 'src/lock-helper.c' +--- src/lock-helper.c 2010-03-18 19:19:39 +0000 ++++ src/lock-helper.c 2010-03-23 17:47:37 +0000 +@@ -131,11 +131,12 @@ + return FALSE; + } + +- if (gconf_client == NULL) { ++ /* if (gconf_client == NULL) { + gconf_client = gconf_client_get_default(); + } + +- return gconf_client_get_bool (gconf_client, GCONF_KEY, NULL); ++ return gconf_client_get_bool (gconf_client, GCONF_KEY, NULL); */ ++ return TRUE; + } + + /* When the screensave go active, if we've got a mainloop + -- cgit v1.2.3 From 79782638d4842641abf38171a117a0737ff88fed Mon Sep 17 00:00:00 2001 From: vish Date: Sat, 31 Jul 2010 18:27:50 +0530 Subject: Changing 'Restart Required' to 'Restart To Complete Update' --- src/session-service.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/session-service.c b/src/session-service.c index 4fc12a1..c1569c7 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -728,9 +728,9 @@ restart_dir_changed (void) if (restart_required) { if (supress_confirmations()) { - dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart Required")); + dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart To Complete Update")); } else { - dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart Required...")); + dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart To Complete Update...")); } dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_ICON, "system-restart-panel"); if (session_dbus != NULL) { -- cgit v1.2.3 From ae2af4b09d7506b8d0e37063cfcb9261c0d68679 Mon Sep 17 00:00:00 2001 From: Cody Russell Date: Mon, 2 Aug 2010 08:50:07 -0500 Subject: Ellipsize --- src/session-service.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/session-service.c b/src/session-service.c index c1569c7..5d2ca1c 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -629,7 +629,7 @@ rebuild_items (DbusmenuMenuitem *root, if (supress_confirmations()) { dbusmenu_menuitem_property_set(logout_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Log Out")); } else { - dbusmenu_menuitem_property_set(logout_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Log Out...")); + dbusmenu_menuitem_property_set(logout_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Log Out\342\200\246")); } dbusmenu_menuitem_property_set_bool(logout_mi, DBUSMENU_MENUITEM_PROP_VISIBLE, show_logout()); dbusmenu_menuitem_child_append(root, logout_mi); @@ -654,7 +654,7 @@ rebuild_items (DbusmenuMenuitem *root, if (supress_confirmations()) { dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart")); } else { - dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart...")); + dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart\342\200\246")); } dbusmenu_menuitem_property_set_bool(restart_mi, DBUSMENU_MENUITEM_PROP_VISIBLE, show_restart()); dbusmenu_menuitem_child_append(root, restart_mi); @@ -664,7 +664,7 @@ rebuild_items (DbusmenuMenuitem *root, if (supress_confirmations()) { dbusmenu_menuitem_property_set(shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shut Down")); } else { - dbusmenu_menuitem_property_set(shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shut Down...")); + dbusmenu_menuitem_property_set(shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shut Down\342\200\246")); } dbusmenu_menuitem_property_set_bool(shutdown_mi, DBUSMENU_MENUITEM_PROP_VISIBLE, show_shutdown()); dbusmenu_menuitem_child_append(root, shutdown_mi); @@ -730,7 +730,7 @@ restart_dir_changed (void) if (supress_confirmations()) { dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart To Complete Update")); } else { - dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart To Complete Update...")); + dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart To Complete Update\342\200\246")); } dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_ICON, "system-restart-panel"); if (session_dbus != NULL) { @@ -740,7 +740,7 @@ restart_dir_changed (void) if (supress_confirmations()) { dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart")); } else { - dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart...")); + dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart\342\200\246")); } dbusmenu_menuitem_property_remove(restart_mi, RESTART_ITEM_ICON); if (session_dbus != NULL) { -- cgit v1.2.3 From 453b8f9d9448206df1dba6307f3931f9c44687be Mon Sep 17 00:00:00 2001 From: Cody Russell Date: Mon, 2 Aug 2010 09:04:57 -0500 Subject: Bump version. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 168f5bc..c9110d3 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AC_INIT(src/indicator-session.c) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-session, 0.2.8) +AM_INIT_AUTOMAKE(indicator-session, 0.2.9) AM_MAINTAINER_MODE -- cgit v1.2.3 From 0990eec16f54851e748a3bcbfb864777b6a0c959 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Thu, 5 Aug 2010 12:47:16 +0200 Subject: releasing version 0.2.9-0ubuntu1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index f59edc6..6a79c07 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -indicator-session (0.2.9-0ubuntu1) UNRELEASED; urgency=low +indicator-session (0.2.9-0ubuntu1) maverick; urgency=low * New upstream release: - Change "Restart Required..." to "Restart To Complete Update..." (lp: #586928) - Ellipsized strings. - -- Sebastien Bacher Thu, 05 Aug 2010 12:41:31 +0200 + -- Sebastien Bacher Thu, 05 Aug 2010 12:45:37 +0200 indicator-session (0.2.8-0ubuntu2) lucid; urgency=low -- cgit v1.2.3