r34583 - in /desktop/unstable/gnome-session/debian: changelog patches/03_fallback_desktop_makefile.patch patches/12_no_gdm_fallback.patch

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed Apr 25 00:48:17 2012
New Revision: 34583

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=34583
Log:
Refresh patches.

Modified:
    desktop/unstable/gnome-session/debian/changelog
    desktop/unstable/gnome-session/debian/patches/03_fallback_desktop_makefile.patch
    desktop/unstable/gnome-session/debian/patches/12_no_gdm_fallback.patch

Modified: desktop/unstable/gnome-session/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/changelog?rev=34583&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/changelog [utf-8] Wed Apr 25 00:48:17 2012
@@ -1,8 +1,9 @@
 gnome-session (3.4.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
-
- -- Michael Biebl <biebl at debian.org>  Wed, 25 Apr 2012 02:46:06 +0200
+  * Refresh patches.
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 25 Apr 2012 02:47:56 +0200
 
 gnome-session (3.2.1-1) unstable; urgency=low
 

Modified: desktop/unstable/gnome-session/debian/patches/03_fallback_desktop_makefile.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/patches/03_fallback_desktop_makefile.patch?rev=34583&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/patches/03_fallback_desktop_makefile.patch [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/patches/03_fallback_desktop_makefile.patch [utf-8] Wed Apr 25 00:48:17 2012
@@ -1,9 +1,9 @@
-Index: gnome-session-3.0.2/data/Makefile.am
+Index: gnome-session-3.4.0/data/Makefile.am
 ===================================================================
---- gnome-session-3.0.2.orig/data/Makefile.am	2011-11-04 20:05:16.237075694 +0100
-+++ gnome-session-3.0.2/data/Makefile.am	2011-11-04 20:05:34.601165477 +0100
-@@ -6,7 +6,7 @@ ui_DATA = \
- 	gsm-inhibit-dialog.ui
+--- gnome-session-3.4.0.orig/data/Makefile.am	2011-10-21 16:35:39.000000000 +0200
++++ gnome-session-3.4.0/data/Makefile.am	2012-04-06 23:20:36.422851504 +0200
+@@ -9,7 +9,7 @@
+ hwcompat_DATA = hardware-compatibility
  
  xsessiondir = $(datadir)/xsessions
 -xsession_in_files = gnome.desktop.in

Modified: desktop/unstable/gnome-session/debian/patches/12_no_gdm_fallback.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/patches/12_no_gdm_fallback.patch?rev=34583&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/patches/12_no_gdm_fallback.patch [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/patches/12_no_gdm_fallback.patch [utf-8] Wed Apr 25 00:48:17 2012
@@ -3,25 +3,25 @@
 Don’t fall back to GDM when ConsoleKit fails. If CK is not available, it 
 will not be attempted anyway.
 
-Index: gnome-session-3.2.1/gnome-session/gsm-manager.c
+Index: gnome-session-3.4.1/gnome-session/gsm-manager.c
 ===================================================================
---- gnome-session-3.2.1.orig/gnome-session/gsm-manager.c	2011-10-07 11:22:23.000000000 +0200
-+++ gnome-session-3.2.1/gnome-session/gsm-manager.c	2011-11-26 23:29:33.035136263 +0100
-@@ -494,7 +494,7 @@
-                 g_signal_connect (consolekit,
+--- gnome-session-3.4.1.orig/gnome-session/gsm-manager.c	2012-03-27 10:34:56.000000000 +0200
++++ gnome-session-3.4.1/gnome-session/gsm-manager.c	2012-04-25 00:03:14.416196315 +0200
+@@ -504,7 +504,7 @@
+                 g_signal_connect (system,
                                    "request-completed",
                                    G_CALLBACK (quit_request_completed),
 -                                  GINT_TO_POINTER (GDM_LOGOUT_ACTION_REBOOT));
 +                                  GINT_TO_POINTER (GDM_LOGOUT_ACTION_NONE));
-                 gsm_consolekit_attempt_restart (consolekit);
+                 gsm_system_attempt_restart (system);
                  break;
          case GSM_MANAGER_LOGOUT_REBOOT_GDM:
-@@ -509,7 +509,7 @@
-                 g_signal_connect (consolekit,
+@@ -519,7 +519,7 @@
+                 g_signal_connect (system,
                                    "request-completed",
                                    G_CALLBACK (quit_request_completed),
 -                                  GINT_TO_POINTER (GDM_LOGOUT_ACTION_SHUTDOWN));
 +                                  GINT_TO_POINTER (GDM_LOGOUT_ACTION_NONE));
-                 gsm_consolekit_attempt_stop (consolekit);
+                 gsm_system_attempt_stop (system);
                  break;
          case GSM_MANAGER_LOGOUT_SHUTDOWN_GDM: