r13649 - in /desktop/unstable/gdm/debian: changelog patches/35_gdm.conf.patch
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Tue Nov 27 22:30:37 UTC 2007
Author: joss
Date: Tue Nov 27 22:30:37 2007
New Revision: 13649
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13649
Log:
* 35_gdm.conf.patch: set Browser=true so that themes with a face
browser work correctly. Closes: #445743.
Modified:
desktop/unstable/gdm/debian/changelog
desktop/unstable/gdm/debian/patches/35_gdm.conf.patch
Modified: desktop/unstable/gdm/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/changelog?rev=13649&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/changelog (original)
+++ desktop/unstable/gdm/debian/changelog Tue Nov 27 22:30:37 2007
@@ -7,6 +7,8 @@
+ Fix bashims.
* gdm.pam: add support for pam_gnome_keyring. Closes: #445870.
* Suggest libpam-gnome-keyring.
+ * 35_gdm.conf.patch: set Browser=true so that themes with a face
+ browser work correctly. Closes: #445743.
-- Josselin Mouette <joss at debian.org> Sun, 25 Nov 2007 11:32:50 +0100
Modified: desktop/unstable/gdm/debian/patches/35_gdm.conf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/patches/35_gdm.conf.patch?rev=13649&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/patches/35_gdm.conf.patch (original)
+++ desktop/unstable/gdm/debian/patches/35_gdm.conf.patch Tue Nov 27 22:30:37 2007
@@ -3,10 +3,10 @@
* update comments
* update pathnames
-Index: gdm-2.20.0/config/gdm.conf.in
+Index: gdm-2.20.1/config/gdm.conf.in
===================================================================
---- gdm-2.20.0.orig/config/gdm.conf.in 2007-10-06 18:38:57.372983931 +0200
-+++ gdm-2.20.0/config/gdm.conf.in 2007-10-06 18:39:19.322234748 +0200
+--- gdm-2.20.1.orig/config/gdm.conf.in 2007-10-15 23:43:04.000000000 +0200
++++ gdm-2.20.1/config/gdm.conf.in 2007-11-27 23:29:52.581571830 +0100
@@ -1,14 +1,8 @@
# GDM System Defaults Configuration file.
#
@@ -43,7 +43,7 @@
#
# For full reference documentation see the GNOME help browser under
# GNOME|System category. You can also find the docs in HTML form on
-@@ -68,7 +64,7 @@
+@@ -68,7 +64,7 @@ TimedLoginDelay=30
# The greeter for attached (non-xdmcp) logins. Change gdmlogin to gdmgreeter
# to get the new graphical greeter.
@@ -52,7 +52,7 @@
# The greeter for xdmcp logins, usually you want a less graphically intensive
# greeter here so it's better to leave this with gdmlogin
-@@ -83,13 +79,9 @@
+@@ -83,13 +79,9 @@ TimedLoginDelay=30
#GtkModulesList=gail:atk-bridge:@libdir@/gtk-2.0/modules/libdwellmouselistener:@libdir@/gtk-2.0/modules/libkeymouselistener
# Default path to set. The profile scripts will likely override this value.
@@ -68,7 +68,7 @@
# If you are having trouble with using a single server for a long time and want
# GDM to kill/restart the server, turn this on. On Solaris, this value is
-@@ -105,7 +97,7 @@
+@@ -105,7 +97,7 @@ Group=gdm
# To try to kill all clients started at greeter time or in the Init script.
# does not always work, only if those clients have a window of their own.
#KillInitClients=true
@@ -77,7 +77,7 @@
# Note that a post login script is run before a PreSession script. It is run
# after the login is successful and before any setup is run on behalf of the
-@@ -126,9 +118,9 @@
+@@ -126,9 +118,9 @@ XKeepsCrashing=@gdmconfdir@/XKeepsCrashi
#
# Reboot, Halt and suspend commands, you can add different commands separated
# by a semicolon. GDM will use the first one it can find.
@@ -90,7 +90,7 @@
# The following options specify how GDM system commands are supported.
#
-@@ -161,11 +153,10 @@
+@@ -161,11 +153,10 @@ ServAuthDir=@authdir@
BaseXsession=@gdmconfdir@/Xsession
# This is a directory where .desktop files describing the sessions live. It is
# really a PATH style variable since 2.4.4.2 to allow actual interoperability
@@ -105,7 +105,7 @@
# Better leave this blank and HOME will be used. You can use syntax ~/ below
# to indicate home directory of the user. You can also set this to something
# like /tmp if you don't want the authorizations to be in home directories.
-@@ -202,8 +193,8 @@
+@@ -202,8 +193,8 @@ XnestUnscaledFontPath=@X_XNEST_UNSCALED_
# Automatic VT allocation. Right now only works on Linux. This way we force
# X to use specific vts. Turn VTAllocation to false if this is causing
# problems.
@@ -116,7 +116,7 @@
# Should double login be treated with a warning (and possibility to change VT's
# on Linux and FreeBSD systems for console logins)
#DoubleLoginWarning=true
-@@ -242,7 +233,7 @@
+@@ -242,7 +233,7 @@ GdmXserverTimeout=10
[security]
# Allow root to login. It makes sense to turn this off for kiosk use, when
# you want to minimize the possibility of break in.
@@ -125,7 +125,7 @@
# Allow login as root via XDMCP. This value will be overridden and set to
# false if the /etc/default/login file exists and contains
# "CONSOLE=/dev/login", and set to true if the /etc/default/login file exists
-@@ -252,7 +243,7 @@
+@@ -252,7 +243,7 @@ AllowRemoteRoot=false
AllowRemoteAutoLogin=false
# 0 is the most restrictive, 1 allows group write permissions, 2 allows all
# write permissions.
@@ -134,7 +134,7 @@
# Check if directories are owned by logon user. Set to false, if you have, for
# example, home directories owned by some other user.
CheckDirOwner=true
-@@ -271,7 +262,7 @@
+@@ -271,7 +262,7 @@ SupportAutomount=false
# Note: Anytime we find a -query or -indirect on the command line we do not add
# a "-nolisten tcp", as then the query just wouldn't work, so this setting only
# affects truly attached sessions.
@@ -143,7 +143,7 @@
# By default never place cookies if we "detect" NFS. We detect NFS by
# detecting "root-squashing". It seems bad practice to place cookies on things
# that go over the network by default and thus we do not do it by default.
-@@ -352,7 +343,7 @@
+@@ -352,7 +343,7 @@ Enable=false
#GtkRC=@datadir@/themes/Default/gtk-2.0/gtkrc
# The GTK+ theme to use for the GUI.
@@ -152,7 +152,14 @@
# If to allow changing the GTK+ (widget) theme from the greeter. Currently
# this only affects the standard greeter as the graphical greeter does not yet
# have this ability.
-@@ -397,7 +388,7 @@
+@@ -391,13 +382,13 @@ Enable=false
+ # affect the Face Browser (MinimalUID, DefaultFace, Include, Exclude,
+ # IncludeAll, GlobalFaceDir) are used by both the Standard and Themed
+ # greeter.
+-Browser=false
++Browser=true
+ # The default picture in the browser.
+ #DefaultFace=@pixmapdir@/nobody.png
# User ID's less than the MinimalUID value will not be included in the face
# browser or in the gdmselection list for Automatic/Timed login. They will not
# be displayed regardless of the settings for Include and Exclude.
@@ -161,7 +168,7 @@
# Users listed in Include will be included in the face browser and in the
# gdmsetup selection list for Automatic/Timed login. Users should be separated
# by commas.
-@@ -406,7 +397,7 @@
+@@ -406,7 +397,7 @@ Browser=false
# gdmsetup selection list for Automatic/Timed login. Excluded users will still
# be able to log in, but will have to type their username. Users should be
# separated by commas.
@@ -170,7 +177,7 @@
# By default, an empty include list means display no users. By setting
# IncludeAll to true, the password file will be scanned and all users will be
# displayed except users excluded via the Exclude setting and user ID's less
-@@ -414,16 +405,16 @@
+@@ -414,16 +405,16 @@ Browser=false
# large numbers of users and this feature should not be used in such
# environments. The setting of IncludeAll does nothing if Include is set to a
# non-empty value.
@@ -190,7 +197,7 @@
# Logo shown on file chooser button in gdmsetup (do not modify this value).
#ChooserButtonLogo=@pixmapdir@/gdm-foot-logo.png
# The standard greeter should shake if a user entered the wrong username or
-@@ -502,7 +493,7 @@
+@@ -502,7 +493,7 @@ GraphicalThemedColor=#76848F
#Use24Clock=auto
# Use circles in the password field. Looks kind of cool actually, but only
# works with certain fonts.
@@ -199,7 +206,7 @@
# Do not show any visible feedback in the password field. This is standard for
# instance in console, xdm and ssh.
#UseInvisibleInEntry=false
-@@ -512,8 +503,8 @@
+@@ -512,8 +503,8 @@ GraphicalThemedColor=#76848F
# list then provide a list that is delimited by /: to the GraphicalThemes
# key and set GraphicalThemeRand to true. Otherwise use GraphicalTheme
# and specify just one theme.
More information about the pkg-gnome-commits
mailing list