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

[Modestas Vainius]

Author: modax-guest
Date: 2007-02-08 10:26:48 +0100 (Thu, 08 Feb 2007)
New Revision: 5572

Modified:
   trunk/packages/kdebase/debian/changelog
   trunk/packages/kdebase/debian/control
   trunk/packages/kdebase/debian/patches/25_khelp_htdig.diff
Log:
Hopefully fixes khelpcenter indexing and searching -> enhance patch 25. 
Patch based on Vedran Fura?\196?\141 input. UNTESTED. Please test if it works before uploading.
Promote htdig from Suggests to Recommends. Imo, Depends is too strict.


Modified: trunk/packages/kdebase/debian/changelog
===================================================================
--- trunk/packages/kdebase/debian/changelog	2007-02-07 21:08:29 UTC (rev 5571)
+++ trunk/packages/kdebase/debian/changelog	2007-02-08 09:26:48 UTC (rev 5572)
@@ -15,8 +15,12 @@
 
   * Add patch from upstream svn to fix "switching desktops with win+tab
     key broken" bug (patch no. 21) (Closes: #406549)
+  * Fix khelpcenter documentation indexing/searching. Thanks to Vedran Furač
+    for the solution (patch 25) (Closes: #386283).
+  * Promote htdig from Suggests to Recommends. Indexing and searching are
+    important for most people.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 30 Jan 2007 20:25:48 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu,  8 Feb 2007 11:09:23 +0200
 
 kdebase (4:3.5.6.dfsg.1-1) experimental; urgency=low
 

Modified: trunk/packages/kdebase/debian/control
===================================================================
--- trunk/packages/kdebase/debian/control	2007-02-07 21:08:29 UTC (rev 5571)
+++ trunk/packages/kdebase/debian/control	2007-02-08 09:26:48 UTC (rev 5572)
@@ -264,7 +264,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}
 Replaces: kdebase-doc (<< 4:3.0.0), konqueror (<< 4:3.0.0)
-Suggests: htdig
+Recommends: htdig
 Description: help center for KDE
  The KDE Help Center provides documentation on how to use the KDE desktop.
  .

Modified: trunk/packages/kdebase/debian/patches/25_khelp_htdig.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/25_khelp_htdig.diff	2007-02-07 21:08:29 UTC (rev 5571)
+++ trunk/packages/kdebase/debian/patches/25_khelp_htdig.diff	2007-02-08 09:26:48 UTC (rev 5572)
@@ -1,7 +1,12 @@
---- kde.orig/khelpcenter/searchhandlers/khc_docbookdig.pl.in
-+++ kde.patched/khelpcenter/searchhandlers/khc_docbookdig.pl.in
-@@ -29,7 +29,9 @@
- my $htdigdata = "/srv/www/htdig/common/";
+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 @@
+ 
+ use Getopt::Long;
+ 
+-my $htdigdata = "/srv/www/htdig/common/";
++my $htdigdata = "/var/www/htdig/";
  my $htdigbin = "/usr/bin";
  my $kdeprefix = "@prefix@";
 +my $kdehtmldir = `kde-config --expandvars --install html`;
@@ -37,3 +42,27 @@
  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 @@
+ 
+ use Getopt::Long;
+ 
+-my $htdigdata = "/srv/www/htdig/common/";
++my $htdigdata = "/var/www/htdig/";
+ 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 @@
+ 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;