r13640 - in /desktop/unstable/gnome-session/debian: changelog patches/03_powermanagement.patch patches/09_splash_hide.patch patches/10_update_notifier.patch
lool at users.alioth.debian.org
lool at users.alioth.debian.org
Tue Nov 27 12:28:58 UTC 2007
Author: lool
Date: Tue Nov 27 12:28:58 2007
New Revision: 13640
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13640
Log:
* Refresh patches 03_powermanagement, 09_splash_hide, and 10_update_notifier
to apply cleanly.
Modified:
desktop/unstable/gnome-session/debian/changelog
desktop/unstable/gnome-session/debian/patches/03_powermanagement.patch
desktop/unstable/gnome-session/debian/patches/09_splash_hide.patch
desktop/unstable/gnome-session/debian/patches/10_update_notifier.patch
Modified: desktop/unstable/gnome-session/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/changelog?rev=13640&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/changelog (original)
+++ desktop/unstable/gnome-session/debian/changelog Tue Nov 27 12:28:58 2007
@@ -36,8 +36,10 @@
the gdm rewrite.
* New patch, 90_from_bugzilla_fix_session_sounds, fixes playback of session
sounds; GNOME #466458.
-
- -- Loic Minier <lool at dooz.org> Tue, 27 Nov 2007 13:26:26 +0100
+ * Refresh patches 03_powermanagement, 09_splash_hide, and 10_update_notifier
+ to apply cleanly.
+
+ -- Loic Minier <lool at dooz.org> Tue, 27 Nov 2007 13:28:35 +0100
gnome-session (2.20.1-1) unstable; urgency=low
Modified: desktop/unstable/gnome-session/debian/patches/03_powermanagement.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/patches/03_powermanagement.patch?rev=13640&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/patches/03_powermanagement.patch (original)
+++ desktop/unstable/gnome-session/debian/patches/03_powermanagement.patch Tue Nov 27 12:28:58 2007
@@ -1,6 +1,5 @@
-diff -Nur gnome-session-2.11.1.orig/gnome-session/gdm-logout-action.c gnome-session-2.11.1/gnome-session/gdm-logout-action.c
---- gnome-session-2.11.1.orig/gnome-session/gdm-logout-action.c 2005-01-10 16:58:33.000000000 +0100
-+++ gnome-session-2.11.1/gnome-session/gdm-logout-action.c 2005-05-19 12:01:19.153117568 +0200
+--- gnome-session-2.20.2.orig/gnome-session/gdm-logout-action.c 2007-11-27 01:03:13.000000000 +0100
++++ gnome-session-2.20.2/gnome-session/gdm-logout-action.c 2007-11-27 13:28:13.000000000 +0100
@@ -50,11 +50,14 @@
#define GDM_PROTOCOL_MSG_AUTHENTICATE "AUTH_LOCAL"
#define GDM_PROTOCOL_MSG_QUERY_ACTION "QUERY_LOGOUT_ACTION"
@@ -16,7 +15,7 @@
typedef struct {
int fd;
-@@ -306,6 +309,8 @@
+@@ -312,6 +315,8 @@
action = GDM_LOGOUT_ACTION_REBOOT;
else if (!strcmp (str, GDM_ACTION_STR_SUSPEND))
action = GDM_LOGOUT_ACTION_SUSPEND;
@@ -25,7 +24,7 @@
data->available_actions |= action;
if (selected)
-@@ -375,8 +380,17 @@
+@@ -381,8 +386,17 @@
action_str = GDM_ACTION_STR_REBOOT;
break;
case GDM_LOGOUT_ACTION_SUSPEND:
@@ -45,9 +44,8 @@
}
msg = g_strdup_printf (GDM_PROTOCOL_MSG_SET_ACTION " %s", action_str);
-diff -Nur gnome-session-2.11.1.orig/gnome-session/gdm-logout-action.h gnome-session-2.11.1/gnome-session/gdm-logout-action.h
---- gnome-session-2.11.1.orig/gnome-session/gdm-logout-action.h 2005-01-10 16:58:33.000000000 +0100
-+++ gnome-session-2.11.1/gnome-session/gdm-logout-action.h 2005-05-19 12:01:19.153117568 +0200
+--- gnome-session-2.20.2.orig/gnome-session/gdm-logout-action.h 2007-11-27 01:03:13.000000000 +0100
++++ gnome-session-2.20.2/gnome-session/gdm-logout-action.h 2007-11-27 13:28:13.000000000 +0100
@@ -38,7 +38,8 @@
GDM_LOGOUT_ACTION_NONE = 0,
GDM_LOGOUT_ACTION_SHUTDOWN = 1 << 0,
@@ -58,10 +56,9 @@
} GdmLogoutAction;
gboolean gdm_supports_logout_action (GdmLogoutAction action);
-diff -Nur gnome-session-2.11.1.orig/gnome-session/logout.c gnome-session-2.11.1/gnome-session/logout.c
---- gnome-session-2.11.1.orig/gnome-session/logout.c 2005-05-06 12:17:12.000000000 +0200
-+++ gnome-session-2.11.1/gnome-session/logout.c 2005-05-19 12:02:52.657902680 +0200
-@@ -329,13 +329,19 @@
+--- gnome-session-2.20.2.orig/gnome-session/logout.c 2007-11-27 01:03:13.000000000 +0100
++++ gnome-session-2.20.2/gnome-session/logout.c 2007-11-27 13:28:13.000000000 +0100
+@@ -310,13 +310,19 @@
gint response;
GtkWidget *halt = NULL;
GtkWidget *reboot = NULL;
@@ -79,9 +76,9 @@
+ gboolean suspend_active = FALSE;
+ gboolean hibernate_active = FALSE;
GdmLogoutAction logout_action = GDM_LOGOUT_ACTION_NONE;
- gboolean a11y_enabled;
- GError *error = NULL;
-@@ -431,8 +437,10 @@
+ gboolean iris_effect_enabled;
+ gboolean grab_xserver;
+@@ -415,8 +421,10 @@
halt_supported = gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN);
reboot_supported = gdm_supports_logout_action (GDM_LOGOUT_ACTION_REBOOT);
@@ -93,7 +90,7 @@
{
GtkWidget *title, *spacer;
GtkWidget *action_vbox, *hbox;
-@@ -482,6 +490,21 @@
+@@ -466,6 +474,21 @@
gtk_box_pack_start (GTK_BOX (action_vbox), r, FALSE, FALSE, 0);
gtk_widget_show (r);
}
@@ -115,7 +112,7 @@
}
gsm_center_window_on_screen (GTK_WINDOW (box), screen, monitor);
-@@ -517,6 +540,12 @@
+@@ -504,6 +527,12 @@
if (reboot)
reboot_active = GTK_TOGGLE_BUTTON (reboot)->active;
@@ -128,7 +125,7 @@
if (toggle_button)
save_active = GTK_TOGGLE_BUTTON (toggle_button)->active;
-@@ -551,6 +580,16 @@
+@@ -542,6 +571,16 @@
logout_action = GDM_LOGOUT_ACTION_SHUTDOWN;
else if (reboot_active)
logout_action = GDM_LOGOUT_ACTION_REBOOT;
Modified: desktop/unstable/gnome-session/debian/patches/09_splash_hide.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/patches/09_splash_hide.patch?rev=13640&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/patches/09_splash_hide.patch (original)
+++ desktop/unstable/gnome-session/debian/patches/09_splash_hide.patch Tue Nov 27 12:28:58 2007
@@ -1,18 +1,16 @@
-diff -PruN gnome-session-2.8.1.orig/gnome-session/manager.c gnome-session-2.8.1/gnome-session/manager.c
---- gnome-session-2.8.1.orig/gnome-session/manager.c 2004-10-01 12:13:23.000000000 +0200
-+++ gnome-session-2.8.1/gnome-session/manager.c 2004-11-23 15:20:28.000000000 +0100
-@@ -1381,6 +1381,7 @@
- runlevel = client->priority;
+--- gnome-session-2.20.2.orig/gnome-session/manager.c 2007-11-27 01:03:13.000000000 +0100
++++ gnome-session-2.20.2/gnome-session/manager.c 2007-11-27 13:28:17.000000000 +0100
+@@ -1368,6 +1368,7 @@
+ start_client (client);
}
if (pending_list)
+ splash_hide ();
goto out;
}
save_state = MANAGER_IDLE;
-diff -PruN gnome-session-2.8.1.orig/gnome-session/splash-widget.c gnome-session-2.8.1/gnome-session/splash-widget.c
---- gnome-session-2.8.1.orig/gnome-session/splash-widget.c 2004-09-24 18:35:38.000000000 +0200
-+++ gnome-session-2.8.1/gnome-session/splash-widget.c 2004-11-23 15:19:57.000000000 +0100
-@@ -605,3 +605,10 @@
+--- gnome-session-2.20.2.orig/gnome-session/splash-widget.c 2007-11-27 01:03:13.000000000 +0100
++++ gnome-session-2.20.2/gnome-session/splash-widget.c 2007-11-27 13:28:17.000000000 +0100
+@@ -717,3 +717,10 @@
}
}
@@ -23,10 +21,9 @@
+ gtk_widget_hide (GTK_WIDGET (global_splash));
+ }
+}
-diff -PruN gnome-session-2.8.1.orig/gnome-session/splash-widget.h gnome-session-2.8.1/gnome-session/splash-widget.h
---- gnome-session-2.8.1.orig/gnome-session/splash-widget.h 2003-02-13 23:29:57.000000000 +0100
-+++ gnome-session-2.8.1/gnome-session/splash-widget.h 2004-11-23 15:18:45.000000000 +0100
-@@ -79,5 +79,6 @@
+--- gnome-session-2.20.2.orig/gnome-session/splash-widget.h 2007-11-27 01:03:13.000000000 +0100
++++ gnome-session-2.20.2/gnome-session/splash-widget.h 2007-11-27 13:28:17.000000000 +0100
+@@ -80,5 +80,6 @@
void splash_start (void);
void splash_update (const gchar *text);
void splash_stop (void);
Modified: desktop/unstable/gnome-session/debian/patches/10_update_notifier.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/patches/10_update_notifier.patch?rev=13640&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/patches/10_update_notifier.patch (original)
+++ desktop/unstable/gnome-session/debian/patches/10_update_notifier.patch Tue Nov 27 12:28:58 2007
@@ -1,9 +1,8 @@
-diff -Nur gnome-session-2.10.0/gnome-session/splash-widget.c gnome-session-2.10.0.new/gnome-session/splash-widget.c
---- gnome-session-2.10.0/gnome-session/splash-widget.c 2005-05-06 11:47:06.700140360 +0200
-+++ gnome-session-2.10.0.new/gnome-session/splash-widget.c 2005-05-06 11:47:22.882680240 +0200
+--- gnome-session-2.20.2.orig/gnome-session/splash-widget.c 2007-11-27 13:28:17.000000000 +0100
++++ gnome-session-2.20.2/gnome-session/splash-widget.c 2007-11-27 13:28:20.000000000 +0100
@@ -46,7 +46,8 @@
+ { N_("Window Manager"), "gnome-wm", "gnome-window-manager" },
{ N_("The Panel"), "gnome-panel", "gnome-panel" },
- { N_("Session Manager Proxy"), "gnome-smproxy", "gnome-session" },
{ N_("Nautilus"), "nautilus", "gnome-fs-desktop" },
- { N_("Desktop Settings"), "gnome-settings-daemon", "gnome-settings" }
+ { N_("Desktop Settings"), "gnome-settings-daemon", "gnome-settings" },
More information about the pkg-gnome-commits
mailing list