[SCM] KDE Base Runtime module packaging branch, master, updated. debian/16.04.0-1-10-g87f7369

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kde-runtime.git;a=commitdiff;h=8daa866

The following commit has been merged in the master branch:
commit 8daa8663fbd7db9078469e6034683f237bb3062c
Author: Pino Toscano <pino at debian.org>
Date:   Sat Jun 18 11:26:22 2016 +0200

    drop patch khelp_htdig.diff
    
    no more needed now that khelpcenter is not built
---
 debian/changelog                |  2 ++
 debian/patches/khelp_htdig.diff | 33 ---------------------------------
 debian/patches/series           |  1 -
 3 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bb99d56..97f96b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ kde-runtime (4:16.04.2-0r1) UNRELEASED; urgency=medium
   * Wrap too long changelog lines in older entries.
   * Remove unused and outdated installgen file.
   * Restore headers for patches.
+  * Drop patch khelp_htdig.diff, no more needed now that khelpcenter is not
+    built.
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 18 Jun 2016 09:39:41 +0200
 
diff --git a/debian/patches/khelp_htdig.diff b/debian/patches/khelp_htdig.diff
deleted file mode 100644
index 92a24aa..0000000
--- a/debian/patches/khelp_htdig.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/khelpcenter/searchhandlers/khc_docbookdig.pl.cmake
-+++ b/khelpcenter/searchhandlers/khc_docbookdig.pl.cmake
-@@ -26,7 +26,7 @@ use strict;
- 
- use Getopt::Long;
- 
--my $htdigdata = "/srv/www/htdig/common/";
-+my $htdigdata = "/etc/htdig";
- my $htdigbin = "/usr/bin";
- my $kdeprefix = "@CMAKE_INSTALL_PREFIX@";
- chomp $kdeprefix;
---- a/khelpcenter/searchhandlers/khc_htdig.pl.cmake
-+++ b/khelpcenter/searchhandlers/khc_htdig.pl.cmake
-@@ -26,7 +26,7 @@ use strict;
- 
- use Getopt::Long;
- 
--my $htdigdata = "/srv/www/htdig/common/";
-+my $htdigdata = "/etc/htdig";
- my $htdigbin = "/usr/bin";
- my $kdeprefix = "@CMAKE_INSTALL_PREFIX@";
- chomp $kdeprefix;
---- a/khelpcenter/searchhandlers/khc_htsearch.pl
-+++ b/khelpcenter/searchhandlers/khc_htsearch.pl
-@@ -8,7 +8,7 @@ use Getopt::Long;
- 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;
- my $method;
diff --git a/debian/patches/series b/debian/patches/series
index aa8a553..a11dc06 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 disable_usr_lib_install_rpath.diff
-khelp_htdig.diff
 use_the_correct_locale.patch
 use_always_present_path_to_test.patch
 disable_flacky_tests

-- 
KDE Base Runtime module packaging