rev 11485 - in branches/kde4/packages/kdebase-workspace/debian: . patches

[Sune Vuorela]

Author: pusling-guest
Date: 2008-07-13 21:48:02 +0000 (Sun, 13 Jul 2008)
New Revision: 11485

Modified:
   branches/kde4/packages/kdebase-workspace/debian/changelog
   branches/kde4/packages/kdebase-workspace/debian/kdm.init
   branches/kde4/packages/kdebase-workspace/debian/patches/series
Log:
mmm.. cleaning up. Fixing theming stuff. Tested "on paper" and is about to test in real world

Modified: branches/kde4/packages/kdebase-workspace/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/changelog	2008-07-13 21:48:00 UTC (rev 11484)
+++ branches/kde4/packages/kdebase-workspace/debian/changelog	2008-07-13 21:48:02 UTC (rev 11485)
@@ -8,6 +8,7 @@
   * Patch 17 to fix ksysguard build on all archs removed, committed upstream
   * Enabled consolekit patch. Thanks to Daniel Nicoletti for noticing and
     testing the patch.
+  * Fix up theming stuff.
 
   +++ Changes by Xavier Vello:
 

Modified: branches/kde4/packages/kdebase-workspace/debian/kdm.init
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/kdm.init	2008-07-13 21:48:00 UTC (rev 11484)
+++ branches/kde4/packages/kdebase-workspace/debian/kdm.init	2008-07-13 21:48:02 UTC (rev 11485)
@@ -73,6 +73,11 @@
 
 
 fi
+#usetheme is now on "by default" so we need to be sure that there is something ...
+if grep -q "Theme=@@@ToBeReplacedByDesktopBase@@@" ${KDMRC}
+then
+	sed -i 's|@@@ToBeReplacedByDesktopBase@@@|/usr/share/kde4/apps/kdm/themes/oxygen|' ${KDMCFG}
+fi
 # autologin overrides are useful for live debian environment
 if [ -n "$AUTOLOGINUSER" ]; then
 	sed -i "s|^#\?AutoLoginEnable=.*|AutoLoginEnable=true|" $KDMCFG

Modified: branches/kde4/packages/kdebase-workspace/debian/patches/series
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/series	2008-07-13 21:48:00 UTC (rev 11484)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/series	2008-07-13 21:48:02 UTC (rev 11485)
@@ -3,7 +3,7 @@
 09_genkdm_make.diff
 10_kdm_no_custom.diff
 11_kdm_X_path.diff
-#12_be_better_at_honouring_user_kdm_theming.diff
+12_be_better_at_honouring_user_kdm_theming.diff
 13_kdm_override_docs.diff
 16_kdm_consolekit.diff
 20_use_dejavu_as_default_font.diff