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

Harald Sitter apachelogger-guest at moszumanska.debian.org
Thu Oct 9 06:58:59 UTC 2014


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

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

    Fix incorrectly bumped breaks and replaces against 5.0.0 -data package
---
 debian/changelog | 1 +
 debian/control   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1f0fc62..3829de1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ khelpcenter (4:5.0.95-0ubuntu1) UNRELEASED; urgency=medium
     applications desktop file and binary name
   * 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
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 01 Oct 2014 15:26:05 +0200
 
diff --git a/debian/control b/debian/control
index 034b510..f90a952 100644
--- a/debian/control
+++ b/debian/control
@@ -19,8 +19,8 @@ Package: khelpcenter
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Conflicts: khelpcenter4
-Breaks: khelpcenter-data (<< 4:5.2.0-0ubuntu1~ubuntu14.10~ppa2)
-Replaces: khelpcenter-data (<< 4:5.2.0-0ubuntu1~ubuntu14.10~ppa2), khelpcenter4
+Breaks: khelpcenter-data (<< 4:5.0.0-0ubuntu1~ubuntu14.10~ppa2)
+Replaces: khelpcenter-data (<< 4:5.0.0-0ubuntu1~ubuntu14.10~ppa2), khelpcenter4
 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



More information about the pkg-kde-commits mailing list