← Back to branch summary

~ricotz/gdm/ubuntu

« back to all changes in this revision

Viewing changes to debian/patches/15_default_session.patch

  • Committer: Rico Tzschichholz
  • Date: 2011-10-06 13:11:22 UTC
  • Revision ID: ricotz@t-online.de-20111006131122-u7ktmaf5klp7c8b7
* New upstream release
* debian/control.in:
  - Add Build-dep on libgirepository1.0-dev (>= 0.9.12),
    gobject-introspection (>= 0.9.12), libnss3-dev (>= 3.11.1)
  - Add gir1.2-gdmgreeter-1.0 libgdmgreeter1, libgdmgreeter-dev,
    libgdmsimplegreeter1, libgdmsimplegreeter-dev packages
* debian/patches:
  - Drop 00git_use_new_power_interface.patch,
    00git_xsession-errors_symlink.patch and 29_grep_path.patch
    which are upstream
  - refreshed as needed

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
 
Index: gdm-3.0.4/configure.ac
 
7
Index: gdm-3.1.2/configure.ac
8
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 @@
 
9
--- gdm-3.1.2.orig/configure.ac
 
10
+++ gdm-3.1.2/configure.ac
 
11
@@ -146,6 +146,13 @@
12
12
 AC_SUBST(UPOWER_CFLAGS)
13
13
 AC_SUBST(UPOWER_LIBS)
14
14
 
22
22
 PKG_CHECK_MODULES(SIMPLE_GREETER,
23
23
         dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
24
24
         gtk+-3.0 >= $GTK_REQUIRED_VERSION
25
 
Index: gdm-3.0.4/daemon/gdm-session-direct.c
 
25
Index: gdm-3.1.2/daemon/gdm-session-direct.c
26
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
--- gdm-3.1.2.orig/daemon/gdm-session-direct.c
 
28
+++ gdm-3.1.2/daemon/gdm-session-direct.c
29
29
@@ -63,6 +63,10 @@
30
30
 #define GDM_SESSION_DBUS_INTERFACE    "org.gnome.DisplayManager.Session"
31
31
 #define GDM_SESSION_DBUS_ERROR_CANCEL "org.gnome.DisplayManager.Session.Error.Cancel"
37
37
 #ifndef GDM_SESSION_DEFAULT_PATH
38
38
 #define GDM_SESSION_DEFAULT_PATH "/usr/local/bin:/usr/bin:/bin"
39
39
 #endif
40
 
@@ -619,6 +623,26 @@
 
40
@@ -681,6 +685,26 @@
41
41
         char         *name;
42
42
         GSequence    *sessions;
43
43
         GSequenceIter *session;
64
64
 
65
65
         if (session_direct->priv->fallback_session_name != NULL) {
66
66
                 /* verify that the cached version still exists */
67
 
@@ -627,7 +651,7 @@
 
67
@@ -689,7 +713,7 @@
68
68
                 }
69
69
         }
70
70
 
73
73
         if (get_session_command_for_name (name, NULL)) {
74
74
                 g_free (session_direct->priv->fallback_session_name);
75
75
                 session_direct->priv->fallback_session_name = name;
76
 
Index: gdm-3.0.4/utils/Makefile.am
 
76
Index: gdm-3.1.2/utils/Makefile.am
77
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
 
78
--- gdm-3.1.2.orig/utils/Makefile.am
 
79
+++ gdm-3.1.2/utils/Makefile.am
80
80
@@ -6,11 +6,13 @@
81
81
        -DLOCALSTATEDIR=\""$(localstatedir)"\"          \
82
82
        -DGDM_SCREENSHOT_DIR=\""$(GDM_SCREENSHOT_DIR)"\"\
118
118
 CLEANFILES =                   \
119
119
        $(NULL)
120
120
 
121
 
Index: gdm-3.0.4/utils/gdm-set-default-session.c
 
121
Index: gdm-3.1.2/utils/gdm-set-default-session.c
122
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
 
123
--- /dev/null
 
124
+++ gdm-3.1.2/utils/gdm-set-default-session.c
125
125
@@ -0,0 +1,271 @@
126
126
+#ifdef HAVE_CONFIG_H
127
127
+#include "config.h"