rev 12094 - in branches/kde4/packages/kdebase-runtime/debian: . patches
Ana Beatriz Guerrero López
ana at alioth.debian.org
Fri Sep 5 11:30:39 UTC 2008
Author: ana
Date: 2008-09-05 11:30:39 +0000 (Fri, 05 Sep 2008)
New Revision: 12094
Added:
branches/kde4/packages/kdebase-runtime/debian/patches/25_khelp_htdig.diff
Removed:
branches/kde4/packages/kdebase-runtime/debian/patches/05_r839927_qreal.diff
Modified:
branches/kde4/packages/kdebase-runtime/debian/changelog
branches/kde4/packages/kdebase-runtime/debian/patches/series
Log:
* Fix htdig paths, so Build Search Index should work now. (Closes: #497518).
Patch 25_khelp_htdig.diff.
(untested)
Modified: branches/kde4/packages/kdebase-runtime/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/changelog 2008-09-05 11:10:31 UTC (rev 12093)
+++ branches/kde4/packages/kdebase-runtime/debian/changelog 2008-09-05 11:30:39 UTC (rev 12094)
@@ -1,3 +1,10 @@
+kdebase-runtime (4:4.1.1-2) UNRELEASED; urgency=low
+
+ * Fix htdig paths, so Build Search Index should work now. (Closes: #497518).
+ Patch 25_khelp_htdig.diff.
+
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org> Fri, 05 Sep 2008 13:25:05 +0200
+
kdebase-runtime (4:4.1.1-1) experimental; urgency=low
* New upstream release.
Deleted: branches/kde4/packages/kdebase-runtime/debian/patches/05_r839927_qreal.diff
Added: branches/kde4/packages/kdebase-runtime/debian/patches/25_khelp_htdig.diff
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/patches/25_khelp_htdig.diff (rev 0)
+++ branches/kde4/packages/kdebase-runtime/debian/patches/25_khelp_htdig.diff 2008-09-05 11:30:39 UTC (rev 12094)
@@ -0,0 +1,58 @@
+--- kdebase-runtime-4.1.1.orig/khelpcenter/searchhandlers/khc_docbookdig.pl.cmake 2008-09-05 13:12:37.000000000 +0200
++++ kdebase-runtime-4.1.1/khelpcenter/searchhandlers/khc_docbookdig.pl.cmake 2008-09-05 13:14:35.000000000 +0200
+@@ -26,10 +26,14 @@
+
+ use Getopt::Long;
+
+-my $htdigdata = "/srv/www/htdig/common/";
++my $htdigdata = "/etc/htdig";
++
+ my $htdigbin = "/usr/bin";
+ my $kdeprefix = "@CMAKE_INSTALL_PREFIX@";
++my $kdehtmldir = `kde-config --expandvars --install html`;
+ chomp $kdeprefix;
++chomp $kdehtmldir;
++
+
+ my $dbg = 1;
+
+@@ -89,7 +93,7 @@
+ $ENV{ CDPATH } = '';
+ $ENV{ ENV } = '';
+
+-my $findpath = "@HTML_INSTALL_DIR@/$lang/";
++my $findpath = "$kdehtmldir/$lang/";
+ my $findcmd = "find $findpath -name index.docbook";
+
+ print STDERR "FINDCMD: $findcmd\n";
+@@ -168,7 +172,7 @@
+ locale: $locale
+ database_dir: $htdigdb
+ database_base: \${database_dir}/$identifier
+-local_urls: help://=@HTML_INSTALL_DIR@/en/ file://=/
++local_urls: help://=$kdehtmldir/en/ file://=/
+ local_urls_only: true
+ limit_urls_to: file:// help:/
+ ignore_noindex: true
+--- kdebase-runtime-4.1.1.orig/khelpcenter/searchhandlers/khc_htdig.pl.cmake 2008-09-05 13:14:41.000000000 +0200
++++ kdebase-runtime-4.1.1/khelpcenter/searchhandlers/khc_htdig.pl.cmake 2008-09-05 13:22:49.000000000 +0200
+@@ -26,7 +26,7 @@
+
+ use Getopt::Long;
+
+-my $htdigdata = "/srv/www/htdig/common/";
++my $htdigdata = "/etc/htdig";
+ my $htdigbin = "/usr/bin";
+ my $kdeprefix = "@CMAKE_INSTALL_PREFIX@";
+ chomp $kdeprefix;
+--- kdebase-runtime-4.1.1.orig/khelpcenter/searchhandlers/khc_htsearch.pl 2008-09-05 13:23:02.000000000 +0200
++++ kdebase-runtime-4.1.1/khelpcenter/searchhandlers/khc_htsearch.pl 2008-09-05 13:23:17.000000000 +0200
+@@ -8,7 +8,7 @@
+ use open IO => ':utf8';
+ use open ':std';
+
+-my $htsearchpath="/srv/www/cgi-bin/htsearch";
++my $htsearchpath="/usr/lib/cgi-bin/htsearch";
+
+ my $config;
+ my $format;
Modified: branches/kde4/packages/kdebase-runtime/debian/patches/series
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/patches/series 2008-09-05 11:10:31 UTC (rev 12093)
+++ branches/kde4/packages/kdebase-runtime/debian/patches/series 2008-09-05 11:30:39 UTC (rev 12094)
@@ -2,3 +2,4 @@
02_ksvgtopng4.diff
03_ktrash4.diff
04_disable_debug_by_default.diff
+25_khelp_htdig.diff
More information about the pkg-kde-commits
mailing list