← Back to branch summary

~ubuntu-branches/ubuntu/saucy/gdm/saucy-proposed

« back to all changes in this revision

Viewing changes to debian/patches/07_libexec-paths.patch

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha, Tim Lunn, Jeremy Bicha, Robert Ancell
  • Date: 2013-05-31 22:36:08 UTC
  • mfrom: (1.4.55)
  • Revision ID: package-import@ubuntu.com-20130531223608-33uo85niksee5460
Tags: 3.8.1.1-0ubuntu1
[ Tim Lunn ]
* New upstream release
* debian/patches/ubuntu_dont_catch_sigsegv.patch:
  - Dropped, obsolete
* debian/rules:
  - Don't rename gdm binary since that's already been
    done in the new version

[ Jeremy Bicha ]
* debian/control.in: Bump minimum glib
* debian/watch: Watch for unstable releases
* debian/patches/00git_logind_check.patch:
  - Dropped, applied in new release
* debian/patches/08_frequent-users_greeter.patch: Refreshed

[ Robert Ancell ]
* New upstream release
* debian/patches/ubuntu_daemon_autologin_tracking.patch:
* debian/patches/ubuntu_ensure_dirs.patch:
* debian/patches/ubuntu_slave-only-set-up-autologin.patch:
  - Applied upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/07_libexec-paths.patch
1
1
GNOME #645918
2
2
 
3
 
Index: gdm-3.5.4.2~git20120803~00576a2/gui/simple-chooser/gdm-chooser-session.c
 
3
Index: gdm-3.7.2/gui/simple-chooser/gdm-chooser-session.c
4
4
===================================================================
5
 
--- gdm-3.5.4.2~git20120803~00576a2.orig/gui/simple-chooser/gdm-chooser-session.c       2012-08-05 16:30:04.000000000 +0200
6
 
+++ gdm-3.5.4.2~git20120803~00576a2/gui/simple-chooser/gdm-chooser-session.c    2012-08-05 17:04:50.000000000 +0200
 
5
--- gdm-3.7.2.orig/gui/simple-chooser/gdm-chooser-session.c     2012-09-21 10:42:45.000000000 +1200
 
6
+++ gdm-3.7.2/gui/simple-chooser/gdm-chooser-session.c  2012-12-04 10:38:35.099982294 +1300
7
7
@@ -133,7 +133,7 @@
8
8
         ret = FALSE;
9
9
 
13
13
         if (error != NULL) {
14
14
                 g_warning ("Error starting settings daemon: %s", error->message);
15
15
                 g_error_free (error);
16
 
Index: gdm-3.5.4.2~git20120803~00576a2/configure.ac
 
16
Index: gdm-3.7.2/configure.ac
17
17
===================================================================
18
 
--- gdm-3.5.4.2~git20120803~00576a2.orig/configure.ac   2012-08-05 16:30:04.000000000 +0200
19
 
+++ gdm-3.5.4.2~git20120803~00576a2/configure.ac        2012-08-05 17:04:50.000000000 +0200
20
 
@@ -71,6 +71,7 @@
 
18
--- gdm-3.7.2.orig/configure.ac 2012-11-20 02:48:01.000000000 +1300
 
19
+++ gdm-3.7.2/configure.ac      2012-12-04 10:38:35.099982294 +1300
 
20
@@ -74,6 +74,7 @@
21
21
 FONTCONFIG_REQUIRED_VERSION=2.5.0
22
22
 UPOWER_REQUIRED_VERSION=0.9.0
23
23
 ACCOUNTS_SERVICE_REQUIRED_VERSION=0.6.12
25
25
 NSS_REQUIRED_VERSION=3.11.1
26
26
 
27
27
 EXTRA_COMPILE_WARNINGS(yes)
28
 
@@ -186,6 +187,16 @@
 
28
@@ -185,6 +186,16 @@
29
29
 AC_SUBST(LIBGDM_GIR_INCLUDES)
30
30
 
31
31
 dnl ---------------------------------------------------------------------------
42
42
 dnl - Configuration file stuff
43
43
 dnl ---------------------------------------------------------------------------
44
44
 
45
 
Index: gdm-3.5.4.2~git20120803~00576a2/gui/simple-chooser/Makefile.am
 
45
Index: gdm-3.7.2/gui/simple-chooser/Makefile.am
46
46
===================================================================
47
 
--- gdm-3.5.4.2~git20120803~00576a2.orig/gui/simple-chooser/Makefile.am 2012-08-05 16:30:04.000000000 +0200
48
 
+++ gdm-3.5.4.2~git20120803~00576a2/gui/simple-chooser/Makefile.am      2012-08-05 17:04:50.000000000 +0200
 
47
--- gdm-3.7.2.orig/gui/simple-chooser/Makefile.am       2012-07-20 00:08:17.000000000 +1200
 
48
+++ gdm-3.7.2/gui/simple-chooser/Makefile.am    2012-12-04 10:38:35.099982294 +1300
49
49
@@ -14,6 +14,7 @@
50
50
        -DSBINDIR=\""$(sbindir)"\"                      \
51
51
        -DPIXMAPDIR=\""$(pixmapdir)"\"                  \