[SCM] khelpcenter packaging branch, kubuntu_utopic_next, updated. 436a17037a1c128e4b40e257e07b308a719ac3d6

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/khelpcenter.git;a=commitdiff;h=436a170

The following commit has been merged in the kubuntu_utopic_next branch:
commit 436a17037a1c128e4b40e257e07b308a719ac3d6
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Oct 9 08:58:52 2014 +0200

    Fix khelpcenter4 relationships
    
    * Fix khelpcenter4 relationships
      + Drop the Conflicts on khelpcenter4
      + Break and Replace khelpcenter4 << 5.0
      + This change is to stay consistent, previously a Conflicts was used on
        khelpcenter (which was the package name in KDE 3) which in turn caused
        upgrade problems when going from khelpcenter4 to khelpcenter (Frameworks
        5 version) because of being to broad a relationship.
---
 debian/changelog | 7 +++++++
 debian/control   | 7 ++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3829de1..5ff6718 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,13 @@ khelpcenter (4:5.0.95-0ubuntu1) UNRELEASED; urgency=medium
   * Clean up buld dependencies and remove everything not directly required by
     khelpcenter itself
   * Fix incorrectly bumped breaks and replaces against 5.0.0 -data package
+  * Fix khelpcenter4 relationships
+    + Drop the Conflicts on khelpcenter4
+    + Break and Replace khelpcenter4 << 5.0
+    + This change is to stay consistent, previously a Conflicts was used on
+      khelpcenter (which was the package name in KDE 3) which in turn caused
+      upgrade problems when going from khelpcenter4 to khelpcenter (Frameworks
+      5 version) because of being to broad a relationship.
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 01 Oct 2014 15:26:05 +0200
 
diff --git a/debian/control b/debian/control
index f90a952..1098eac 100644
--- a/debian/control
+++ b/debian/control
@@ -18,9 +18,10 @@ Homepage: https://projects.kde.org/projects/kde/workspace/khelpcenter
 Package: khelpcenter
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: khelpcenter4
-Breaks: khelpcenter-data (<< 4:5.0.0-0ubuntu1~ubuntu14.10~ppa2)
-Replaces: khelpcenter-data (<< 4:5.0.0-0ubuntu1~ubuntu14.10~ppa2), khelpcenter4
+Breaks: khelpcenter-data (<< 4:5.0.0-0ubuntu1~ubuntu14.10~ppa2),
+        khelpcenter4 (<< 4:5.0.0)
+Replaces: khelpcenter-data (<< 4:5.0.0-0ubuntu1~ubuntu14.10~ppa2),
+          khelpcenter4 (<< 4:5.0.0)
 Description: KDE documentation viewer
  KHelpCenter uses meta data files which describe the documentation
  available in the system. Each document is represented by a meta data

-- 
khelpcenter packaging