r44145 - in /desktop/unstable/gdm3/debian: changelog patches/95_systemd-import-language-into-daemon-environment.patch patches/series

[smcv at users.alioth.debian.org]

Author: smcv
Date: Thu Mar  5 21:57:33 2015
New Revision: 44145

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=44145
Log:
95_systemd-import-language-into-daemon-environment.patch:
put the default system locale in gdm's environment (Closes: #644047)

Added:
    desktop/unstable/gdm3/debian/patches/95_systemd-import-language-into-daemon-environment.patch
Modified:
    desktop/unstable/gdm3/debian/changelog
    desktop/unstable/gdm3/debian/patches/series

Modified: desktop/unstable/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/changelog?rev=44145&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog	[utf-8] Thu Mar  5 21:57:33 2015
@@ -4,6 +4,8 @@
   * gdm3 Conflicts/Replaces: gdm again, to ensure that obsolete gdm packages
     from squeeze get cleaned up by upgrading wheezy to jessie
     (Closes: #774889)
+  * 95_systemd-import-language-into-daemon-environment.patch:
+    put the default system locale in gdm's environment (Closes: #644047)
 
  -- Simon McVittie <smcv at debian.org>  Thu, 05 Mar 2015 21:30:33 +0000
 

Added: desktop/unstable/gdm3/debian/patches/95_systemd-import-language-into-daemon-environment.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/95_systemd-import-language-into-daemon-environment.patch?rev=44145&op=file
==============================================================================
--- desktop/unstable/gdm3/debian/patches/95_systemd-import-language-into-daemon-environment.patch	(added)
+++ desktop/unstable/gdm3/debian/patches/95_systemd-import-language-into-daemon-environment.patch	[utf-8] Thu Mar  5 21:57:33 2015
@@ -0,0 +1,38 @@
+From: Ray Strode <rstrode at redhat.com>
+Date: Fri, 27 Feb 2015 13:39:35 -0500
+Subject: [PATCH] systemd: import language into daemon environment
+
+By default GDM is started with a pretty blank environment.
+
+This commit makes sure that the default locale for the
+system is used.
+
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=745286
+Bug-Debian: https://bugs.debian.org/774889
+Applied-upstream: 3.16, commit:fbb922c
+[smcv: cherry-picked to 3.14 branch]
+---
+ data/Makefile.am    | 1 +
+ data/gdm.service.in | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/data/Makefile.am b/data/Makefile.am
+index 1b79bc3..d30eed2 100644
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -197,6 +197,7 @@ gdm.service: $(srcdir)/gdm.service.in
+ 	$(AM_V_GEN)sed \
+ 		-e 's,[@]sbindir[@],$(sbindir),g' \
+ 		-e 's,[@]GDM_INITIAL_VT[@],$(GDM_INITIAL_VT),g' \
++		-e 's,[@]LANG_CONFIG_FILE[@],$(LANG_CONFIG_FILE),g' \
+ 		< $< > $@
+ systemdsystemunit += gdm.service
+ CLEANFILES += gdm.service
+diff --git a/data/gdm.service.in b/data/gdm.service.in
+index df8bc09..cecdb2c 100644
+--- a/data/gdm.service.in
++++ b/data/gdm.service.in
+@@ -10,2 +10,3 @@ IgnoreSIGPIPE=no
+ StandardOutput=syslog
+ StandardError=inherit
++EnvironmentFile=@LANG_CONFIG_FILE@

Modified: desktop/unstable/gdm3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/series?rev=44145&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/series	[utf-8] Thu Mar  5 21:57:33 2015
@@ -9,3 +9,4 @@
 92_systemd_unit.patch
 93_disable_gvfs.patch
 94_retain_xorg_log.patch
+95_systemd-import-language-into-daemon-environment.patch