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

[Sune Vuorela]

Author: pusling-guest
Date: 2007-02-04 23:36:18 +0100 (Sun, 04 Feb 2007)
New Revision: 5544

Added:
   branches/etch/packages/kdebase/debian/patches/37_furry_frosted_animals_support.diff
   branches/etch/packages/kdebase/debian/patches/41_be_better_at_honouring_user_kdm_theming.diff
Modified:
   branches/etch/packages/kdebase/debian/changelog
   branches/etch/packages/kdebase/debian/kdm.init
Log:
better fix regarding the kdm theming. please please please test test test.
Also add iceape and iceweasel plugin paths to default plugin path



Modified: branches/etch/packages/kdebase/debian/changelog
===================================================================
--- branches/etch/packages/kdebase/debian/changelog	2007-02-04 22:18:11 UTC (rev 5543)
+++ branches/etch/packages/kdebase/debian/changelog	2007-02-04 22:36:18 UTC (rev 5544)
@@ -4,11 +4,15 @@
   * Add norwegian (nb) translation of debconf questions. Thanks to
     Bjorn Steensrud. (Closes: #405417)
   * Improve documentation about styling kdm (thanks to Jeremy Bygott).
-    (this is a note in kdm.init, in kdm.README.Debian and in the
-    generated kdmrc)
+    (this is a note in kdm.init, in kdm.README.Debian and in the 
+     generated kdmrc (patch 40))
     (Closes: #408418, #403776, #403797, #406438)
+  * Better distinguish wether users has modified their kdm theme. Also Closes
+    the above bugs (patch 41).
   * Add portuguese debconf translation. Thanks to Carlos Lisboa.
     (Closes: #408021)
+  * Also support where the frosty animals wants their plugins:
+    /usr/lib/ice{ape,weasel}/plugins (patch 37)
 
   +++ Changes by Modestas Vainius:
 

Modified: branches/etch/packages/kdebase/debian/kdm.init
===================================================================
--- branches/etch/packages/kdebase/debian/kdm.init	2007-02-04 22:18:11 UTC (rev 5543)
+++ branches/etch/packages/kdebase/debian/kdm.init	2007-02-04 22:36:18 UTC (rev 5544)
@@ -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,9 @@
 [ -n "$THEME" ] && sed -i "s|^#\?Theme=.*|Theme=$THEME|" $KDMCFG
 [ -n "$WALLPAPER" ] && sed -i "s|^#\?Wallpaper=.*|Wallpaper=`readlink -f $WALLPAPER`|" $BACKGROUNDCFG
 
+
+fi
+
 # If we upgraded the daemon, we can't use the --exec argument to
 # start-stop-daemon since the inode will have changed.  The risk here is that
 # in a situation where the daemon died, its pidfile was not cleaned up, and

Added: branches/etch/packages/kdebase/debian/patches/37_furry_frosted_animals_support.diff
===================================================================
--- branches/etch/packages/kdebase/debian/patches/37_furry_frosted_animals_support.diff	2007-02-04 22:18:11 UTC (rev 5543)
+++ branches/etch/packages/kdebase/debian/patches/37_furry_frosted_animals_support.diff	2007-02-04 22:36:18 UTC (rev 5544)
@@ -0,0 +1,13 @@
+Index: kdebase/nsplugins/pluginscan.cpp
+===================================================================
+--- kdebase/nsplugins/pluginscan.cpp	(revision 629110)
++++ kdebase/nsplugins/pluginscan.cpp	(working copy)
+@@ -456,6 +456,8 @@
+         QStringList paths;
+         paths.append("$HOME/.mozilla/plugins");
+         paths.append("$HOME/.netscape/plugins");
++	paths.append("/usr/lib/iceweasel/plugins");
++	paths.append("/usr/lib/iceape/plugins");
+         paths.append("/usr/lib/firefox/plugins");
+         paths.append("/usr/lib64/browser-plugins");
+         paths.append("/usr/lib/browser-plugins");

Added: branches/etch/packages/kdebase/debian/patches/41_be_better_at_honouring_user_kdm_theming.diff
===================================================================
--- branches/etch/packages/kdebase/debian/patches/41_be_better_at_honouring_user_kdm_theming.diff	2007-02-04 22:18:11 UTC (rev 5543)
+++ branches/etch/packages/kdebase/debian/patches/41_be_better_at_honouring_user_kdm_theming.diff	2007-02-04 22:36:18 UTC (rev 5544)
@@ -0,0 +1,13 @@
+Index: kdebase/kdm/config.def
+===================================================================
+--- kdebase/kdm/config.def	(revision 629110)
++++ kdebase/kdm/config.def	(working copy)
+@@ -2608,7 +2608,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