r31872 - in /desktop/unstable/gnome-session/debian: changelog patches/12_no_gdm_fallback.patch patches/13_format_security.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sun Nov 27 01:06:10 2011
New Revision: 31872

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31872
Log:
* Refresh debian/patches/12_no_gdm_fallback.patch.
* Remove debian/patches/13_format_security.patch, applied upstream.

Removed:
    desktop/unstable/gnome-session/debian/patches/13_format_security.patch
Modified:
    desktop/unstable/gnome-session/debian/changelog
    desktop/unstable/gnome-session/debian/patches/12_no_gdm_fallback.patch
    desktop/unstable/gnome-session/debian/patches/series

Modified: desktop/unstable/gnome-session/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/changelog?rev=31872&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/changelog [utf-8] Sun Nov 27 01:06:10 2011
@@ -1,6 +1,8 @@
 gnome-session (3.2.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Refresh debian/patches/12_no_gdm_fallback.patch.
+  * Remove debian/patches/13_format_security.patch, applied upstream.
 
  -- Michael Biebl <biebl at debian.org>  Sat, 26 Nov 2011 23:36:15 +0100
 

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=31872&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] Sun Nov 27 01:06:10 2011
@@ -3,11 +3,11 @@
 Don’t fall back to GDM when ConsoleKit fails. If CK is not available, it 
 will not be attempted anyway.
 
-Index: gnome-session-2.91.91.3/gnome-session/gsm-manager.c
+Index: gnome-session-3.2.1/gnome-session/gsm-manager.c
 ===================================================================
---- gnome-session-2.91.91.3.orig/gnome-session/gsm-manager.c	2011-03-14 18:39:39.154303002 +0100
-+++ gnome-session-2.91.91.3/gnome-session/gsm-manager.c	2011-03-14 18:49:18.686303002 +0100
-@@ -436,7 +436,7 @@
+--- 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,
                                    "request-completed",
                                    G_CALLBACK (quit_request_completed),
@@ -16,7 +16,7 @@
                  gsm_consolekit_attempt_restart (consolekit);
                  break;
          case GSM_MANAGER_LOGOUT_REBOOT_GDM:
-@@ -451,7 +451,7 @@
+@@ -509,7 +509,7 @@
                  g_signal_connect (consolekit,
                                    "request-completed",
                                    G_CALLBACK (quit_request_completed),

Modified: desktop/unstable/gnome-session/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/patches/series?rev=31872&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/patches/series [utf-8] Sun Nov 27 01:06:10 2011
@@ -3,4 +3,3 @@
 03_fallback_desktop_makefile.patch
 #10_session_save.patch
 12_no_gdm_fallback.patch
-13_format_security.patch