rev 5442 - in branches/etch/packages/kdebase/debian: . patches

[Sune Vuorela]

Author: pusling-guest
Date: 2007-01-27 19:49:05 +0100 (Sat, 27 Jan 2007)
New Revision: 5442

Added:
   branches/etch/packages/kdebase/debian/patches/40_kdm_override_docs.diff
Modified:
   branches/etch/packages/kdebase/debian/changelog
   branches/etch/packages/kdebase/debian/kdm.README.Debian
   branches/etch/packages/kdebase/debian/kdm.init
Log:
do some more documentations


Modified: branches/etch/packages/kdebase/debian/changelog
===================================================================
--- branches/etch/packages/kdebase/debian/changelog	2007-01-27 18:19:13 UTC (rev 5441)
+++ branches/etch/packages/kdebase/debian/changelog	2007-01-27 18:49:05 UTC (rev 5442)
@@ -1,10 +1,12 @@
 kdebase (4:3.5.5a.dfsg.1-6) unstable; urgency=low
 
   +++ Changes by Sune Vuorela
-  * Add norwegian (nb) translation of debconf questions. Thanks to 
+  * Add norwegian (nb) translation of debconf questions. Thanks to
     Bjorn Steensrud (Closes: #405417)
+  * Improve documentation about styling kdm (thanks to Jeremy Bygott) 
+    (Closes: #408418, #403776, #403797, #406438)
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed,  3 Jan 2007 14:11:34 +0100
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 27 Jan 2007 13:44:19 +0100
 
 kdebase (4:3.5.5a.dfsg.1-5) unstable; urgency=high
 

Modified: branches/etch/packages/kdebase/debian/kdm.README.Debian
===================================================================
--- branches/etch/packages/kdebase/debian/kdm.README.Debian	2007-01-27 18:19:13 UTC (rev 5441)
+++ branches/etch/packages/kdebase/debian/kdm.README.Debian	2007-01-27 18:49:05 UTC (rev 5442)
@@ -16,7 +16,7 @@
 KDM Customization
 =================
 
-We provide a way to customize KDM by overriding theme related values in
+We provide a way to override theme-related values normally set in the
 master configuration file (kdmrc):
  * USEBACKGROUND
  * BACKGROUNDCFG
@@ -26,7 +26,7 @@
 and background configuration file (backgroundrc):
  * WALLPAPER
 
-You just need to create a file with overrided value(s) and put it in
+You just need to create a file with overridden value(s) and put it in
 kdm override directory (default is /etc/default/kdm.d).
 
 ================================================

Modified: branches/etch/packages/kdebase/debian/kdm.init
===================================================================
--- branches/etch/packages/kdebase/debian/kdm.init	2007-01-27 18:19:13 UTC (rev 5441)
+++ branches/etch/packages/kdebase/debian/kdm.init	2007-01-27 18:49:05 UTC (rev 5442)
@@ -57,7 +57,7 @@
 # we generate kdm configuration files
 genkdmconf --in $KDMCFGDIR 1> /dev/null
 
-# we update kdm configuration files (only overrided values)
+# we update kdm configuration files (only overridden values)
 [ -n "$USEBACKGROUND" ] && sed -i "s|^#\?UseBackground=.*|UseBackground=$USEBACKGROUND|" $KDMCFG
 [ -n "$BACKGROUNDCFG" ] && sed -i "s|^#\?BackgroundCfg=.*|BackgroundCfg=$BACKGROUNDCFG|" $KDMCFG
 [ -n "$USETHEME" ] && sed -i "s|^#\?UseTheme=.*|UseTheme=$USETHEME|" $KDMCFG

Added: branches/etch/packages/kdebase/debian/patches/40_kdm_override_docs.diff
===================================================================
--- branches/etch/packages/kdebase/debian/patches/40_kdm_override_docs.diff	2007-01-27 18:19:13 UTC (rev 5441)
+++ branches/etch/packages/kdebase/debian/patches/40_kdm_override_docs.diff	2007-01-27 18:49:05 UTC (rev 5442)
@@ -0,0 +1,15 @@
+--- kdm/config.def.orig	2007-01-27 13:37:13.000000000 +0100
++++ kdm/config.def	2007-01-27 13:39:53.000000000 +0100
+@@ -91,6 +91,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/defaults/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.
+  _