rev 5870 - in trunk/packages/kdebase/debian: . patches

[Sune Vuorela]

Author: pusling-guest
Date: 2007-04-09 16:24:27 +0000 (Mon, 09 Apr 2007)
New Revision: 5870

Added:
   trunk/packages/kdebase/debian/patches/38_furry_frosted_animals_support.diff
   trunk/packages/kdebase/debian/patches/39_be_better_at_honouring_user_kdm_theming.diff
Modified:
   trunk/packages/kdebase/debian/changelog
   trunk/packages/kdebase/debian/kdm.init
Log:
merge from branches/etch


Modified: trunk/packages/kdebase/debian/changelog
===================================================================
--- trunk/packages/kdebase/debian/changelog	2007-04-09 11:29:52 UTC (rev 5869)
+++ trunk/packages/kdebase/debian/changelog	2007-04-09 16:24:27 UTC (rev 5870)
@@ -1,4 +1,4 @@
-kdebase (4:3.5.6.dfsg.1-3) experimental; urgency=low
+kdebase (4:3.5.6.dfsg.1-3) unstable; urgency=low
 
   +++ Changes by Modestas Vainius:
 
@@ -15,6 +15,12 @@
   * add autologin overrides, useful for live debian environment. It introduces
     AUTOLOGINAGAIN, AUTOLOGINDELAY, AUTOLOGINLOCKED and AUTOLOGINUSER.
 
+  +++ Changes by Sune Vuorela
+
+  * Let us go unstable. Etch is released
+  * Support where the frosty furry animals wants their plugins (patch 38) 
+  * Better distinguish wether users has modified their kdm theme. (Patch 39)
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 31 Mar 2007 19:13:22 +0300
 
 kdebase (4:3.5.6.dfsg.1-2) experimental; urgency=low

Modified: trunk/packages/kdebase/debian/kdm.init
===================================================================
--- trunk/packages/kdebase/debian/kdm.init	2007-04-09 11:29:52 UTC (rev 5869)
+++ trunk/packages/kdebase/debian/kdm.init	2007-04-09 16:24:27 UTC (rev 5870)
@@ -30,6 +30,13 @@
 # parameters to support kdm customization
 KDMRC=/etc/kde3/kdm/kdmrc
 BACKGROUNDRC=/etc/kde3/kdm/backgroundrc
+
+#if configuration is changed by kdmtheme or other tools, don't do magick
+if grep -q "Theme=@@@ToBeReplacedByDesktopBase@@@" ${KDMRC} && grep -q "Wallpaper=default_blue.jpg" ${BACKGROUNDRC}
+then
+
+
+
 KDMOVERRIDEDIR=/etc/default/kdm.d
 KDMCFGDIR=/var/run/kdm
 KDMCFG=$KDMCFGDIR/kdmrc
@@ -64,6 +71,8 @@
 [ -n "$THEME" ] && sed -i "s|^#\?Theme=.*|Theme=$THEME|" $KDMCFG
 [ -n "$WALLPAPER" ] && sed -i "s|^#\?Wallpaper=.*|Wallpaper=`readlink -f $WALLPAPER`|" $BACKGROUNDCFG
 
+
+fi
 # autologin overrides are useful for live debian environment
 if [ -n "$AUTOLOGINUSER" ]; then
 	sed -i "s|^#\?AutoLoginEnable=.*|AutoLoginEnable=true|" $KDMCFG

Copied: trunk/packages/kdebase/debian/patches/38_furry_frosted_animals_support.diff (from rev 5869, branches/etch/packages/kdebase/debian/patches/37_furry_frosted_animals_support.diff)

Copied: trunk/packages/kdebase/debian/patches/39_be_better_at_honouring_user_kdm_theming.diff (from rev 5869, branches/etch/packages/kdebase/debian/patches/41_be_better_at_honouring_user_kdm_theming.diff)