← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/gdm/oneiric

« back to all changes in this revision

Viewing changes to debian/patches/15_default_session.patch

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche
  • Date: 2011-08-10 18:30:53 UTC
  • Revision ID: james.westby@ubuntu.com-20110810183053-daell9k18jsua85s
Tags: 3.0.4-0ubuntu8
* debian/patches/15_default_session.patch:
  - Set ubuntu as default session

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/15_default_session.patch
4
4
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=594733
5
5
Bug-Ubuntu: https://launchpad.net/bugs/403291
6
6
 
7
 
diff -Nur -x '*.orig' -x '*~' gdm-3.0.0//configure.ac gdm-3.0.0.new//configure.ac
8
 
--- gdm-3.0.0//configure.ac     2011-04-04 16:38:52.000000000 +0200
9
 
+++ gdm-3.0.0.new//configure.ac 2011-06-05 15:24:01.715285158 +0200
10
 
@@ -120,6 +120,13 @@
 
7
Index: gdm-3.0.4/configure.ac
 
8
===================================================================
 
9
--- gdm-3.0.4.orig/configure.ac 2011-08-10 18:29:07.705952647 +0200
 
10
+++ gdm-3.0.4/configure.ac      2011-08-10 18:29:07.749952857 +0200
 
11
@@ -121,6 +121,13 @@
11
12
 AC_SUBST(UPOWER_CFLAGS)
12
13
 AC_SUBST(UPOWER_LIBS)
13
14
 
21
22
 PKG_CHECK_MODULES(SIMPLE_GREETER,
22
23
         dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
23
24
         gtk+-3.0 >= $GTK_REQUIRED_VERSION
24
 
diff -Nur -x '*.orig' -x '*~' gdm-3.0.0//daemon/gdm-session-direct.c gdm-3.0.0.new//daemon/gdm-session-direct.c
25
 
--- gdm-3.0.0//daemon/gdm-session-direct.c      2011-04-04 16:37:16.000000000 +0200
26
 
+++ gdm-3.0.0.new//daemon/gdm-session-direct.c  2011-06-05 15:24:01.715285158 +0200
 
25
Index: gdm-3.0.4/daemon/gdm-session-direct.c
 
26
===================================================================
 
27
--- gdm-3.0.4.orig/daemon/gdm-session-direct.c  2011-08-10 18:29:07.673952489 +0200
 
28
+++ gdm-3.0.4/daemon/gdm-session-direct.c       2011-08-10 18:29:19.522011234 +0200
27
29
@@ -63,6 +63,10 @@
28
30
 #define GDM_SESSION_DBUS_INTERFACE    "org.gnome.DisplayManager.Session"
29
31
 #define GDM_SESSION_DBUS_ERROR_CANCEL "org.gnome.DisplayManager.Session.Error.Cancel"
62
64
 
63
65
         if (session_direct->priv->fallback_session_name != NULL) {
64
66
                 /* verify that the cached version still exists */
65
 
diff -Nur -x '*.orig' -x '*~' gdm-3.0.0//utils/gdm-set-default-session.c gdm-3.0.0.new//utils/gdm-set-default-session.c
66
 
--- gdm-3.0.0//utils/gdm-set-default-session.c  1970-01-01 01:00:00.000000000 +0100
67
 
+++ gdm-3.0.0.new//utils/gdm-set-default-session.c      2011-06-05 15:24:01.715285158 +0200
 
67
@@ -627,7 +651,7 @@
 
68
                 }
 
69
         }
 
70
 
 
71
-        name = g_strdup ("gnome");
 
72
+        name = g_strdup ("ubuntu");
 
73
         if (get_session_command_for_name (name, NULL)) {
 
74
                 g_free (session_direct->priv->fallback_session_name);
 
75
                 session_direct->priv->fallback_session_name = name;
 
76
Index: gdm-3.0.4/utils/Makefile.am
 
77
===================================================================
 
78
--- gdm-3.0.4.orig/utils/Makefile.am    2011-02-18 04:27:53.000000000 +0100
 
79
+++ gdm-3.0.4/utils/Makefile.am 2011-08-10 18:29:07.753952884 +0200
 
80
@@ -6,11 +6,13 @@
 
81
        -DLOCALSTATEDIR=\""$(localstatedir)"\"          \
 
82
        -DGDM_SCREENSHOT_DIR=\""$(GDM_SCREENSHOT_DIR)"\"\
 
83
        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
 
84
+       -DGDMCONFDIR=\"$(gdmconfdir)\"                  \
 
85
        $(UTILS_CFLAGS)                                 \
 
86
        $(CANBERRA_GTK_CFLAGS)                          \
 
87
        $(GTK_CFLAGS)                                   \
 
88
        $(XLIB_CFLAGS)                                  \
 
89
        $(COMMON_CFLAGS)                                \
 
90
+       $(SET_SESSION_CFLAGS)                           \
 
91
        $(NULL)
 
92
 
 
93
 edit = sed \
 
94
@@ -24,6 +26,10 @@
 
95
        gdm-screenshot          \
 
96
        $(NULL)
 
97
 
 
98
+libexec_PROGRAMS = \
 
99
+       gdm-set-default-session \
 
100
+       $(NULL)
 
101
+
 
102
 gdmflexiserver_SOURCES =       \
 
103
        gdmflexiserver.c        \
 
104
        $(NULL)
 
105
@@ -44,6 +50,15 @@
 
106
        $(COMMON_LIBS)          \
 
107
        $(NULL)
 
108
 
 
109
+gdm_set_default_session_SOURCES =      \
 
110
+       gdm-set-default-session.c       \
 
111
+       $(NULL)
 
112
+
 
113
+gdm_set_default_session_LDADD =        \
 
114
+       $(SET_SESSION_LIBS)     \
 
115
+       $(COMMON_LIBS)          \
 
116
+       $(NULL)
 
117
+
 
118
 CLEANFILES =                   \
 
119
        $(NULL)
 
120
 
 
121
Index: gdm-3.0.4/utils/gdm-set-default-session.c
 
122
===================================================================
 
123
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
 
124
+++ gdm-3.0.4/utils/gdm-set-default-session.c   2011-08-10 18:29:07.753952884 +0200
68
125
@@ -0,0 +1,271 @@
69
126
+#ifdef HAVE_CONFIG_H
70
127
+#include "config.h"
337
394
+    exit(return_code);
338
395
+
339
396
+}
340
 
diff -Nur -x '*.orig' -x '*~' gdm-3.0.0//utils/Makefile.am gdm-3.0.0.new//utils/Makefile.am
341
 
--- gdm-3.0.0//utils/Makefile.am        2010-10-01 13:54:28.000000000 +0200
342
 
+++ gdm-3.0.0.new//utils/Makefile.am    2011-06-05 15:24:01.715285158 +0200
343
 
@@ -6,11 +6,13 @@
344
 
        -DLOCALSTATEDIR=\""$(localstatedir)"\"          \
345
 
        -DGDM_SCREENSHOT_DIR=\""$(GDM_SCREENSHOT_DIR)"\"\
346
 
        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
347
 
+       -DGDMCONFDIR=\"$(gdmconfdir)\"                  \
348
 
        $(UTILS_CFLAGS)                                 \
349
 
        $(CANBERRA_GTK_CFLAGS)                          \
350
 
        $(GTK_CFLAGS)                                   \
351
 
        $(XLIB_CFLAGS)                                  \
352
 
        $(COMMON_CFLAGS)                                \
353
 
+       $(SET_SESSION_CFLAGS)                           \
354
 
        $(NULL)
355
 
 
356
 
 edit = sed \
357
 
@@ -24,6 +26,10 @@
358
 
        gdm-screenshot          \
359
 
        $(NULL)
360
 
 
361
 
+libexec_PROGRAMS = \
362
 
+       gdm-set-default-session \
363
 
+       $(NULL)
364
 
+
365
 
 gdmflexiserver_SOURCES =       \
366
 
        gdmflexiserver.c        \
367
 
        $(NULL)
368
 
@@ -44,6 +50,15 @@
369
 
        $(COMMON_LIBS)          \
370
 
        $(NULL)
371
 
 
372
 
+gdm_set_default_session_SOURCES =      \
373
 
+       gdm-set-default-session.c       \
374
 
+       $(NULL)
375
 
+
376
 
+gdm_set_default_session_LDADD =        \
377
 
+       $(SET_SESSION_LIBS)     \
378
 
+       $(COMMON_LIBS)          \
379
 
+       $(NULL)
380
 
+
381
 
 CLEANFILES =                   \
382
 
        $(NULL)
383