SOURCES: kdebase-kdmconfig.patch - Oops..

[adgor]

Author: adgor                        Date: Sun Oct  1 12:54:48 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- Oops..

---- Files affected:
SOURCES:
   kdebase-kdmconfig.patch (1.22 -> 1.23) 

---- Diffs:

================================================================
Index: SOURCES/kdebase-kdmconfig.patch
diff -u SOURCES/kdebase-kdmconfig.patch:1.22 SOURCES/kdebase-kdmconfig.patch:1.23
--- SOURCES/kdebase-kdmconfig.patch:1.22	Sun Oct  1 13:40:59 2006
+++ SOURCES/kdebase-kdmconfig.patch	Sun Oct  1 14:54:43 2006
@@ -71,154 +71,6 @@
  
  messages:
  	$(XGETTEXT) $(kdm_greet_SOURCES) -o $(podir)/kdmgreet.pot
---- kdebase-040724/kdm/config.def.orig	2004-07-24 12:50:04.000000000 +0200
-+++ kdebase-040724/kdm/config.def	2004-07-24 13:09:38.487484896 +0200
-@@ -3,7 +3,7 @@
- #define RCVERMAJOR 2
- #define RCVERMINOR 2
- 
--#define KDMCONF KDE_CONFDIR "/kdm"
-+#define KDMCONF "/etc/X11/kdm"
- #define KDMDATA KDE_DATADIR "/kdm"
- 
- #ifdef _AIX
-@@ -1062,7 +1062,7 @@
- 
- Key: Willing
- Type: string
--Default: ""
-+Default: KDMCONF "/Xwilling"
- User: core
- # will be overwritten
- Instance: #
-@@ -1430,7 +1430,7 @@
- 
- Key: Setup
- Type: string
--Default: ""
-+Default: KDMCONF "/Xsetup"
- User: core
- # will be overwritten
- Instance: #*/""
-@@ -1450,7 +1450,7 @@
- 
- Key: Startup
- Type: string
--Default: ""
-+Default: KDMCONF "/Xstartup"
- User: core
- # will be overwritten
- Instance: #*/""
-@@ -1468,7 +1468,7 @@
- 
- Key: Reset
- Type: string
--Default: ""
-+Default: KDMCONF "/Xreset"
- User: core
- # will be overwritten
- Instance: #*/""
-@@ -1486,7 +1486,7 @@
- 
- Key: Session
- Type: string
--Default: XBINDIR "/xterm -ls -T"
-+Default: KDMCONF "/Xsession"
- #Merge: xdm - incompatible!
- User: core
- # will be overwritten
-@@ -1617,7 +1617,7 @@
- 
- Key: AllowRootLogin
- Type: bool
--Default: true
-+Default: false
- User: core
- User: greeter(showRoot)
- Instance: */false
-@@ -1608,10 +1608,10 @@
- 
- Key: AllowNullPasswd
- Type: bool
--Default: true
-+Default: false
- User: core
- # sensible?
--Instance: */false
-+Instance: */true
- Instance: :*/true
- Merge: xdm
- Comment:
-@@ -1742,10 +1742,10 @@
- 
- Key: SessionsDirs
- Type: list
--Default: KDMDATA "/sessions"
-+Default: "/usr/share/xsessions"
- User: core
- User: greeter-c
--Instance: #*/"/etc/X11/sessions,/usr/share/xsessions"
-+Instance: #*/"/etc/X11/sessions"
- Comment:
-  The directories containing session type definitions in .desktop format.
- Description:
-@@ -1754,7 +1754,7 @@
- 
- Key: ClientLogFile
- Type: string
--Default: ".xsession-errors"
-+Default: ""
- User: core
- Instance: */".xsession-errors-%s"
- Instance: :0/".xsession-errors"
-@@ -1804,9 +1804,9 @@
-  None/LOGO_NONE: nothing
-  Logo/LOGO_LOGO: the image specified by <option>LogoPixmap</option>
-  Clock/LOGO_CLOCK: a neat analog clock
--Default: Clock
-+Default: Logo
- User: greeter
--Instance: */Logo
-+Instance: #*/Logo
- Comment:
-  What should be shown in the greeter's logo are:
- Description:
-@@ -1816,7 +1816,7 @@
- 
- Key: LogoPixmap
- Type: string
--Default: ""
-+Default: KDMDATA "/pics/pldlogo.png"
- User: greeter(logo)
- Instance: */KDMDATA "pics/kdelogo.png"
- Comment:
-@@ -1851,7 +1851,7 @@
- 
- Key: GreetString
- Type: string
--Default: "Welcome to %s at %n"
-+Default: "Welcome to PLD Linux at %n"
- User: greeter
- Instance: #*/"K Desktop Environment (%n)"
- Comment:
-@@ -2033,7 +2033,7 @@
- 
- Key: MinShowUID
- Type: int
--Default: 0
-+Default: 500
- User: greeter(lowUserId)
- # will be overwritten
- Instance: #*/
-@@ -2094,7 +2094,7 @@
- 
- Key: FaceDir
- Type: string
--Default: *KDMDATA "/faces"
-+Default: *KDMCONF "/faces"
- User: greeter
- Instance: #*/"/usr/share/faces"
- Update: upd_facedir
 --- kdebase-3.5.4/kdm/config.def.orig	2005-10-10 17:04:31.000000000 +0200
 +++ kdebase-3.5.4/kdm/config.def	2006-10-01 13:13:08.000000000 +0200
 @@ -29,7 +29,7 @@
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kdebase-kdmconfig.patch?r1=1.22&r2=1.23&f=u