diff -u kdebase-3.5.9/debian/patches/25_khelp_htdig.diff kdebase-3.5.9/debian/patches/25_khelp_htdig.diff --- kdebase-3.5.9/debian/patches/25_khelp_htdig.diff +++ kdebase-3.5.9/debian/patches/25_khelp_htdig.diff @@ -1,7 +1,7 @@ -diff -uNr kdebase.unpatched/khelpcenter/searchhandlers/khc_docbookdig.pl.in kdebase/khelpcenter/searchhandlers/khc_docbookdig.pl.in ---- kdebase.unpatched/khelpcenter/searchhandlers/khc_docbookdig.pl.in 2007-02-08 10:58:26.000000000 +0200 -+++ kdebase/khelpcenter/searchhandlers/khc_docbookdig.pl.in 2007-02-08 11:02:29.000000000 +0200 -@@ -26,10 +26,12 @@ +diff -Nurp kdebase.unpatched/khelpcenter/searchhandlers/khc_docbookdig.pl.in kdebase/khelpcenter/searchhandlers/khc_docbookdig.pl.in +--- kdebase.unpatched/khelpcenter/searchhandlers/khc_docbookdig.pl.in 2007-01-15 22:31:51.000000000 +1100 ++++ kdebase/khelpcenter/searchhandlers/khc_docbookdig.pl.in 2008-07-13 01:50:01.000000000 +1000 +@@ -26,10 +26,12 @@ use strict; use Getopt::Long; @@ -15,25 +15,36 @@ my $dbg = 1; -@@ -89,7 +91,7 @@ +@@ -89,7 +91,7 @@ $ENV{ PATH } = '/bin:/usr/bin'; $ENV{ CDPATH } = ''; $ENV{ ENV } = ''; -my $findpath = "$kdeprefix/share/doc/HTML/$lang/"; -+my $findpath = "$kdekdehtmldir/$lang/"; ++my $findpath = "$kdehtmldir/$lang/"; my $findcmd = "find $findpath -name index.docbook"; print STDERR "FINDCMD: $findcmd\n"; -@@ -140,7 +142,7 @@ +@@ -132,15 +134,15 @@ mime=\$1 + shift + + if test "\$#" -gt 0; then +- orig=\${1/file:\\//} ++ orig=\${1#file:/} + shift + fi + + case "\$orig" in help:/*) - orig=\${orig/help:\\//} - orig=\${orig/\/index.docbook/} +- orig=\${orig/help:\\//} +- orig=\${orig/\/index.docbook/} - cd $kdeprefix/share/doc/HTML/en/\$orig ++ orig=\${orig#help:/} ++ orig=\${orig%\/index.docbook} + cd $kdehtmldir/en/\$orig file=index.docbook ;; *) -@@ -167,7 +169,7 @@ +@@ -167,7 +169,7 @@ common_dir: $commondir locale: $locale database_dir: $htdigdb database_base: \${database_dir}/$identifier @@ -42,10 +53,10 @@ local_urls_only: true limit_urls_to: file:// help:/ ignore_noindex: true -diff -uNr kdebase.unpatched/khelpcenter/searchhandlers/khc_htdig.pl.in kdebase/khelpcenter/searchhandlers/khc_htdig.pl.in ---- kdebase.unpatched/khelpcenter/searchhandlers/khc_htdig.pl.in 2007-02-08 10:58:26.000000000 +0200 -+++ kdebase/khelpcenter/searchhandlers/khc_htdig.pl.in 2007-02-08 11:02:51.000000000 +0200 -@@ -26,7 +26,7 @@ +diff -Nurp kdebase.unpatched/khelpcenter/searchhandlers/khc_htdig.pl.in kdebase/khelpcenter/searchhandlers/khc_htdig.pl.in +--- kdebase.unpatched/khelpcenter/searchhandlers/khc_htdig.pl.in 2007-01-15 22:31:51.000000000 +1100 ++++ kdebase/khelpcenter/searchhandlers/khc_htdig.pl.in 2008-07-13 00:23:31.000000000 +1000 +@@ -26,7 +26,7 @@ use strict; use Getopt::Long; @@ -54,10 +65,10 @@ my $htdigbin = "/usr/bin"; my $kdeprefix = "@prefix@"; chomp $kdeprefix; -diff -uNr kdebase.unpatched/khelpcenter/searchhandlers/khc_htsearch.pl kdebase/khelpcenter/searchhandlers/khc_htsearch.pl ---- kdebase.unpatched/khelpcenter/searchhandlers/khc_htsearch.pl 2007-02-08 10:58:26.000000000 +0200 -+++ kdebase/khelpcenter/searchhandlers/khc_htsearch.pl 2007-02-08 11:00:47.000000000 +0200 -@@ -8,7 +8,7 @@ +diff -Nurp kdebase.unpatched/khelpcenter/searchhandlers/khc_htsearch.pl kdebase/khelpcenter/searchhandlers/khc_htsearch.pl +--- kdebase.unpatched/khelpcenter/searchhandlers/khc_htsearch.pl 2007-01-15 22:31:51.000000000 +1100 ++++ kdebase/khelpcenter/searchhandlers/khc_htsearch.pl 2008-07-13 00:23:31.000000000 +1000 +@@ -8,7 +8,7 @@ use Getopt::Long; use open IO => ':utf8'; use open ':std'; diff -u kdebase-3.5.9/debian/changelog kdebase-3.5.9/debian/changelog --- kdebase-3.5.9/debian/changelog +++ kdebase-3.5.9/debian/changelog @@ -1,3 +1,11 @@ +kdebase (4:3.5.9-0ubuntu7.3) hardy; urgency=low + + * Update 25_khelp_htdig.diff, fixes LP: #241916 + Fixes khelpcenters' indexer to work with dash. + Fixes incorrect definition '$kdekdehtmldir' which stopped indexer. + + -- Greg Newsome Sun, 13 Jul 2008 02:42:38 +1000 + kdebase (4:3.5.9-0ubuntu7.2) hardy-proposed; urgency=low * Add kubuntu_9924_remove_eject_error.diff, closes LP: #222041