Merge lp:~panfaust/kubuntu-packaging-next/khelpcenter-work2 into lp:~kubuntu-packagers/kubuntu-packaging-next/khelpcenter

[Jose Manuel Santamaria Lema]

Use Breaks instead of conflicts against khelpcenter4. According to
debian's policy 7.4 "Normally, Breaks should be used instead of
Conflicts since Conflicts imposes a stronger restriction on the
ordering of package installation or upgrade and can make it more
difficult for the package manager to find a correct solution to an
upgrade or installation problem, Breaks should be used". This is the
case when upgrading from debian's kde metapackages such as kde-
standard or kde-full, so this change is needed to make the upgrades
from such metapackages work better.

Unmerged revisions

26. By Jose Manuel Santamaria Lema on 2014-07-31

Use Breaks instead of Conflicts.

=== modified file 'debian/changelog'
--- debian/changelog	2014-07-29 20:20:46 +0000
+++ debian/changelog	2014-07-31 17:55:30 +0000
@@ -14,6 +14,17 @@
     + Doesn't replace conflict as there is no binary conflict due to
       buildids
 
+  [ José Manuel Santamaría Lema ]
+  * Use Breaks instead of conflicts against khelpcenter4. According to
+    debian's policy 7.4 "Normally, Breaks should be used instead of
+    Conflicts since Conflicts imposes a stronger restriction on the
+    ordering of package installation or upgrade and can make it more
+    difficult for the package manager to find a correct solution to an
+    upgrade or installation problem, Breaks should be used". This is the
+    case when upgrading from debian's kde metapackages such as kde-
+    standard or kde-full, so this change is needed to make the upgrades
+    from such metapackages work better.
+
  -- Jonathan Riddell <[e-mail]>  Thu, 10 Jul 2014 20:02:25 +0200
 
 khelpcenter (4:4.98.0-0ubuntu1) utopic; urgency=medium
 
=== modified file 'debian/control'
--- debian/control	2014-07-29 20:20:46 +0000
+++ debian/control	2014-07-31 17:55:30 +0000
@@ -52,11 +52,11 @@
 
 Package: khelpcenter
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
-Conflicts: khelpcenter4
-Breaks: khelpcenter-data (<< 4:5.0.0-0ubuntu1~ubuntu14.10~ppa2)
-Replaces: khelpcenter4, khelpcenter-data (<< 4:5.0.0-0ubuntu1~ubuntu14.10~ppa2)
+Depends: ${misc:Depends}, ${shlibs:Depends}
+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