[SCM] libkscreen packaging branch, kubuntu_xenial_archive, updated. debian/5.4.3-1-104-ga417e86

[Philip Muškovac]

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

The following commit has been merged in the kubuntu_xenial_archive branch:
commit a417e86b4d03cd73006c92bdaed78924f65552f0
Author: Philip Muškovac <yofel at gmx.net>
Date:   Fri Mar 4 21:07:55 2016 +0100

    Fix the breaks version and the multiple changelogs
---
 debian/changelog | 62 +++++++++-----------------------------------------------
 debian/control   |  4 ++--
 2 files changed, 12 insertions(+), 54 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a681bc5..a0c66de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libkscreen (4:5.5.4-2ubuntu1~) UNRELEASED; urgency=medium
+
+  [ Clive Johnston ]
+  * Merge with debian git master
+
+  [ Philip Muškovac ]
+  * libkf5kscreen-bin breaks/replaces libkf5screen6 << 4:5.5.4-2~
+
+ -- Philip Muškovac <yofel at kubuntu.org>  Fri, 04 Mar 2016 21:01:37 +0100
+
 libkscreen (4:5.5.4-2~) UNRELEASED; urgency=medium
 
   * Avoid circular dependencies.
@@ -16,58 +26,6 @@ libkscreen (4:5.5.4-1) experimental; urgency=medium
 
  -- Maximiliano Curia <maxy at debian.org>  Wed, 27 Jan 2016 16:48:59 +0100
 
-libkscreen (4:5.5.4-0ubuntu1) UNRELEASED; urgency=medium
-
-  [ Scarlett Clark ]
-  * New upstream release Xenial
-  * The .so in this tar is version 6. Update all
-    files to reflect that. 
-  * Add the renamed files in git. 
-
-  [ Clive Johnston ]
-  * new upstream release
-
-  [ Philip Muškovac ]
-  * Set the SOVERSION back to 6 in the symbols file 
-
-  [ Clive Johnston ]
-  * New upstream release
-
-  [ Scarlett Clark ]
-  * merge unstable to get debian merge into archive.
-    Left so verion at 6 for compatibility with release tar. 
-  * Fix control file to reflect so version 6. 
-  * Some more cleanup to fix archive. 
-
-  [ Clive Johnston ]
-  * New upstream release
-
- -- Clive Johnston <clivejo at aol.com>  Wed, 27 Jan 2016 20:13:39 +0000
-
-libkscreen (4:5.5.1-0ubuntu2) UNRELEASED; urgency=medium
-
-  [ Scarlett Clark ]
-  * Fix unstable build to reflect the .so version of 7.
-  * Add the new files and fix the install file. 
-  * Fix symbols file merge markers. 
-  * Fix the .so version in the symbols file. 
-  * Refresh symbols. 
-
-  [ Bhushan Shah ]
-  * Add build-dep to kwayland-dev
-
- -- Scarlett Clark <sgclark at kubuntu.org>  Sat, 19 Dec 2015 08:10:24 -0800
-
-libkscreen (4:5.5.1-0ubuntu1) UNRELEASED; urgency=medium
-
-  * New upstream release Xenial
-  * The .so in this tar is version 6. Update all
-    files to reflect that. 
-  * Add the renamed files in git. 
-  * Debian merge: No remaining changes. 
-
- -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 18 Dec 2015 07:36:47 -0800
-
 libkscreen (4:5.4.3-1) unstable; urgency=medium
 
   * New upstream release (5.4.3).
diff --git a/debian/control b/debian/control
index eeac0cf..fc34c6a 100644
--- a/debian/control
+++ b/debian/control
@@ -50,8 +50,8 @@ Package: libkf5screen-bin
 Architecture: any
 Multi-Arch: foreign
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libkf5screen6 (<< 4:5.5~)
-Replaces: libkf5screen6 (<< 4:5.5~)
+Breaks: libkf5screen6 (<< 4:5.5.4-2~)
+Replaces: libkf5screen6 (<< 4:5.5.4-2~)
 Description: library for screen management - helpers
  The KDE multiple monitor support is trying be as smart as possible
  adapting the behavior of it to each use case making the configuration

-- 
libkscreen packaging