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

[smcv at users.alioth.debian.org]

Author: smcv
Date: Sun Mar  8 11:53:20 2015
New Revision: 44149

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=44149
Log:
Do not fail to start gdm if /etc/default/locale does not exist
(Closes: #779989)

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

Modified: desktop/unstable/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/changelog?rev=44149&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog	[utf-8] Sun Mar  8 11:53:20 2015
@@ -1,4 +1,11 @@
-gdm3 (3.14.1-4) UNRELEASED; urgency=medium
+gdm3 (3.14.1-5) unstable; urgency=medium
+
+  * Do not fail to start gdm if /etc/default/locale does not exist
+    (Closes: #779989)
+
+ -- Simon McVittie <smcv at debian.org>  Sun, 08 Mar 2015 11:52:40 +0000
+
+gdm3 (3.14.1-4) unstable; urgency=medium
 
   * Team upload.
   * gdm3 Conflicts/Replaces: gdm again, to ensure that obsolete gdm packages
@@ -7,7 +14,7 @@
   * 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
+ -- Simon McVittie <smcv at debian.org>  Thu, 05 Mar 2015 21:59:26 +0000
 
 gdm3 (3.14.1-3) unstable; urgency=medium
 

Modified: 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=44149&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/95_systemd-import-language-into-daemon-environment.patch	[utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/95_systemd-import-language-into-daemon-environment.patch	[utf-8] Sun Mar  8 11:53:20 2015
@@ -10,7 +10,7 @@
 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]
+[smcv: cherry-picked to 3.14 branch; do not fail if locale file does not exist]
 ---
  data/Makefile.am    | 1 +
  data/gdm.service.in | 1 +
@@ -35,4 +35,4 @@
 @@ -10,2 +10,3 @@ IgnoreSIGPIPE=no
  StandardOutput=syslog
  StandardError=inherit
-+EnvironmentFile=@LANG_CONFIG_FILE@
++EnvironmentFile=- at LANG_CONFIG_FILE@