rev 13722 - in branches/kde4.2/packages/kdebase-runtime/debian: . patches

Pino Toscano pino-guest at alioth.debian.org
Tue Feb 3 12:35:51 UTC 2009


Author: pino-guest
Date: 2009-02-03 12:35:51 +0000 (Tue, 03 Feb 2009)
New Revision: 13722

Modified:
   branches/kde4.2/packages/kdebase-runtime/debian/changelog
   branches/kde4.2/packages/kdebase-runtime/debian/patches/25_khelp_htdig.diff
Log:
make patch 25_khelp_htdig.diff simplier and actually working


Modified: branches/kde4.2/packages/kdebase-runtime/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdebase-runtime/debian/changelog	2009-02-02 23:27:21 UTC (rev 13721)
+++ branches/kde4.2/packages/kdebase-runtime/debian/changelog	2009-02-03 12:35:51 UTC (rev 13722)
@@ -1,3 +1,11 @@
+kdebase-runtime (4:4.2.0-2) UNRELEASED; urgency=low
+
+  +++ Changes by Pino Toscano:
+
+  * Simplify 25_khelp_htdig.diff and make it work again.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 03 Feb 2009 13:31:42 +0100
+
 kdebase-runtime (4:4.2.0-1) experimental; urgency=low
 
   * New upstream release.

Modified: branches/kde4.2/packages/kdebase-runtime/debian/patches/25_khelp_htdig.diff
===================================================================
--- branches/kde4.2/packages/kdebase-runtime/debian/patches/25_khelp_htdig.diff	2009-02-02 23:27:21 UTC (rev 13721)
+++ branches/kde4.2/packages/kdebase-runtime/debian/patches/25_khelp_htdig.diff	2009-02-03 12:35:51 UTC (rev 13722)
@@ -1,41 +1,25 @@
---- 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 @@
+--- a/khelpcenter/searchhandlers/khc_docbookdig.pl.cmake
++++ b/khelpcenter/searchhandlers/khc_docbookdig.pl.cmake
+@@ -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@";
-+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
+@@ -175,7 +175,7 @@
+ max_hop_count:          4
+ robotstxt_name:         kdedig
+ compression_level:      6
+-template_map:           Long long $kdeprefix/share/apps/khelpcenter/searchhandlers/htdig/htdig_long.html
++template_map:           Long long @DATA_INSTALL_DIR@/khelpcenter/searchhandlers/htdig/htdig_long.html
+ search_algorithm:       exact:1 prefix:0.8
+ maximum_pages:          1
+ matches_per_page:       10
+--- a/khelpcenter/searchhandlers/khc_htdig.pl.cmake
++++ b/khelpcenter/searchhandlers/khc_htdig.pl.cmake
 @@ -26,7 +26,7 @@
  
  use Getopt::Long;
@@ -45,8 +29,8 @@
  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
+--- a/khelpcenter/searchhandlers/khc_htsearch.pl
++++ b/khelpcenter/searchhandlers/khc_htsearch.pl
 @@ -8,7 +8,7 @@
  use open IO => ':utf8';
  use open ':std';




More information about the pkg-kde-commits mailing list