r24512 - in /desktop/unstable/gdm3/debian: Xsession changelog gdm3.init patches/24_show_user_other.patch patches/series rules

joss at users.alioth.debian.org joss at users.alioth.debian.org
Sat Jun 12 09:46:24 UTC 2010 

Author: joss
Date: Sat Jun 12 09:46:24 2010
New Revision: 24512

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24512
Log:
* 24_show_user_other.patch: new patch. Always show the “Other…” user, 
  even when there are no users in the list. Otherwise this breaks 
  setups with no local user.
* gdm3.init: drop bootlogs from the requirements. Closes: #585512.
* rules: set default language file to /etc/default/locale.
* debian/Xsession: set LANG from GDM_LANG, which is the one set from 
  GDM. Closes: #584231.

Added:
    desktop/unstable/gdm3/debian/patches/24_show_user_other.patch
Modified:
    desktop/unstable/gdm3/debian/Xsession
    desktop/unstable/gdm3/debian/changelog
    desktop/unstable/gdm3/debian/gdm3.init
    desktop/unstable/gdm3/debian/patches/series
    desktop/unstable/gdm3/debian/rules

Modified: desktop/unstable/gdm3/debian/Xsession
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/Xsession?rev=24512&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/Xsession [utf-8] (original)
+++ desktop/unstable/gdm3/debian/Xsession [utf-8] Sat Jun 12 09:46:24 2010
@@ -151,8 +151,16 @@
 
 unset XKB_IN_USE
 
-# if GDM_LANG isn't first in LANGUAGE, then unset it.
 if [ -n "$GDM_LANG" ]; then
+    # Set the locale to that, it’s the language selected in GDM.
+    LANG="$GDM_LANG"
+    export LANG
+
+    if [ -n "$LC_ALL" ] && [ "$LC_ALL" != "$LANG" ]; then
+        LC_ALL="$LANG"
+    fi
+
+    # if GDM_LANG isn't first in LANGUAGE, then unset it.
     if [ -n "$LANGUAGE" ]; then
         if echo "$LANGUAGE" | grep -q -- "^$GDM_LANG"; then
            :

Modified: desktop/unstable/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/changelog?rev=24512&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/changelog [utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog [utf-8] Sat Jun 12 09:46:24 2010
@@ -1,4 +1,4 @@
-gdm3 (2.30.2-4) UNRELEASED; urgency=low
+gdm3 (2.30.2-4) unstable; urgency=low
 
   [ Josselin Mouette ]
   * Ship a file in insserv.conf.d. Closes: #583694.
@@ -10,8 +10,15 @@
 
   [ Josselin Mouette ]
   * New Portuguese translation by Pedro Ribeiro. Closes: #581250.
-
- -- Josselin Mouette <joss at debian.org>  Sat, 29 May 2010 18:31:24 +0200
+  * 24_show_user_other.patch: new patch. Always show the “Other…” user, 
+    even when there are no users in the list. Otherwise this breaks 
+    setups with no local user.
+  * gdm3.init: drop bootlogs from the requirements. Closes: #585512.
+  * rules: set default language file to /etc/default/locale.
+  * debian/Xsession: set LANG from GDM_LANG, which is the one set from 
+    GDM. Closes: #584231.
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 12 Jun 2010 11:16:04 +0200
 
 gdm3 (2.30.2-3) unstable; urgency=low
 

Modified: desktop/unstable/gdm3/debian/gdm3.init
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/gdm3.init?rev=24512&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/gdm3.init [utf-8] (original)
+++ desktop/unstable/gdm3/debian/gdm3.init [utf-8] Sat Jun 12 09:46:24 2010
@@ -1,7 +1,7 @@
 #! /bin/sh
 ### BEGIN INIT INFO
 # Provides:          gdm3
-# Should-Start:      console-screen acpid bootlogs dbus hal network-manager
+# Should-Start:      console-screen acpid dbus hal network-manager
 # Required-Start:    $local_fs $remote_fs
 # Required-Stop:     $local_fs $remote_fs
 # Default-Start:     2 3 4 5

Added: desktop/unstable/gdm3/debian/patches/24_show_user_other.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/24_show_user_other.patch?rev=24512&op=file
==============================================================================
--- desktop/unstable/gdm3/debian/patches/24_show_user_other.patch (added)
+++ desktop/unstable/gdm3/debian/patches/24_show_user_other.patch [utf-8] Sat Jun 12 09:46:24 2010
@@ -1,0 +1,20 @@
+Index: gdm-2.30.2/gui/simple-greeter/gdm-user-chooser-widget.c
+===================================================================
+--- gdm-2.30.2.orig/gui/simple-greeter/gdm-user-chooser-widget.c	2010-06-12 10:38:48.533310336 +0200
++++ gdm-2.30.2/gui/simple-greeter/gdm-user-chooser-widget.c	2010-06-12 10:40:16.905305863 +0200
+@@ -140,13 +140,8 @@ update_other_user_visibility (GdmUserCho
+                 return;
+         }
+ 
+-        number_of_users = gdm_chooser_widget_get_number_of_items (GDM_CHOOSER_WIDGET (widget));
+-
+-        /* we hide the Other user if it's the last one, and we show it
+-         * if there's another user */
+-        if (number_of_users == 1 && widget->priv->has_user_other) {
+-                remove_user_other (widget);
+-        } if (number_of_users >= 1 && !widget->priv->has_user_other) {
++        /* Always show the Other user if requested */
++        if (!widget->priv->has_user_other) {
+                 add_user_other (widget);
+         }
+ }

Modified: desktop/unstable/gdm3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/series?rev=24512&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/series [utf-8] Sat Jun 12 09:46:24 2010
@@ -23,4 +23,5 @@
 21_schemas_usr.patch
 22_noconsole.patch
 23_autologin_once.patch
+24_show_user_other.patch
 90_relibtoolize.patch

Modified: desktop/unstable/gdm3/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/rules?rev=24512&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/rules [utf-8] (original)
+++ desktop/unstable/gdm3/debian/rules [utf-8] Sat Jun 12 09:46:24 2010
@@ -32,7 +32,8 @@
 		--with-screenshot-dir=/var/run/gdm3/greeter \
 		--with-defaults-conf=/usr/share/gdm/defaults.conf \
 		--with-user=Debian-gdm --with-group=Debian-gdm \
-		--with-pam-domain=gdm3
+		--with-pam-domain=gdm3 \
+		--with-lang-file=/etc/default/locale
 
 DEB_MAKE_EXTRA_ARGS += authdir=/var/lib/gdm3

More information about the pkg-gnome-commits mailing list