Your message dated Mon, 09 Mar 2015 18:37:01 +0100
with message-id <[email protected]>
and subject line Re: Bug#780072: unblock: gdm3/3.14.1-5
has caused the Debian Bug report #780072,
regarding unblock: gdm3/3.14.1-5
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
780072: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=780072
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: [email protected]
Usertags: unblock
Please update the existing unblock for gdm3 to 3.14.1-5. I applied a
one-character change relative to my earlier upload, fixing a regression
reported by Josh Triplett: the patch I pulled in from upstream made
/etc/default/locale mandatory, where it should have been optional.
unblock gdm3/3.14.1-5
Debdiffs from the current jessie version, and the version that nthykier
already unblocked, attached.
Thanks,
S
diffstat for gdm3-3.14.1 gdm3-3.14.1
changelog | 18 ++++
control | 2
control.in | 2
patches/95_systemd-import-language-into-daemon-environment.patch | 38 ++++++++++
patches/series | 1
5 files changed, 61 insertions(+)
diff -Nru gdm3-3.14.1/debian/changelog gdm3-3.14.1/debian/changelog
--- gdm3-3.14.1/debian/changelog 2014-11-09 17:16:03.000000000 +0000
+++ gdm3-3.14.1/debian/changelog 2015-03-08 11:53:20.000000000 +0000
@@ -1,3 +1,21 @@
+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 <[email protected]> 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
+ 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 <[email protected]> Thu, 05 Mar 2015 21:59:26 +0000
+
gdm3 (3.14.1-3) unstable; urgency=medium
* 18_all_displays_transient.patch: fix autologin for the initial
diff -Nru gdm3-3.14.1/debian/control gdm3-3.14.1/debian/control
--- gdm3-3.14.1/debian/control 2014-11-09 17:33:48.000000000 +0000
+++ gdm3-3.14.1/debian/control 2015-03-08 11:53:51.000000000 +0000
@@ -91,6 +91,8 @@
Suggests: libpam-gnome-keyring,
gnome-orca
Provides: x-display-manager
+Conflicts: gdm
+Replaces: gdm
Breaks: gnome-panel (<< 3.0),
gnome-screensaver (<< 2.17.7),
gnome-orca (<< 2.30.0-2),
diff -Nru gdm3-3.14.1/debian/control.in gdm3-3.14.1/debian/control.in
--- gdm3-3.14.1/debian/control.in 2014-10-07 23:37:27.000000000 +0100
+++ gdm3-3.14.1/debian/control.in 2015-03-05 21:34:18.000000000 +0000
@@ -87,6 +87,8 @@
Suggests: libpam-gnome-keyring,
gnome-orca
Provides: x-display-manager
+Conflicts: gdm
+Replaces: gdm
Breaks: gnome-panel (<< 3.0),
gnome-screensaver (<< 2.17.7),
gnome-orca (<< 2.30.0-2),
diff -Nru gdm3-3.14.1/debian/patches/95_systemd-import-language-into-daemon-environment.patch gdm3-3.14.1/debian/patches/95_systemd-import-language-into-daemon-environment.patch
--- gdm3-3.14.1/debian/patches/95_systemd-import-language-into-daemon-environment.patch 1970-01-01 01:00:00.000000000 +0100
+++ gdm3-3.14.1/debian/patches/95_systemd-import-language-into-daemon-environment.patch 2015-03-08 11:53:20.000000000 +0000
@@ -0,0 +1,38 @@
+From: Ray Strode <[email protected]>
+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; do not fail if locale file does not exist]
+---
+ 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@
diff -Nru gdm3-3.14.1/debian/patches/series gdm3-3.14.1/debian/patches/series
--- gdm3-3.14.1/debian/patches/series 2014-11-08 19:57:55.000000000 +0000
+++ gdm3-3.14.1/debian/patches/series 2015-03-05 21:57:33.000000000 +0000
@@ -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
diffstat for gdm3-3.14.1 gdm3-3.14.1
changelog | 7 +++++++
patches/95_systemd-import-language-into-daemon-environment.patch | 4 ++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff -Nru gdm3-3.14.1/debian/changelog gdm3-3.14.1/debian/changelog
--- gdm3-3.14.1/debian/changelog 2015-03-05 21:59:32.000000000 +0000
+++ gdm3-3.14.1/debian/changelog 2015-03-08 11:53:20.000000000 +0000
@@ -1,3 +1,10 @@
+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 <[email protected]> Sun, 08 Mar 2015 11:52:40 +0000
+
gdm3 (3.14.1-4) unstable; urgency=medium
* Team upload.
diff -Nru gdm3-3.14.1/debian/patches/95_systemd-import-language-into-daemon-environment.patch gdm3-3.14.1/debian/patches/95_systemd-import-language-into-daemon-environment.patch
--- gdm3-3.14.1/debian/patches/95_systemd-import-language-into-daemon-environment.patch 2015-03-05 21:57:33.000000000 +0000
+++ gdm3-3.14.1/debian/patches/95_systemd-import-language-into-daemon-environment.patch 2015-03-08 11:53:20.000000000 +0000
@@ -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=-@LANG_CONFIG_FILE@
--- End Message ---
--- Begin Message ---
On 2015-03-09 01:12, Simon McVittie wrote:
> Package: release.debian.org
> Severity: normal
> User: [email protected]
> Usertags: unblock
>
> Please update the existing unblock for gdm3 to 3.14.1-5. I applied a
> one-character change relative to my earlier upload, fixing a regression
> reported by Josh Triplett: the patch I pulled in from upstream made
> /etc/default/locale mandatory, where it should have been optional.
>
> unblock gdm3/3.14.1-5
>
> Debdiffs from the current jessie version, and the version that nthykier
> already unblocked, attached.
>
> Thanks,
> S
>
Unblocked, thanks.
~Niels
--- End Message ---
