[SCM] KDE Base Runtime module packaging branch, master, updated. debian/15.08.0-2-4-g649aff7

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 5247855aacb04959e64c991477c5277d679da4d6
Author: Scott Kitterman <scott at kitterman.com>
Date:   Wed Aug 26 00:43:30 2015 -0400

    * Remove helpcenter4 binary as it's now provided as a transitional package
      by the Kf5 based khelpcenter package
      - Remove from debian/control
      - Remove debian/khelpcenter4.dirs debian/khelpcenter4.install
        debian/khelpcenter4.links debian/khelpcenter4.lintian-overrides
      - Add files from debian/khelpcenter4.install to debian/not-installed
---
 debian/changelog                      | 12 ++++++++++++
 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, 23 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5f8d9b2..73008ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+kde-runtime (4:4.14.2-4) unstable; urgency=medium
+
+  * Team upload.
+  * Remove helpcenter4 binary as it's now provided as a transitional package
+    by the Kf5 based khelpcenter package
+    - Remove from debian/control
+    - Remove debian/khelpcenter4.dirs debian/khelpcenter4.install
+      debian/khelpcenter4.links debian/khelpcenter4.lintian-overrides
+    - Add files from debian/khelpcenter4.install to debian/not-installed
+
+ -- Scott Kitterman <scott at kitterman.com>  Wed, 26 Aug 2015 00:07:42 -0400
+
 kde-runtime (4:4.14.2-3) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index e3dbb5e..1a053b4 100644
--- a/debian/control
+++ b/debian/control
@@ -131,19 +131,6 @@ Description: shared data files for the KDE base runtime module
  .
  This package is part of the KDE base runtime module.
 
-Package: khelpcenter4
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: htdig
-Replaces: khelpcenter (<< 4:4.0.0)
-Breaks: 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 aa5c9a8..520d00b 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -77,3 +77,14 @@
 ./usr/lib/kde4/platformimports/touch/org/kde/plasma/components/private/TabBarLayout.qml
 ./usr/lib/kde4/platformimports/touch/org/kde/plasma/components/private/TabGroup.js
 ./usr/lib/kde4/platformimports/touch/org/kde/plasma/components/private/TextFieldFocus.qml
+
+# Khelpcenter4 now provided by Kf5 source khelpcenter
+./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