rev 7393 - branches/kde4/packages/kdebase-workspace/debian/patches

Armin Berres trigger-guest at alioth.debian.org
Wed Oct 10 21:25:18 UTC 2007


Author: trigger-guest
Date: 2007-10-10 21:25:18 +0000 (Wed, 10 Oct 2007)
New Revision: 7393

Added:
   branches/kde4/packages/kdebase-workspace/debian/patches/06_kdehome_kde4.diff
   branches/kde4/packages/kdebase-workspace/debian/patches/07_kdmrc_defaults.diff
   branches/kde4/packages/kdebase-workspace/debian/patches/08_genkdmconf.diff
   branches/kde4/packages/kdebase-workspace/debian/patches/09_genkdm_make.diff
   branches/kde4/packages/kdebase-workspace/debian/patches/10_kdm_no_custom.diff
   branches/kde4/packages/kdebase-workspace/debian/patches/11_kdm_X_path.diff
   branches/kde4/packages/kdebase-workspace/debian/patches/12_be_better_at_honouring_user_kdm_theming.diff
   branches/kde4/packages/kdebase-workspace/debian/patches/13_kdm_override_docs.diff
Removed:
   branches/kde4/packages/kdebase-workspace/debian/patches/01_kdehome_kde4.diff
   branches/kde4/packages/kdebase-workspace/debian/patches/02_kdmrc_defaults.diff
   branches/kde4/packages/kdebase-workspace/debian/patches/03_genkdmconf.diff
   branches/kde4/packages/kdebase-workspace/debian/patches/04_genkdm_make.diff
   branches/kde4/packages/kdebase-workspace/debian/patches/05_kdm_no_custom.diff
Modified:
   branches/kde4/packages/kdebase-workspace/debian/patches/series
Log:
let's start the patches with 06 so we can add stuff like fixes for newer gcc and friends before the "ordinary" patches


Deleted: branches/kde4/packages/kdebase-workspace/debian/patches/01_kdehome_kde4.diff

Deleted: branches/kde4/packages/kdebase-workspace/debian/patches/02_kdmrc_defaults.diff

Deleted: branches/kde4/packages/kdebase-workspace/debian/patches/03_genkdmconf.diff

Deleted: branches/kde4/packages/kdebase-workspace/debian/patches/04_genkdm_make.diff

Deleted: branches/kde4/packages/kdebase-workspace/debian/patches/05_kdm_no_custom.diff

Added: branches/kde4/packages/kdebase-workspace/debian/patches/06_kdehome_kde4.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/06_kdehome_kde4.diff	                        (rev 0)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/06_kdehome_kde4.diff	2007-10-10 21:25:18 UTC (rev 7393)
@@ -0,0 +1,11 @@
+--- kdebase-workspace-3.93.0/startkde.cmake	2007-08-31 23:59:44.000000000 +0200
++++ kdebase-workspace-3.93.0/startkde.cmake	2007-08-31 23:59:55.000000000 +0200
+@@ -55,7 +55,7 @@
+ # The user's personal KDE directory is usually ~/.kde, but this setting
+ # may be overridden by setting KDEHOME.
+ 
+-kdehome=$HOME/.kde
++kdehome=$HOME/.kde4
+ test -n "$KDEHOME" && kdehome=`echo "$KDEHOME"|sed "s,^~/,$HOME/,"`
+ 
+ # see kstartupconfig source for usage

Added: branches/kde4/packages/kdebase-workspace/debian/patches/07_kdmrc_defaults.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/07_kdmrc_defaults.diff	                        (rev 0)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/07_kdmrc_defaults.diff	2007-10-10 21:25:18 UTC (rev 7393)
@@ -0,0 +1,100 @@
+diff -Naur kdebase-workspace.orig/kcontrol/kdm/kdm-dlg.cpp kdebase-workspace.patched/kcontrol/kdm/kdm-dlg.cpp
+--- kdebase-workspace.orig/kcontrol/kdm/kdm-dlg.cpp	2007-09-15 13:31:20.000000000 +0200
++++ kdebase-workspace.patched/kcontrol/kdm/kdm-dlg.cpp	2007-09-16 16:12:04.000000000 +0200
+@@ -279,7 +279,7 @@
+ 
+ 	// Read the greeting string
+ 	greetstr_lined->setText( configGrp.readEntry( "GreetString",
+-	                                            i18n("Welcome to %s at %n") ) );
++	                                            i18n("Welcome to Debian at %n") ) );
+ 
+ 	// Regular logo or clock
+ 	QString logoArea = configGrp.readEntry( "LogoArea", "Logo" );
+@@ -307,7 +307,7 @@
+ 
+ void KDMDialogWidget::defaults()
+ {
+-	greetstr_lined->setText( i18n("Welcome to %s at %n") );
++	greetstr_lined->setText( i18n("Welcome to Debian at %n") );
+ 	logoRadio->setChecked( true );
+ 	slotAreaRadioClicked( KdmLogo );
+ 	setLogo( "" );
+diff -Naur kdebase-workspace.orig/kdm/config.def kdebase-workspace.patched/kdm/config.def
+--- kdebase-workspace.orig/kdm/config.def	2007-09-15 13:31:20.000000000 +0200
++++ kdebase-workspace.patched/kdm/config.def	2007-09-16 16:13:35.000000000 +0200
+@@ -47,11 +47,11 @@
+ #endif
+ 
+ #if defined(BSD) || defined(__linux__)
+-# define DEF_USER_PATH KDM_DEF_USER_PATH
+-# define DEF_SYSTEM_PATH KDM_DEF_SYSTEM_PATH
++# define DEF_USER_PATH "/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games"
++# define DEF_SYSTEM_PATH "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11"
+ #else
+-# define DEF_USER_PATH KDM_DEF_USER_PATH ":/usr/ucb"
+-# define DEF_SYSTEM_PATH KDM_DEF_SYSTEM_PATH ":/etc:/usr/ucb"
++# define DEF_USER_PATH "/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games:/usr/ucb"
++# define DEF_SYSTEM_PATH "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11:/etc:/usr/ucb"
+ #endif
+ 
+ #if 0 /*def HASXDMAUTH*/
+@@ -1356,7 +1356,7 @@
+  This string is subject to word splitting.
+  </para><para>
+  The default is something reasonable for the system on which &kdm; was built,
+- like <command>/usr/X11R6/bin/X</command>.
++ like <command>/usr/bin/X</command>.
+ 
+ Key: ServerArgsLocal
+ Type: string
+@@ -1931,10 +1931,10 @@
+ 
+ Key: SessionsDirs
+ Type: list
+-Default: KDMDATA "/sessions"
++Default: "/usr/share/xsessions,/var/lib/menu-xdg/xsessions,/usr/share/apps/kdm/sessions"
+ User: core
+ User: greeter-c
+-Instance: #*/"/etc/X11/sessions,/usr/share/xsessions"
++Instance: #*/"/usr/share/xsessions,/var/lib/menu-xdg/xsessions,/usr/share/apps/kdm/sessions"
+ Comment:
+  The directories containing session type definitions in .desktop format.
+ Description:
+@@ -2000,7 +2000,7 @@
+ 
+ Key: UseSessReg
+ Type: bool
+-Default: true
++Default: false
+ User: core
+ Instance: #*/!
+ Comment:
+@@ -2096,9 +2096,9 @@
+ 
+ Key: GreetString
+ Type: string
+-Default: "Welcome to %s at %n"
++Default: "Welcome to Debian at %n"
+ User: greeter
+-Instance: #*/"K Desktop Environment (%n)"
++Instance: #*/"Welcome to Debian at %n"
+ Comment:
+  The headline in the greeter. The following character pairs are replaced:
+  - %d -> current display
+@@ -2532,7 +2532,6 @@
+ Default: 0
+ User: greeter
+ Instance: #*/
+-Update: upd_forgingseed
+ Comment:
+  Random seed for forging saved session types, etc. of unknown users.
+  This value should be random but constant across the login domain.
+@@ -2629,7 +2628,7 @@
+ Type: bool
+ Default: true
+ User: greeter
+-Instance: :*/false
++Instance: :*/true
+ Comment: &
+ Description:
+  Show the <guilabel>Restart X Server</guilabel>/<guilabel>Close Connection</guilabel> action in the greeter.

Added: branches/kde4/packages/kdebase-workspace/debian/patches/08_genkdmconf.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/08_genkdmconf.diff	                        (rev 0)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/08_genkdmconf.diff	2007-10-10 21:25:18 UTC (rev 7393)
@@ -0,0 +1,162 @@
+--- a/kdm/kfrontend/genkdmconf.c
++++ b/kdm/kfrontend/genkdmconf.c
+@@ -516,7 +516,7 @@
+ "# right hand sides can match.\n"
+ "#\n"
+ "\n"
+-"*					#any host can get a login window\n"
++"#*					#any host can get a login window\n"
+ "\n"
+ "#\n"
+ "# To hardwire a specific terminal to a specific host, you can\n"
+@@ -534,7 +534,7 @@
+ "# so this may not work in all environments.\n"
+ "#\n"
+ "\n"
+-"*		CHOOSER BROADCAST	#any indirect host can get a chooser\n"
++"#*		CHOOSER BROADCAST	#any indirect host can get a chooser\n"
+ "\n"
+ "#\n"
+ "# If you would prefer to configure the set of hosts each terminal sees,\n"
+@@ -570,35 +570,25 @@
+ "#! /bin/sh\n"
+ "# Xstartup - run as root before session starts\n"
+ "\n"
+-"# By convention, both xconsole and xterm -C check that the\n"
+-"# console is owned by the invoking user and is readable before attaching\n"
+-"# the console output.  This way a random user can invoke xterm -C without\n"
+-"# causing serious grief; still, it can cause havoc, so xconsole is started\n"
+-"# by Xsetup usually.\n"
+-"# This is not required if you use PAM with the pam_console module.\n"
+-"#\n"
+-"#chown $USER /dev/console\n"
++"PATH=\"$PATH:/usr/bin/X11\"\n"
+ "\n"
+-#ifdef _AIX
+-"# We create a pseudodevice for finger.  (host:0 becomes xdm/host_0)\n"
+-"# Without it, finger errors out with \"Cannot stat /dev/host:0\".\n"
+-"#\n"
+-"#devname=`echo $DISPLAY | cut -c1-8`\n"
+-"#if [ ! -d /dev/xdm ]; then\n"
+-"#  mkdir /dev/xdm\n"
+-"#  chmod 755 /dev/xdm\n"
+-"#fi\n"
+-"#touch /dev/xdm/$devname\n"
+-"#chmod 644 /dev/xdm/$devname\n"
+-"#exec sessreg -a -l xdm/$devname -h \"`echo $DISPLAY | cut -d: -f1`\""
+-#else
+-"#exec sessreg -a -l $DISPLAY -h \"`echo $DISPLAY | cut -d: -f1`\""
+-# ifdef BSD
+-" -x " KDMCONF "/Xservers"
+-# endif
+-#endif /* _AIX */
+-" $USER\n"
+-"\n# NOTE: The session is aborted if the last command returns non-zero.\n";
++"if [ -e /etc/nologin ]; then\n"
++"  # always display the nologin message, if possible\n"
++"  if [ -s /etc/nologin ] && which xmessage > /dev/null 2>&1; then\n"
++"    xmessage -file /etc/nologin -geometry 640x480\n"
++"  fi\n"
++"  if [ \"$(id -u)\" != \"0\" ] && \\\n"
++"     ! grep -qs '^ignore-nologin' /etc/kde4/kdm/kdm.options; then\n"
++"    exit 1\n"
++"  fi\n"
++"fi\n"
++"\n"
++"if grep -qs '^use-sessreg' /etc/kde4/kdm/kdm.options && \\\n"
++"   which sessreg > /dev/null 2>&1; then\n"
++"      exec sessreg -a -l \"$DISPLAY\" -u /var/run/utmp \\\n"
++"                   -h \"`echo $DISPLAY | cut -d: -f1`\" \"$USER\"\n"
++"      # NOTREACHED\n"
++"fi\n";
+ 
+ static const char def_reset[] =
+ "#! /bin/sh\n"
+@@ -614,12 +604,13 @@
+ "#devname=`echo $DISPLAY | cut -c1-8`\n"
+ "#exec sessreg -d -l xdm/$devname -h \"`echo $DISPLAY | cut -d: -f1`\""
+ #else
+-"#exec sessreg -d -l $DISPLAY -h \"`echo $DISPLAY | cut -d: -f1`\""
+-# ifdef BSD
+-" -x " KDMCONF "/Xservers"
+-# endif
++"if grep -qs '^use-sessreg' /etc/kde4/kdm/kdm.options && \\\n"
++"   which sessreg > /dev/null 2>&1; then\n"
++"      exec sessreg -d -l \"$DISPLAY\" -u /var/run/utmp \\\n"
++"                   -h \"`echo $DISPLAY | cut -d: -f1`\" \"$USER\"\n"
++"      # NOTREACHED\n"
++"fi\n";
+ #endif /* _AIX */
+-" $USER\n";
+ 
+ static const char def_session1[] =
+ "#! /bin/sh\n"
+@@ -651,6 +642,7 @@
+ "    [ -f $zhome/.zprofile ] && . $zhome/.zprofile\n"
+ "    [ -f $zdir/zlogin ] && . $zdir/zlogin\n"
+ "    [ -f $zhome/.zlogin ] && . $zhome/.zlogin\n"
++"    setopt shwordsplit noextendedglob\n"
+ "    ;;\n"
+ "  */csh|*/tcsh)\n"
+ "    # [t]cshrc is always sourced automatically.\n"
+@@ -667,28 +659,8 @@
+ "    [ -f $HOME/.profile ] && . $HOME/.profile\n"
+ "    ;;\n"
+ "esac\n"
+-"\n"
+-"[ -f /etc/xprofile ] && . /etc/xprofile\n"
+-"[ -f $HOME/.xprofile ] && . $HOME/.xprofile\n"
+-"\n"
+-"case $session in\n"
+-"  \"\")\n"
+-"    exec xmessage -center -buttons OK:0 -default OK \"Sorry, $DESKTOP_SESSION is no valid session.\"\n"
+-"    ;;\n"
+-"  failsafe)\n"
+-"    exec xterm -geometry 80x24-0-0\n"
+-"    ;;\n"
+-"  custom)\n"
+-"    exec $HOME/.xsession\n"
+-"    ;;\n"
+-"  default)\n"
+-"    exec " KDE_BINDIR "/startkde\n"
+-"    ;;\n"
+-"  *)\n"
+-"    eval exec \"$session\"\n"
+-"    ;;\n"
+-"esac\n"
+-"exec xmessage -center -buttons OK:0 -default OK \"Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop.\"\n";
++"# invoke global X session script\n"
++". /etc/X11/Xsession\n";
+ 
+ static const char def_background[] =
+ "[Desktop0]\n"
+@@ -963,29 +935,6 @@
+ 
+ 	if (maxTTY)
+ 		return;
+-	if (readFile( &it, "/etc/inittab" )) {
+-		usedFile( "/etc/inittab" );
+-		for (p = it.buf; p < it.eof; p = eol + 1) {
+-			for (eol = p; eol < it.eof && *eol != '\n'; eol++);
+-			if (*p != '#') {
+-				if ((ep = memMem( p, eol - p, " tty", 4 )) &&
+-				    ep < eol && isdigit( *ep ))
+-				{
+-					if (ep + 1 == eol || isspace( *(ep + 1) ))
+-						tty = *ep - '0';
+-					else if (isdigit( *(ep + 1) ) &&
+-					         (ep + 2 == eol || isspace( *(ep + 2) )))
+-						tty = (*ep - '0') * 10 + (*(ep + 1) - '0');
+-					else
+-						continue;
+-					TTYmask |= 1 << (tty - 1);
+-					if (tty > maxTTY)
+-						maxTTY = tty;
+-				}
+-			}
+-		}
+-		freeBuf( &it );
+-	}
+ 	if (!maxTTY) {
+ 		maxTTY = 6;
+ 		TTYmask = 0x3f;

Added: branches/kde4/packages/kdebase-workspace/debian/patches/09_genkdm_make.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/09_genkdm_make.diff	                        (rev 0)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/09_genkdm_make.diff	2007-10-10 21:25:18 UTC (rev 7393)
@@ -0,0 +1,9 @@
+--- a/kdm/kfrontend/CMakeLists.txt
++++ b/kdm/kfrontend/CMakeLists.txt
+@@ -110,5 +110,5 @@
+ 
+ ## use 'GENKDMCONF_FLAGS=... make install' to override
+ install(CODE "
+-exec_program(${CMAKE_CURRENT_BINARY_DIR}/genkdmconf ARGS --in \$DESTDIR${CONFIG_INSTALL_DIR}/kdm --face-src ${CMAKE_CURRENT_SOURCE_DIR}/pics \$GENKDMCONF_FLAGS)
++exec_program(${CMAKE_CURRENT_BINARY_DIR}/genkdmconf ARGS --in \$DESTDIR${CONFIG_INSTALL_DIR}/kdm --face-src ${CMAKE_CURRENT_SOURCE_DIR}/pics --no-old \$GENKDMCONF_FLAGS)
+ ")

Added: branches/kde4/packages/kdebase-workspace/debian/patches/10_kdm_no_custom.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/10_kdm_no_custom.diff	                        (rev 0)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/10_kdm_no_custom.diff	2007-10-10 21:25:18 UTC (rev 7393)
@@ -0,0 +1,19 @@
+diff -Naur kdebase-workspace.orig/kdm/kfrontend/kgreeter.cpp kdebase-workspace.patched/kdm/kfrontend/kgreeter.cpp
+--- kdebase-workspace.orig/kdm/kfrontend/kgreeter.cpp	2007-09-15 13:31:20.000000000 +0200
++++ kdebase-workspace.patched/kdm/kfrontend/kgreeter.cpp	2007-09-16 15:02:20.000000000 +0200
+@@ -327,7 +327,6 @@
+ KGreeter::putSession( const QString &type, const QString &name, bool hid, const char *exe )
+ {
+ 	int prio = exe ? (!strcmp( exe, "default" ) ? 0 :
+-	                  !strcmp( exe, "custom" ) ? 1 :
+ 	                  !strcmp( exe, "failsafe" ) ? 3 : 2) : 2;
+ 	for (int i = 0; i < sessionTypes.size(); i++)
+ 		if (sessionTypes[i].type == type) {
+@@ -356,7 +355,6 @@
+ 				            dsk.readEntry( "Exec" ).toLatin1() );
+ 			}
+ 	putSession( "default", i18n("Default"), false, "default" );
+-	putSession( "custom", i18n("Custom"), false, "custom" );
+ 	putSession( "failsafe", i18n("Failsafe"), false, "failsafe" );
+ 	qSort( sessionTypes );
+ 	for (int i = 0; i < sessionTypes.size() && !sessionTypes[i].hid; i++) {

Added: branches/kde4/packages/kdebase-workspace/debian/patches/11_kdm_X_path.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/11_kdm_X_path.diff	                        (rev 0)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/11_kdm_X_path.diff	2007-10-10 21:25:18 UTC (rev 7393)
@@ -0,0 +1,56 @@
+diff -Naur kdebase-workspace.orig/kdm/backend/dm.c kdebase-workspace.patched/kdm/backend/dm.c
+--- kdebase-workspace.orig/kdm/backend/dm.c	2007-09-15 13:31:20.000000000 +0200
++++ kdebase-workspace.patched/kdm/backend/dm.c	2007-09-16 15:12:10.000000000 +0200
+@@ -39,6 +39,7 @@
+ #include "dm_error.h"
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <stdarg.h>
+@@ -565,6 +566,16 @@
+ 		debug( "exec %\"[s\n", argv );
+ 		(void)execv( argv[0], argv );
+ 		logError( "X server %\"s cannot be executed\n", argv[0] );
++
++                /* Let's try again with a standard path */
++                argv[0] = (char *)realloc(argv[0], strlen("/usr/bin/X") + 1);
++                if (argv[0] != NULL) {
++                        argv[0] = "/usr/bin/X";
++                        debug( "exec %\"[s\n", argv );
++                        (void)execv( argv[0], argv );
++                        logError( "X server %\"s cannot be executed\n", argv[0] );
++                }
++
+ 		exit( 1 );
+ 	case -1:
+ 		logError( "Forking X server for remote login failed: %m" );
+diff -Naur kdebase-workspace.orig/kdm/backend/server.c kdebase-workspace.patched/kdm/backend/server.c
+--- kdebase-workspace.orig/kdm/backend/server.c	2007-09-15 13:31:20.000000000 +0200
++++ kdebase-workspace.patched/kdm/backend/server.c	2007-09-16 15:12:28.000000000 +0200
+@@ -41,6 +41,7 @@
+ #include <X11/Xlib.h>
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <signal.h>
+ 
+ 
+@@ -92,6 +93,16 @@
+ 		 */
+ 		(void)Signal( SIGUSR1, SIG_IGN );
+ 		(void)execv( argv[0], argv );
++
++		/* Let's try again with a standard path */
++		argv[0] = (char *)realloc(argv[0], strlen("/usr/bin/X") + 1);
++		if (argv[0] != NULL) {
++			argv[0] = "/usr/bin/X";
++			debug( "exec %\"[s\n", argv );
++			(void)execv( argv[0], argv );
++			logError( "X server %\"s cannot be executed\n", argv[0] );
++		}
++
+ 		logError( "X server %\"s cannot be executed\n", argv[0] );
+ 		exit( 47 );
+ 	case -1:

Added: branches/kde4/packages/kdebase-workspace/debian/patches/12_be_better_at_honouring_user_kdm_theming.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/12_be_better_at_honouring_user_kdm_theming.diff	                        (rev 0)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/12_be_better_at_honouring_user_kdm_theming.diff	2007-10-10 21:25:18 UTC (rev 7393)
@@ -0,0 +1,12 @@
+diff -Naur kdebase-workspace.orig/kdm/config.def kdebase-workspace.patched/kdm/config.def
+--- kdebase-workspace.orig/kdm/config.def	2007-09-15 13:31:20.000000000 +0200
++++ kdebase-workspace.patched/kdm/config.def	2007-09-15 13:48:04.000000000 +0200
+@@ -2657,7 +2657,7 @@
+ Type: string
+ Default: ""
+ User: greeter
+-Instance: */KDMDATA "/themes/circles"
++Instance: */ "@@@ToBeReplacedByDesktopBase@@@"
+ Comment: &
+ Description:
+  The theme to use for the greeter. Can point to either a directory or an XML

Added: branches/kde4/packages/kdebase-workspace/debian/patches/13_kdm_override_docs.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/13_kdm_override_docs.diff	                        (rev 0)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/13_kdm_override_docs.diff	2007-10-10 21:25:18 UTC (rev 7393)
@@ -0,0 +1,16 @@
+diff -Naur kdebase-workspace.orig/kdm/config.def kdebase-workspace.patched/kdm/config.def
+--- kdebase-workspace.orig/kdm/config.def	2007-09-15 13:31:20.000000000 +0200
++++ kdebase-workspace.patched/kdm/config.def	2007-09-16 15:16:15.000000000 +0200
+@@ -90,6 +90,12 @@
+ <kdmrc>
+  &kdm; master configuration file
+  _
++ Please note: Settings in this file are sometimes ignored (overridden).
++ The default KDM startup script /etc/init.d/kdm looks in /etc/default/kdm.d
++ for theme-related settings which, if found, take precedence. The possibly 
++ overridden settings are: UseBackground, BackgroundCfg, UseTheme, Theme.
++ See /usr/share/doc/kdm/README.Debian for details
++ _
+  Definition: the greeter is the login dialog, i.e., the part of &kdm;
+  which the user sees.
+  _

Modified: branches/kde4/packages/kdebase-workspace/debian/patches/series
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/series	2007-10-10 20:38:09 UTC (rev 7392)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/series	2007-10-10 21:25:18 UTC (rev 7393)
@@ -1,8 +1,8 @@
-01_kdehome_kde4.diff
-02_kdmrc_defaults.diff
-03_genkdmconf.diff
-04_genkdm_make.diff
-05_kdm_no_custom.diff
-06_kdm_X_path.diff
-07_be_better_at_honouring_user_kdm_theming.diff
-08_kdm_override_docs.diff
+06_kdehome_kde4.diff
+07_kdmrc_defaults.diff
+08_genkdmconf.diff
+09_genkdm_make.diff
+10_kdm_no_custom.diff
+11_kdm_X_path.diff
+12_be_better_at_honouring_user_kdm_theming.diff
+13_kdm_override_docs.diff




More information about the pkg-kde-commits mailing list