[Pkg-kde-commits] rev 1224 - branches/kde-3.4.0/packages/kdebase/debian/patches
Christopher Martin
chrsmrtn-guest@costa.debian.org
Tue, 14 Jun 2005 17:39:10 +0000
Author: chrsmrtn-guest
Date: 2005-06-14 17:39:09 +0000 (Tue, 14 Jun 2005)
New Revision: 1224
Added:
branches/kde-3.4.0/packages/kdebase/debian/patches/25_khelp_htdig.diff
Log:
Make khelpcenter look in the right place for out handbooks. This has been
passed upstream as bug #107415. Of course, indexing still doesn't work, but
at least one obstacle is out of the way.
Added: branches/kde-3.4.0/packages/kdebase/debian/patches/25_khelp_htdig.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/patches/25_khelp_htdig.diff 2005-06-13 20:45:04 UTC (rev 1223)
+++ branches/kde-3.4.0/packages/kdebase/debian/patches/25_khelp_htdig.diff 2005-06-14 17:39:09 UTC (rev 1224)
@@ -0,0 +1,39 @@
+--- kde.orig/khelpcenter/searchhandlers/khc_docbookdig.pl
++++ kde.patched/khelpcenter/searchhandlers/khc_docbookdig.pl
+@@ -29,7 +29,9 @@
+ my $htdigdata = "/srv/www/htdig/common/";
+ my $htdigbin = "/usr/bin";
+ my $kdeprefix = `kde-config --prefix`;
++my $kdehtmldir = `kde-config --expandvars --install html`;
+ chomp $kdeprefix;
++chomp $kdehtmldir;
+
+ my $dbg = 1;
+
+@@ -85,7 +87,7 @@
+ exit 1;
+ }
+
+-my $findcmd = "find $kdeprefix/share/doc/HTML/$lang/ -name index.docbook";
++my $findcmd = "find $kdehtmldir/$lang/ -name index.docbook";
+
+ print STDERR "FINDCMD: $findcmd\n";
+
+@@ -135,7 +137,7 @@
+ help:/*)
+ orig=\${orig/help:\//}
+ orig=\${orig/\/index.docbook//}
+- cd $kdeprefix/share/doc/HTML/en/\$orig
++ cd $kdehtmldir/en/\$orig
+ file=index.docbook
+ ;;
+ *)
+@@ -162,7 +164,7 @@
+ locale: $locale
+ database_dir: $htdigdb
+ database_base: \${database_dir}/$identifier
+-local_urls: help://=$kdeprefix/share/doc/HTML/en/ file://=/
++local_urls: help://=$kdehtmldir/en/ file://=/
+ local_urls_only: true
+ limit_urls_to: file:// help:/
+ ignore_noindex: true