r27812 - in /desktop/experimental/gdm3/debian: TODO Xsession changelog control control.in gdm3-autologin.pam gdm3.pam patches/01_language.patch patches/series

joss at users.alioth.debian.org joss at users.alioth.debian.org
Fri Apr 29 00:26:39 UTC 2011 

Author: joss
Date: Fri Apr 29 00:26:38 2011
New Revision: 27812

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=27812
Log:
* DISCLAIMER: this one is labeled “experimental” for a reason.
* Stop adding /usr/share/gdm to XDG_DATA_DIRS
* Break gnome-control-center < 3 since it is required for account 
  configuration.
* 01_language.patch: new patch. Don’t set LANG, which can be already 
  set by PAM, only set GDM_LANG.
* gdm*.pam: use session directives for pam_env, instead of auth.

Added:
    desktop/experimental/gdm3/debian/patches/01_language.patch
Modified:
    desktop/experimental/gdm3/debian/TODO
    desktop/experimental/gdm3/debian/Xsession
    desktop/experimental/gdm3/debian/changelog
    desktop/experimental/gdm3/debian/control
    desktop/experimental/gdm3/debian/control.in
    desktop/experimental/gdm3/debian/gdm3-autologin.pam
    desktop/experimental/gdm3/debian/gdm3.pam
    desktop/experimental/gdm3/debian/patches/series

Modified: desktop/experimental/gdm3/debian/TODO
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/TODO?rev=27812&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/TODO [utf-8] (original)
+++ desktop/experimental/gdm3/debian/TODO [utf-8] Fri Apr 29 00:26:38 2011
@@ -1,10 +1,13 @@
+Must be solved before going to unstable
+ * Restore 14_pam_dialog.patch
  * Check that a user logged on a tty is not considered as logged on 
    (previously fixed by 08_frequent-users_greeter.patch)
+ * Handle the DConf stuff in a more flexible way, allowing for system 
+   overrides like for GConf.
+ * Set some sensible DConf defaults accordingly.
+
+Must be dealt with before wheezy
  * Restore 11_xephyr_nested.patch
    + Needs to be made compatible with the xhost stuff
    + Don’t forget to add back the necessary code in 
      20_endsession_respawn.patch and 19_configure_xserver.patch
- * Restore 14_pam_dialog.patch if still needed
- * Handle the DConf stuff in a more flexible way, allowing for system 
-   overrides like for GConf.
- * Set some sensible DConf defaults accordingly.

Modified: desktop/experimental/gdm3/debian/Xsession
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/Xsession?rev=27812&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/Xsession [utf-8] (original)
+++ desktop/experimental/gdm3/debian/Xsession [utf-8] Fri Apr 29 00:26:38 2011
@@ -177,14 +177,6 @@
   set default $*
 fi
 
-# Add /usr/share/gdm to XDG_DATA_DIRS
-if [ -z "$XDG_DATA_DIRS" ]; then
-  XDG_DATA_DIRS=/usr/share/gdm/:/usr/local/share/:/usr/share/
-else
-  XDG_DATA_DIRS="$XDG_DATA_DIRS":/usr/share/gdm/
-fi
-export XDG_DATA_DIRS
-
 # use run-parts to source every file in the session directory; we source
 # instead of executing so that the variables and functions defined above
 # are available to the scripts, and so that they can pass variables to each

Modified: desktop/experimental/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/changelog?rev=27812&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/changelog [utf-8] (original)
+++ desktop/experimental/gdm3/debian/changelog [utf-8] Fri Apr 29 00:26:38 2011
@@ -1,6 +1,6 @@
-gdm3 (3.0.0-1) UNRELEASED; urgency=low
-
-  * WORK IN PROGRESS
+gdm3 (3.0.0-1) experimental; urgency=low
+
+  * DISCLAIMER: this one is labeled “experimental” for a reason.
   * README.Debian: remove reference to GDM 2.26. Closes: #616603.
   * gdm3.8.pod: patch from Vincent Lefevre to document XAUTHORITY. 
     Closes: #616612.
@@ -49,6 +49,12 @@
     time.
   * gdm3.preinst: dropped, the change is in stable.
   * Require gnome-session 3.0.
+  * Stop adding /usr/share/gdm to XDG_DATA_DIRS
+  * Break gnome-control-center < 3 since it is required for account 
+    configuration.
+  * 01_language.patch: new patch. Don’t set LANG, which can be already 
+    set by PAM, only set GDM_LANG.
+  * gdm*.pam: use session directives for pam_env, instead of auth.
 
  -- Josselin Mouette <joss at debian.org>  Mon, 28 Mar 2011 11:31:13 +0530
 

Modified: desktop/experimental/gdm3/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/control?rev=27812&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/control [utf-8] (original)
+++ desktop/experimental/gdm3/debian/control [utf-8] Fri Apr 29 00:26:38 2011
@@ -81,7 +81,8 @@
 Conflicts: gdm
 Breaks: gnome-panel (<< 3.0),
         gnome-screensaver (<< 2.17.7),
-        gnome-orca (<< 2.30.0-2)
+        gnome-orca (<< 2.30.0-2),
+        gnome-control-center (<< 3.0)
 Description: Next generation GNOME Display Manager
  GDM provides the equivalent of a "login:" prompt for X displays: it 
  asks for a login and starts X sessions.

Modified: desktop/experimental/gdm3/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/control.in?rev=27812&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/control.in [utf-8] (original)
+++ desktop/experimental/gdm3/debian/control.in [utf-8] Fri Apr 29 00:26:38 2011
@@ -76,7 +76,8 @@
 Conflicts: gdm
 Breaks: gnome-panel (<< 3.0),
         gnome-screensaver (<< 2.17.7),
-        gnome-orca (<< 2.30.0-2)
+        gnome-orca (<< 2.30.0-2),
+        gnome-control-center (<< 3.0)
 Description: Next generation GNOME Display Manager
  GDM provides the equivalent of a "login:" prompt for X displays: it 
  asks for a login and starts X sessions.

Modified: desktop/experimental/gdm3/debian/gdm3-autologin.pam
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/gdm3-autologin.pam?rev=27812&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/gdm3-autologin.pam [utf-8] (original)
+++ desktop/experimental/gdm3/debian/gdm3-autologin.pam [utf-8] Fri Apr 29 00:26:38 2011
@@ -1,10 +1,10 @@
 #%PAM-1.0
 auth    requisite       pam_nologin.so
-auth    required        pam_env.so readenv=1
-auth    required        pam_env.so readenv=1 envfile=/etc/default/locale
 auth	required	pam_succeed_if.so user != root quiet_success
 auth    required        pam_permit.so
 @include common-account
 session required        pam_limits.so
+session required        pam_env.so readenv=1
+session required        pam_env.so readenv=1 envfile=/etc/default/locale
 @include common-session
 @include common-password

Modified: desktop/experimental/gdm3/debian/gdm3.pam
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/gdm3.pam?rev=27812&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/gdm3.pam [utf-8] (original)
+++ desktop/experimental/gdm3/debian/gdm3.pam [utf-8] Fri Apr 29 00:26:38 2011
@@ -1,12 +1,12 @@
 #%PAM-1.0
 auth    requisite       pam_nologin.so
-auth    required        pam_env.so readenv=1
-auth    required        pam_env.so readenv=1 envfile=/etc/default/locale
 auth	required	pam_succeed_if.so user != root quiet_success
 @include common-auth
 auth    optional        pam_gnome_keyring.so
 @include common-account
 session required        pam_limits.so
+session required        pam_env.so readenv=1
+session required        pam_env.so readenv=1 envfile=/etc/default/locale
 @include common-session
 session optional        pam_gnome_keyring.so auto_start
 @include common-password

Added: desktop/experimental/gdm3/debian/patches/01_language.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/01_language.patch?rev=27812&op=file
==============================================================================
--- desktop/experimental/gdm3/debian/patches/01_language.patch (added)
+++ desktop/experimental/gdm3/debian/patches/01_language.patch [utf-8] Fri Apr 29 00:26:38 2011
@@ -1,0 +1,14 @@
+Index: gdm-3.0.0/daemon/gdm-session-direct.c
+===================================================================
+--- gdm-3.0.0.orig/daemon/gdm-session-direct.c	2011-04-29 01:19:33.240497348 +0200
++++ gdm-3.0.0/daemon/gdm-session-direct.c	2011-04-29 01:19:39.568528281 +0200
+@@ -1970,9 +1970,6 @@ setup_session_environment (GdmSessionDir
+                                                      get_session_name (session));
+ 
+         gdm_session_direct_set_environment_variable (session,
+-                                                     "LANG",
+-                                                     get_language_name (session));
+-        gdm_session_direct_set_environment_variable (session,
+                                                      "GDM_LANG",
+                                                      get_language_name (session));
+ 

Modified: desktop/experimental/gdm3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/series?rev=27812&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gdm3/debian/patches/series [utf-8] Fri Apr 29 00:26:38 2011
@@ -1,3 +1,4 @@
+01_language.patch
 02_xnest-wrapper.patch
 04_no_fatal_criticals.patch
 06_first_vt.patch

More information about the pkg-gnome-commits mailing list