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

[Sune Vuorela]

Author: pusling-guest
Date: 2007-10-10 10:07:43 +0000 (Wed, 10 Oct 2007)
New Revision: 7377

Modified:
   trunk/packages/kdebase/debian/changelog
   trunk/packages/kdebase/debian/patches/38_furry_frosted_animals_support.diff
Log:
redo patch for 3.5.8


Modified: trunk/packages/kdebase/debian/changelog
===================================================================
--- trunk/packages/kdebase/debian/changelog	2007-10-09 21:45:59 UTC (rev 7376)
+++ trunk/packages/kdebase/debian/changelog	2007-10-10 10:07:43 UTC (rev 7377)
@@ -1,3 +1,13 @@
+kdebase (4:3.5.8.dfsg1-1) unstable; urgency=low
+
+  * New upstream version.
+
+  +++ Changes by Sune Vuorela:
+
+  * Adapt patch 38_furry_frosted_animals - stuff have been changed a bit.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 09 Oct 2007 22:12:27 +0200
+
 kdebase (4:3.5.7.dfsg.1-1) unstable; urgency=low
 
   +++ Changes by Ana Beatriz Guerrero Lopez:

Modified: trunk/packages/kdebase/debian/patches/38_furry_frosted_animals_support.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/38_furry_frosted_animals_support.diff	2007-10-09 21:45:59 UTC (rev 7376)
+++ trunk/packages/kdebase/debian/patches/38_furry_frosted_animals_support.diff	2007-10-10 10:07:43 UTC (rev 7377)
@@ -1,12 +1,23 @@
-Index: kdebase/nsplugins/pluginscan.cpp
-===================================================================
---- kdebase/nsplugins/pluginscan.cpp	(revision 629110)
-+++ kdebase/nsplugins/pluginscan.cpp	(working copy)
-@@ -456,6 +456,8 @@
-         QStringList paths;
+diff -Nur kdebase-3.5.8/kcontrol/konqhtml/pluginopts.cpp kdebase-3.5.8.new/kcontrol/konqhtml/pluginopts.cpp
+--- kdebase-3.5.8/kcontrol/konqhtml/pluginopts.cpp	2007-10-08 11:51:16.000000000 +0200
++++ kdebase-3.5.8.new/kcontrol/konqhtml/pluginopts.cpp	2007-10-09 22:40:59.000000000 +0200
+@@ -376,6 +376,8 @@
+     else {//keep sync with kdebase/nsplugins
          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");
+diff -Nur kdebase-3.5.8/nsplugins/plugin_paths.cpp kdebase-3.5.8.new/nsplugins/plugin_paths.cpp
+--- kdebase-3.5.8/nsplugins/plugin_paths.cpp	2007-10-08 11:51:24.000000000 +0200
++++ kdebase-3.5.8.new/nsplugins/plugin_paths.cpp	2007-10-09 22:39:57.000000000 +0200
+@@ -41,6 +41,8 @@
+         // keep sync with kdebase/kcontrol/konqhtml
+         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");