← Back to branch summary

~ubuntu-branches/ubuntu/raring/gnome-session/raring

« back to all changes in this revision

Viewing changes to debian/patches/52_xdg_current_desktop.patch

  • Committer: Package Import Robot
  • Author(s): Iain Lane
  • Date: 2012-06-11 12:11:00 UTC
  • mfrom: (1.1.77)
  • Revision ID: package-import@ubuntu.com-20120611121100-4v8ck97j20kykbbp
Tags: 3.5.2-0ubuntu1
https://launchpad.net/bugs/1011555
* debian/watch: Track unstable versions 
* New upstream release (LP: #1011555).
  + Fail softer in the face of spotty session bus
  + Consider that required component that exits with 1 has crashed
* Refresh patches to apply cleanly 

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/52_xdg_current_desktop.patch
1
 
Index: gnome-session-3.2.1/data/gnome-classic.session.desktop.in.in
 
1
Index: ubuntu/data/gnome-classic.session.desktop.in.in
2
2
===================================================================
3
 
--- gnome-session-3.2.1.orig/data/gnome-classic.session.desktop.in.in   2012-02-13 13:08:32.591640287 +0100
4
 
+++ gnome-session-3.2.1/data/gnome-classic.session.desktop.in.in        2012-02-13 13:08:32.735641001 +0100
 
3
--- ubuntu.orig/data/gnome-classic.session.desktop.in.in        2012-06-11 12:21:38.005218824 +0100
 
4
+++ ubuntu/data/gnome-classic.session.desktop.in.in     2012-06-11 12:21:53.877218126 +0100
5
5
@@ -6,3 +6,4 @@
6
6
 DefaultProvider-notifications=notify-osd
7
7
 IsRunnableHelper=@LIBEXECDIR@/gnome-session-check-accelerated
8
8
 FallbackSession=gnome-fallback
9
9
+DesktopName=GNOME
10
 
Index: gnome-session-3.2.1/data/gnome-fallback.session.desktop.in.in
 
10
Index: ubuntu/data/gnome-fallback.session.desktop.in.in
11
11
===================================================================
12
 
--- gnome-session-3.2.1.orig/data/gnome-fallback.session.desktop.in.in  2012-02-13 13:08:32.591640287 +0100
13
 
+++ gnome-session-3.2.1/data/gnome-fallback.session.desktop.in.in       2012-02-13 13:08:32.735641001 +0100
 
12
--- ubuntu.orig/data/gnome-fallback.session.desktop.in.in       2012-06-11 12:21:38.005218824 +0100
 
13
+++ ubuntu/data/gnome-fallback.session.desktop.in.in    2012-06-11 12:21:53.877218126 +0100
14
14
@@ -4,3 +4,4 @@
15
15
 RequiredProviders=windowmanager;
16
16
 DefaultProvider-windowmanager=metacity
17
17
 DefaultProvider-notifications=notify-osd
18
18
+DesktopName=GNOME
19
 
Index: gnome-session-3.2.1/data/gnome.session.desktop.in.in
 
19
Index: ubuntu/data/gnome.session.desktop.in.in
20
20
===================================================================
21
 
--- gnome-session-3.2.1.orig/data/gnome.session.desktop.in.in   2012-02-13 13:08:25.531605278 +0100
22
 
+++ gnome-session-3.2.1/data/gnome.session.desktop.in.in        2012-02-13 13:08:32.735641001 +0100
 
21
--- ubuntu.orig/data/gnome.session.desktop.in.in        2012-06-11 12:21:16.361219777 +0100
 
22
+++ ubuntu/data/gnome.session.desktop.in.in     2012-06-11 12:21:53.877218126 +0100
23
23
@@ -3,3 +3,4 @@
24
24
 RequiredComponents=gnome-shell;gnome-settings-daemon;
25
25
 IsRunnableHelper=@LIBEXECDIR@/gnome-session-check-accelerated
26
26
 FallbackSession=gnome-fallback
27
27
+DesktopName=GNOME
28
 
Index: gnome-session-3.2.1/data/ubuntu-2d.session.desktop.in.in
 
28
Index: ubuntu/data/ubuntu-2d.session.desktop.in.in
29
29
===================================================================
30
 
--- gnome-session-3.2.1.orig/data/ubuntu-2d.session.desktop.in.in       2012-02-13 13:08:32.595640301 +0100
31
 
+++ gnome-session-3.2.1/data/ubuntu-2d.session.desktop.in.in    2012-02-13 13:08:32.735641001 +0100
 
30
--- ubuntu.orig/data/ubuntu-2d.session.desktop.in.in    2012-06-11 12:21:38.005218824 +0100
 
31
+++ ubuntu/data/ubuntu-2d.session.desktop.in.in 2012-06-11 12:21:53.877218126 +0100
32
32
@@ -6,3 +6,4 @@
33
33
 DefaultProvider-panel=unity-2d-panel
34
34
 DefaultProvider-shell=unity-2d-shell
35
35
 
36
36
+DesktopName=Unity
37
 
Index: gnome-session-3.2.1/data/ubuntu.session.desktop.in.in
 
37
Index: ubuntu/data/ubuntu.session.desktop.in.in
38
38
===================================================================
39
 
--- gnome-session-3.2.1.orig/data/ubuntu.session.desktop.in.in  2012-02-13 13:08:32.595640301 +0100
40
 
+++ gnome-session-3.2.1/data/ubuntu.session.desktop.in.in       2012-02-13 13:08:32.739641015 +0100
 
39
--- ubuntu.orig/data/ubuntu.session.desktop.in.in       2012-06-11 12:21:38.005218824 +0100
 
40
+++ ubuntu/data/ubuntu.session.desktop.in.in    2012-06-11 12:21:53.877218126 +0100
41
41
@@ -6,3 +6,4 @@
42
42
 DefaultProvider-panel=compiz
43
43
 IsRunnableHelper=/usr/lib/nux/unity_support_test
44
44
 FallbackSession=ubuntu-2d
45
45
+DesktopName=Unity
46
 
Index: gnome-session-3.2.1/gnome-session/gsm-session-fill.c
 
46
Index: ubuntu/gnome-session/gsm-session-fill.c
47
47
===================================================================
48
 
--- gnome-session-3.2.1.orig/gnome-session/gsm-session-fill.c   2012-02-13 13:08:32.667640658 +0100
49
 
+++ gnome-session-3.2.1/gnome-session/gsm-session-fill.c        2012-02-13 13:08:32.743641036 +0100
 
48
--- ubuntu.orig/gnome-session/gsm-session-fill.c        2012-06-11 12:21:50.633218268 +0100
 
49
+++ ubuntu/gnome-session/gsm-session-fill.c     2012-06-11 12:21:53.877218126 +0100
50
50
@@ -31,6 +31,7 @@
51
51
 #define GSM_KEYFILE_SESSION_GROUP "GNOME Session"
52
52
 #define GSM_KEYFILE_RUNNABLE_KEY "IsRunnableHelper"
55
55
 #define GSM_KEYFILE_REQUIRED_COMPONENTS_KEY "RequiredComponents"
56
56
 #define GSM_KEYFILE_REQUIRED_PROVIDERS_KEY  "RequiredProviders"
57
57
 #define GSM_KEYFILE_DEFAULT_PROVIDER_PREFIX "DefaultProvider"
58
 
@@ -452,6 +453,24 @@
 
58
@@ -461,6 +462,24 @@
59
59
         return keyfile;
60
60
 }
61
61
 
80
80
 gboolean
81
81
 gsm_session_fill (GsmManager  *manager,
82
82
                   char       **override_autostart_dirs,
83
 
@@ -475,6 +494,8 @@
 
83
@@ -484,6 +503,8 @@
84
84
 
85
85
         g_free (actual_session);
86
86