gnome-session 3.7.4

--- gnome-session-3.7.3/debian/changelog    2013-01-09 19:39:41.000000000 +1100
+++ gnome-session-3.7.4/debian/changelog    2013-02-07 08:09:43.000000000 +1100
@@ -1,3 +1,10 @@
+gnome-session (3.7.4-0ubuntu1~raring1) raring; urgency=low
+
+  * New upstream release
+  * debian/patches: drop all patches related to fallback sessions
+
+ -- Tim Lunn <tim@feathertop.org>  Wed, 06 Feb 2013 20:24:48 +1100
+
 gnome-session (3.7.3-0ubuntu1~raring3) raring; urgency=medium

   * New upstream release:
--- gnome-session-3.7.3/debian/patches/01_gnome-wm.patch    2013-01-07 11:00:44.000000000 +1100
+++ gnome-session-3.7.4/debian/patches/01_gnome-wm.patch    1970-01-01 10:00:00.000000000 +1000
@@ -1,11 +0,0 @@
-Index: gnome-session-3.7.2/data/gnome-fallback.session.desktop.in.in
-===================================================================
---- gnome-session-3.7.2.orig/data/gnome-fallback.session.desktop.in.in 2012-11-20 03:40:09.000000000 +1300
-+++ gnome-session-3.7.2/data/gnome-fallback.session.desktop.in.in  2012-12-04 09:46:56.288089583 +1300
-@@ -2,5 +2,5 @@
- _Name=GNOME fallback
- RequiredComponents=gnome-panel;gnome-settings-daemon;gnome-screensaver;
- RequiredProviders=windowmanager;notifications;
--DefaultProvider-windowmanager=metacity
-+DefaultProvider-windowmanager=gnome-wm
- DefaultProvider-notifications=notification-daemon
--- gnome-session-3.7.3/debian/patches/02_fallback_desktop.patch    2013-01-07 11:00:44.000000000 +1100
+++ gnome-session-3.7.4/debian/patches/02_fallback_desktop.patch    1970-01-01 10:00:00.000000000 +1000
@@ -1,12 +0,0 @@
-Index: gnome-session-3.0.2/data/gnome-fallback.desktop.in
-===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ gnome-session-3.0.2/data/gnome-fallback.desktop.in 2011-11-04 20:06:03.653307488 +0100
-@@ -0,0 +1,7 @@
-+[Desktop Entry]
-+_Name=GNOME Classic
-+_Comment=This session logs you into GNOME
-+Exec=gnome-session-fallback
-+TryExec=gnome-session
-+Icon=
-+Type=Application
--- gnome-session-3.7.3/debian/patches/03_fallback_desktop_makefile.patch   2013-01-07 11:00:44.000000000 +1100
+++ gnome-session-3.7.4/debian/patches/03_fallback_desktop_makefile.patch   1970-01-01 10:00:00.000000000 +1000
@@ -1,13 +0,0 @@
-Index: gnome-session-3.4.0/data/Makefile.am
-===================================================================
---- 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
-+xsession_in_files = gnome.desktop.in gnome-fallback.desktop.in
- xsession_DATA = $(xsession_in_files:.desktop.in=.desktop)
-
- desktopdir = $(datadir)/applications
--- gnome-session-3.7.3/debian/patches/50_ubuntu_sessions.patch 2013-01-09 19:39:02.000000000 +1100
+++ gnome-session-3.7.4/debian/patches/50_ubuntu_sessions.patch 2013-02-07 08:03:59.000000000 +1100
@@ -6,10 +6,8 @@
  (TryExec enables to show them or not depends on the package installed)
 Forwarded: Not needed

-Index: gnome-session-3.4.1/data/gnome.desktop.in
-===================================================================
---- gnome-session-3.4.1.orig/data/gnome.desktop.in 2010-02-09 08:22:01.000000000 -0500
-+++ gnome-session-3.4.1/data/gnome.desktop.in  2012-05-06 20:22:30.285990734 -0400
+--- a/data/gnome.desktop.in
++++ b/data/gnome.desktop.in
 @@ -1,7 +1,7 @@
  [Desktop Entry]
  _Name=GNOME
@@ -20,87 +18,28 @@
 +TryExec=gnome-shell
  Icon=
  Type=Application
-Index: gnome-session-3.4.1/data/Makefile.am
-===================================================================
---- gnome-session-3.4.1.orig/data/Makefile.am  2012-05-06 20:20:27.389381326 -0400
-+++ gnome-session-3.4.1/data/Makefile.am   2012-05-06 20:20:29.177390192 -0400
-@@ -9,7 +9,7 @@
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -10,7 +10,7 @@
  hwcompat_DATA = hardware-compatibility

  xsessiondir = $(datadir)/xsessions
--xsession_in_files = gnome.desktop.in gnome-fallback.desktop.in
-+xsession_in_files = gnome.desktop.in gnome-fallback.desktop.in gnome-fallback-compiz.desktop.in ubuntu.desktop.in
- xsession_DATA = $(xsession_in_files:.desktop.in=.desktop)
+-xsession_in_files = gnome.desktop.in
++xsession_in_files = gnome.desktop.in ubuntu.desktop.in

- desktopdir = $(datadir)/applications
-@@ -17,7 +17,7 @@
+ if BUILD_SESSION_SELECTOR
+ xsession_in_files += gnome-custom-session.desktop.in
+@@ -23,7 +23,7 @@
  desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)

  sessiondir = $(datadir)/gnome-session/sessions
--session_in_in_files = gnome.session.desktop.in.in gnome-fallback.session.desktop.in.in
-+session_in_in_files = gnome.session.desktop.in.in gnome-fallback.session.desktop.in.in gnome-fallback-compiz.session.desktop.in.in ubuntu.session.desktop.in.in
+-session_in_in_files = gnome.session.desktop.in.in
++session_in_in_files = gnome.session.desktop.in.in ubuntu.session.desktop.in.in
  session_in_files = $(session_in_in_files:.session.desktop.in.in=.session.desktop.in)
  session_DATA = $(session_in_files:.session.desktop.in=.session)

-Index: gnome-session-3.4.1/data/gnome-fallback-compiz.desktop.in
-===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ gnome-session-3.4.1/data/gnome-fallback-compiz.desktop.in  2012-05-06 20:20:29.177390192 -0400
-@@ -0,0 +1,7 @@
-+[Desktop Entry]
-+_Name=GNOME Fallback
-+_Comment=This session logs you into GNOME with the traditional panel
-+Exec=gnome-session --session=gnome-fallback-compiz
-+TryExec=gnome-session
-+Icon=
-+Type=Application
-Index: gnome-session-3.4.1/data/gnome-fallback-compiz.session.desktop.in.in
-===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ gnome-session-3.4.1/data/gnome-fallback-compiz.session.desktop.in.in   2012-05-06 20:20:29.177390192 -0400
-@@ -0,0 +1,8 @@
-+[GNOME Session]
-+_Name=GNOME Fallback
-+RequiredComponents=gnome-panel;gnome-settings-daemon;
-+RequiredProviders=windowmanager;
-+DefaultProvider-windowmanager=gnome-wm
-+DefaultProvider-notifications=notify-osd
-+IsRunnableHelper=@LIBEXECDIR@/gnome-session-check-accelerated
-+FallbackSession=gnome-fallback
-Index: gnome-session-3.4.1/data/gnome-fallback.session.desktop.in.in
-===================================================================
---- gnome-session-3.4.1.orig/data/gnome-fallback.session.desktop.in.in 2012-05-06 20:20:27.389381326 -0400
-+++ gnome-session-3.4.1/data/gnome-fallback.session.desktop.in.in  2012-05-06 20:20:29.181390204 -0400
-@@ -1,6 +1,6 @@
- [GNOME Session]
--_Name=GNOME fallback
-+_Name=GNOME fallback (Safe Mode)
- RequiredComponents=gnome-panel;gnome-settings-daemon;gnome-screensaver;
--RequiredProviders=windowmanager;notifications;
--DefaultProvider-windowmanager=gnome-wm
--DefaultProvider-notifications=notification-daemon
-+RequiredProviders=windowmanager;
-+DefaultProvider-windowmanager=metacity
-+DefaultProvider-notifications=notify-osd
-Index: gnome-session-3.4.1/data/gnome-fallback.desktop.in
-===================================================================
---- gnome-session-3.4.1.orig/data/gnome-fallback.desktop.in    2012-05-06 20:20:27.389381326 -0400
-+++ gnome-session-3.4.1/data/gnome-fallback.desktop.in 2012-05-06 20:20:29.181390204 -0400
-@@ -1,7 +1,7 @@
- [Desktop Entry]
--_Name=GNOME Classic
--_Comment=This session logs you into GNOME
--Exec=gnome-session-fallback
-+_Name=GNOME Fallback (No effects)
-+_Comment=This session logs you into GNOME with the traditional panel without any graphical effect.
-+Exec=gnome-session --session=gnome-fallback
- TryExec=gnome-session
- Icon=
- Type=Application
-Index: gnome-session-3.4.1/data/ubuntu.session.desktop.in.in
-===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ gnome-session-3.4.1/data/ubuntu.session.desktop.in.in  2012-05-06 20:20:29.181390204 -0400
+--- /dev/null
++++ b/data/ubuntu.session.desktop.in.in
 @@ -0,0 +1,6 @@
 +[GNOME Session]
 +_Name=Ubuntu
@@ -108,10 +47,8 @@
 +RequiredProviders=windowmanager;panel;
 +DefaultProvider-windowmanager=compiz
 +DefaultProvider-panel=compiz
-Index: gnome-session-3.4.1/data/ubuntu.desktop.in
-===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ gnome-session-3.4.1/data/ubuntu.desktop.in 2012-05-06 20:20:29.181390204 -0400
+--- /dev/null
++++ b/data/ubuntu.desktop.in
 @@ -0,0 +1,7 @@
 +[Desktop Entry]
 +_Name=Ubuntu
--- gnome-session-3.7.3/debian/patches/52_xdg_current_desktop.patch 2013-01-09 19:39:02.000000000 +1100
+++ gnome-session-3.7.4/debian/patches/52_xdg_current_desktop.patch 2013-02-07 08:06:56.000000000 +1100
@@ -1,52 +1,28 @@
-Index: gnome-session-3.6.0/data/gnome-fallback-compiz.session.desktop.in.in
-===================================================================
---- gnome-session-3.6.0.orig/data/gnome-fallback-compiz.session.desktop.in.in  2012-09-26 11:00:16.384033749 +1200
-+++ gnome-session-3.6.0/data/gnome-fallback-compiz.session.desktop.in.in   2012-09-26 11:00:18.704033669 +1200
-@@ -6,3 +6,4 @@
- DefaultProvider-notifications=notify-osd
- IsRunnableHelper=@LIBEXECDIR@/gnome-session-check-accelerated
- FallbackSession=gnome-fallback
-+DesktopName=GNOME
-Index: gnome-session-3.6.0/data/gnome-fallback.session.desktop.in.in
-===================================================================
---- gnome-session-3.6.0.orig/data/gnome-fallback.session.desktop.in.in 2012-09-26 11:00:16.384033749 +1200
-+++ gnome-session-3.6.0/data/gnome-fallback.session.desktop.in.in  2012-09-26 11:00:18.704033669 +1200
-@@ -4,3 +4,4 @@
- RequiredProviders=windowmanager;
- DefaultProvider-windowmanager=metacity
- DefaultProvider-notifications=notify-osd
-+DesktopName=GNOME
-Index: gnome-session-3.6.0/data/gnome.session.desktop.in.in
-===================================================================
---- gnome-session-3.6.0.orig/data/gnome.session.desktop.in.in  2012-07-13 08:00:42.000000000 +1200
-+++ gnome-session-3.6.0/data/gnome.session.desktop.in.in   2012-09-26 11:00:18.704033669 +1200
-@@ -3,3 +3,4 @@
+--- a/data/gnome.session.desktop.in.in
++++ b/data/gnome.session.desktop.in.in
+@@ -2,3 +2,4 @@
+ _Name=GNOME
  RequiredComponents=gnome-shell;gnome-settings-daemon;
  IsRunnableHelper=@LIBEXECDIR@/gnome-session-check-accelerated
- FallbackSession=gnome-fallback
 +DesktopName=GNOME
-Index: gnome-session-3.6.0/data/ubuntu.session.desktop.in.in
-===================================================================
---- gnome-session-3.6.0.orig/data/ubuntu.session.desktop.in.in 2012-09-26 11:00:16.388033750 +1200
-+++ gnome-session-3.6.0/data/ubuntu.session.desktop.in.in  2012-09-26 11:00:18.704033669 +1200
+--- a/data/ubuntu.session.desktop.in.in
++++ b/data/ubuntu.session.desktop.in.in
 @@ -4,3 +4,4 @@
  RequiredProviders=windowmanager;panel;
  DefaultProvider-windowmanager=compiz
  DefaultProvider-panel=compiz
 +DesktopName=Unity
-Index: gnome-session-3.6.0/gnome-session/gsm-session-fill.c
-===================================================================
---- gnome-session-3.6.0.orig/gnome-session/gsm-session-fill.c  2012-09-26 11:00:17.264033717 +1200
-+++ gnome-session-3.6.0/gnome-session/gsm-session-fill.c   2012-09-26 11:00:18.704033669 +1200
+--- a/gnome-session/gsm-session-fill.c
++++ b/gnome-session/gsm-session-fill.c
 @@ -31,6 +31,7 @@
  #define GSM_KEYFILE_SESSION_GROUP "GNOME Session"
  #define GSM_KEYFILE_RUNNABLE_KEY "IsRunnableHelper"
  #define GSM_KEYFILE_FALLBACK_KEY "FallbackSession"
 +#define GSM_KEYFILE_DESKTOP_NAME_KEY "DesktopName"
  #define GSM_KEYFILE_REQUIRED_COMPONENTS_KEY "RequiredComponents"
- #define GSM_KEYFILE_REQUIRED_PROVIDERS_KEY  "RequiredProviders"
- #define GSM_KEYFILE_DEFAULT_PROVIDER_PREFIX "DefaultProvider"
-@@ -450,6 +451,24 @@
+
+ /* See https://bugzilla.gnome.org/show_bug.cgi?id=641992 for discussion */
+@@ -315,6 +316,24 @@
          return keyfile;
  }

@@ -71,7 +47,7 @@
  gboolean
  gsm_session_fill (GsmManager  *manager,
                    const char  *session)
-@@ -467,6 +486,8 @@
+@@ -332,6 +351,8 @@

          g_free (actual_session);

--- gnome-session-3.7.3/debian/patches/series   2013-01-07 11:00:44.000000000 +1100
+++ gnome-session-3.7.4/debian/patches/series   2013-02-07 08:10:21.000000000 +1100
@@ -1,6 +1,3 @@
-01_gnome-wm.patch
-02_fallback_desktop.patch
-03_fallback_desktop_makefile.patch
 #10_session_save.patch
 20_hide_nodisplay.patch
 22_support_autostart_delay.patch