[SCM] KDE Base Runtime module packaging branch, kubuntu_vivid_archive, updated. debian/4.14.2-1-17-g41f3136

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 41f313619c4947b3629e0558a84851d016842abf
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Dec 15 14:09:16 2014 +0100

    Do not make khelpcenter4, we have khelpcenter from plasma 5
---
 debian/changelog                      |  4 ++++
 debian/control                        | 13 -------------
 debian/khelpcenter4.dirs              |  1 -
 debian/khelpcenter4.install           |  9 ---------
 debian/khelpcenter4.links             |  1 -
 debian/khelpcenter4.lintian-overrides |  1 -
 debian/not-installed                  | 11 +++++++++++
 7 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0e4a7f1..ccd711c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
 kde-runtime (4:14.12.0-0ubuntu1) UNRELEASED; urgency=medium
 
+  [ Scarlett Clark ]
   * New upstream release
   * Remove kdelibs5-dev depend version as there was not a new release.
   * Remove kdepimlibs5-dev depend version as there was not a new release.
 
+  [ Jonathan Riddell ]
+  * Do not make khelpcenter4, we have khelpcenter from plasma 5
+
  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 12 Dec 2014 04:24:33 -0800
 
 kde-runtime (4:14.11.97-0ubuntu1) vivid; urgency=medium
diff --git a/debian/control b/debian/control
index f24772b..649cfee 100644
--- a/debian/control
+++ b/debian/control
@@ -137,19 +137,6 @@ Description: shared data files for the KDE base runtime module
  .
  This package is part of the KDE base runtime module.
 
-Package: khelpcenter
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: htdig
-Replaces: kde-runtime-data (<< 4:4.13.90), khelpcenter (<< 4:4.0.0)
-Breaks: kde-runtime-data (<< 4:4.13.90), khelpcenter (<< 4:4.0.0)
-Description: help center
- The KDE Help Center displays documentation on how to use the KDE plasma
- workspaces and applications, as well as UNIX man and info pages.
- It can search through documentation using the 'htdig' package.
- .
- This package is part of the KDE base runtime module.
-
 Package: plasma-scriptengine-javascript
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
diff --git a/debian/khelpcenter4.dirs b/debian/khelpcenter4.dirs
deleted file mode 100644
index fc7a457..0000000
--- a/debian/khelpcenter4.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/services
diff --git a/debian/khelpcenter4.install b/debian/khelpcenter4.install
deleted file mode 100644
index c2f52c5..0000000
--- a/debian/khelpcenter4.install
+++ /dev/null
@@ -1,9 +0,0 @@
-usr/bin/khelpcenter
-usr/lib/libkdeinit4_khelpcenter.so
-usr/share/applications/kde4/Help.desktop
-usr/share/dbus-1/interfaces/org.kde.khelpcenter.kcmhelpcenter.xml
-usr/share/doc/kde/HTML/*/khelpcenter/
-usr/share/doc/kde/HTML/*/onlinehelp/
-usr/share/kde4/apps/khelpcenter/
-usr/share/kde4/config.kcfg/khelpcenter.kcfg
-usr/share/kde4/services/khelpcenter.desktop
diff --git a/debian/khelpcenter4.links b/debian/khelpcenter4.links
deleted file mode 100644
index e1493b9..0000000
--- a/debian/khelpcenter4.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/kde4/services/khelpcenter.desktop usr/share/services/khelpcenter.desktop
diff --git a/debian/khelpcenter4.lintian-overrides b/debian/khelpcenter4.lintian-overrides
deleted file mode 100644
index f73e05c..0000000
--- a/debian/khelpcenter4.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-khelpcenter4: desktop-entry-lacks-main-category usr/share/applications/kde4/Help.desktop
diff --git a/debian/not-installed b/debian/not-installed
index 8737d71..7320fc1 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -45,3 +45,14 @@
 ./usr/share/doc/kde/HTML/en/kioslave/nepomuksearch/index.cache.bz2
 ./usr/share/doc/kde/HTML/en/kioslave/nepomuksearch/index.docbook
 ./usr/share/kde4/apps/desktoptheme/default/icons/nepomuk.svgz
+
+./usr/bin/khelpcenter
+./usr/lib/libkdeinit4_khelpcenter.so
+./usr/share/applications/kde4/Help.desktop
+./usr/share/dbus-1/interfaces/org.kde.khelpcenter.kcmhelpcenter.xml
+./usr/share/doc/kde/HTML/*/khelpcenter/
+./usr/share/doc/kde/HTML/*/onlinehelp/
+./usr/share/kde4/apps/khelpcenter/
+./usr/share/kde4/config.kcfg/khelpcenter.kcfg
+./usr/share/kde4/services/khelpcenter.desktop
+

-- 
KDE Base Runtime module packaging