[SCM] khtml packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-4-ge1bef6c

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/khtml.git;a=commitdiff;h=4dea6f8

The following commit has been merged in the kubuntu_wily_archive branch:
commit 4dea6f8028302770985ca0e395777f249c257d27
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Feb 5 10:12:22 2015 +0100

    Update install files.
---
 debian/changelog                |  1 +
 debian/libkf5khtml-data.install | 15 +++------------
 debian/libkf5khtml-dev.install  |  5 +++--
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 974579f..4beab20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ khtml (5.6.0-1~) UNRELEASED; urgency=medium
     follow cmake.
   * Bump Standards-Version to 3.9.6, no changes needed.
   * Update copyright information.
+  * Update install files.
 
  -- Maximiliano Curia <maxy at debian.org>  Thu, 05 Feb 2015 09:19:16 +0100
 
diff --git a/debian/libkf5khtml-data.install b/debian/libkf5khtml-data.install
index d79c20b..d623c9f 100644
--- a/debian/libkf5khtml-data.install
+++ b/debian/libkf5khtml-data.install
@@ -1,19 +1,10 @@
 etc/xdg/khtmlrc
-usr/share/kf5/khtml/css/html4.css
-usr/share/kf5/khtml/css/presentational.css
-usr/share/kf5/khtml/css/quirks.css
-usr/share/kf5/khtml/error.html
+usr/share/kf5/khtml/
 usr/share/kf5/kjava/
 usr/share/kservices5/khtml.desktop
-usr/share/kservices5/khtml.desktop
-usr/share/kservices5/khtmladaptorpart.desktop
 usr/share/kservices5/khtmladaptorpart.desktop
 usr/share/kservices5/khtmlimage.desktop
-usr/share/kservices5/khtmlimage.desktop
 usr/share/kservices5/kjavaappletviewer.desktop
-usr/share/kservices5/kjavaappletviewer.desktop
-usr/share/kservices5/kmultipart.desktop
 usr/share/kservices5/kmultipart.desktop
-usr/share/kxmlgui5/khtml/khtml.rc
-usr/share/kxmlgui5/khtml/khtml_browser.rc
-usr/share/locale/
+usr/share/kxmlgui5/khtml/
+usr/share/locale/*/*/khtml5.mo
diff --git a/debian/libkf5khtml-dev.install b/debian/libkf5khtml-dev.install
index 6fcc942..3b3691b 100644
--- a/debian/libkf5khtml-dev.install
+++ b/debian/libkf5khtml-dev.install
@@ -1,4 +1,5 @@
-usr/include/KF5/
+usr/include/KF5/KHtml/
+usr/include/KF5/khtml_version.h
 usr/lib/*/cmake/KF5KHtml/
 usr/lib/*/libKF5KHtml.so
-usr/lib/*/qt5/mkspecs/modules/*
+usr/lib/*/qt5/mkspecs/modules/qt_KHtml.pri

-- 
khtml packaging