← Back to branch summary

~osomon/gdm/fix-1718446

« back to all changes in this revision

Viewing changes to debian/patches/ubuntu_config_error_dialog.patch

  • Committer: Iain Lane
  • Author(s): Marc Deslauriers
  • Date: 2017-10-05 11:33:05 UTC
  • Revision ID: iain.lane@canonical.com-20171005113305-uvsk2dcpjwqkannw
Tags: 3.26.0-1ubuntu1
Merge 3.26.0 with Debian

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/ubuntu_config_error_dialog.patch
6
6
Forwarded: https://bugzilla.gnome.org/738970
7
7
Author: Gunnar Hjalmarsson <gunnarhj@ubuntu.com>
8
8
 
9
 
Index: gdm-3.17.4/configure.ac
 
9
Index: gdm3-3.26.0/configure.ac
10
10
===================================================================
11
 
--- gdm-3.17.4.orig/configure.ac
12
 
+++ gdm-3.17.4/configure.ac
13
 
@@ -1456,7 +1456,7 @@ fi
 
11
--- gdm3-3.26.0.orig/configure.ac       2017-09-14 08:25:07.137555429 -0400
 
12
+++ gdm3-3.26.0/configure.ac    2017-09-14 08:25:07.137555429 -0400
 
13
@@ -1500,7 +1500,7 @@ fi
14
14
 if test x$os_solaris = xyes ; then
15
15
    XSESSION_SHELL=/bin/ksh
16
16
 else
19
19
 fi
20
20
 
21
21
 #
22
 
Index: gdm-3.17.4/data/config-error-dialog.sh
 
22
Index: gdm3-3.26.0/data/config-error-dialog.sh
23
23
===================================================================
24
 
--- /dev/null
25
 
+++ gdm-3.17.4/data/config-error-dialog.sh
 
24
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
 
25
+++ gdm3-3.26.0/data/config-error-dialog.sh     2017-09-14 08:25:07.137555429 -0400
26
26
@@ -0,0 +1,29 @@
27
27
+# Copyright (C) 2014 Canonical Ltd
28
28
+# Author: Gunnar Hjalmarsson <gunnarhj@ubuntu.com>
53
53
+elif [ -x /usr/bin/zenity ]; then
54
54
+       zenity --warning --no-wrap --text="$TEXT"
55
55
+fi
56
 
Index: gdm-3.17.4/data/Makefile.am
 
56
Index: gdm3-3.26.0/data/Makefile.am
57
57
===================================================================
58
 
--- gdm-3.17.4.orig/data/Makefile.am
59
 
+++ gdm-3.17.4/data/Makefile.am
60
 
@@ -204,6 +204,7 @@ uninstall-hook:
 
58
--- gdm3-3.26.0.orig/data/Makefile.am   2017-09-14 08:25:07.137555429 -0400
 
59
+++ gdm3-3.26.0/data/Makefile.am        2017-09-14 08:25:07.137555429 -0400
 
60
@@ -237,6 +237,7 @@ uninstall-hook:
61
61
        rm -f \
62
62
        $(DESTDIR)$(GDM_CUSTOM_CONF) \
63
63
        $(DESTDIR)$(gdmconfdir)/Xsession \
65
65
        $(DESTDIR)$(initdir)/Default \
66
66
        $(DESTDIR)$(postlogindir)/Default.sample \
67
67
        $(DESTDIR)$(predir)/Default \
68
 
@@ -235,6 +236,8 @@ if ENABLE_GDM_XSESSION
 
68
@@ -264,6 +265,8 @@ if ENABLE_GDM_XSESSION
69
69
        $(INSTALL_SCRIPT) Xsession $(DESTDIR)$(gdmconfdir)/Xsession
70
70
 endif
71
71
 
74
74
        if test '!' -d $(DESTDIR)$(initdir); then \
75
75
                $(mkinstalldirs) $(DESTDIR)$(initdir); \
76
76
                chmod 755 $(DESTDIR)$(initdir); \
77
 
Index: gdm-3.17.4/data/Xsession.in
 
77
Index: gdm3-3.26.0/data/Xsession.in
78
78
===================================================================
79
 
--- gdm-3.17.4.orig/data/Xsession.in
80
 
+++ gdm-3.17.4/data/Xsession.in
 
79
--- gdm3-3.26.0.orig/data/Xsession.in   2017-09-14 08:25:07.137555429 -0400
 
80
+++ gdm3-3.26.0/data/Xsession.in        2017-09-14 08:25:07.137555429 -0400
81
81
@@ -29,12 +29,32 @@ command="$@"
82
82
 # good for debugging where things went wrong
83
83
 echo "$0: Beginning session setup..."
115
115
 
116
116
 # Translation stuff
117
117
 if [ -x "@libexecdir@/gdmtranslate" ] ; then
118
 
Index: gdm-3.17.4/po/POTFILES.in
 
118
Index: gdm3-3.26.0/po/POTFILES.in
119
119
===================================================================
120
 
--- gdm-3.17.4.orig/po/POTFILES.in
121
 
+++ gdm-3.17.4/po/POTFILES.in
 
120
--- gdm3-3.26.0.orig/po/POTFILES.in     2017-09-14 08:25:07.137555429 -0400
 
121
+++ gdm3-3.26.0/po/POTFILES.in  2017-09-14 08:25:07.137555429 -0400
122
122
@@ -39,6 +39,7 @@ daemon/gdm-x-session.c
123
123
 daemon/main.c
124
124
 daemon/session-worker-main.c