[SCM] kscreenlocker packaging branch, kubuntu_xenial_archive, updated. 828717cd04b577e92c1ae6ef6a318ff055e7ad48

[Philip Muškovac]

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

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 828717cd04b577e92c1ae6ef6a318ff055e7ad48
Author: Philip Muškovac <yofel at gmx.net>
Date:   Tue Jan 5 14:50:59 2016 +0100

    Squash all UNRELEASED changelogs into one
---
 debian/changelog | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cae965a..b318555 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,23 +1,5 @@
 kscreenlocker (5.5.2-0ubuntu1) UNRELEASED; urgency=medium
 
-  [ Scarlett Clark ]
-  * New upstream release Xenial.
-  * Add watch file. 
-
-  [ Clive Johnston ]
-  * new upstream release
-
- -- Clive Johnston <clivejo at aol.com>  Tue, 29 Dec 2015 17:43:02 +0000
-
-kscreenlocker (5.4.2-1ubuntu1) UNRELEASED; urgency=medium
-
-  * Copy this initial Release for Kubuntu.
-  * Debian merge: No remaining changes. 
-
- -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 09 Nov 2015 11:25:30 -0800
-
-kscreenlocker (5.4.2-1) UNRELEASED; urgency=low
-
   [Rohan Garg]
   * Initial release
 
@@ -29,5 +11,6 @@ kscreenlocker (5.4.2-1) UNRELEASED; urgency=low
   * Add test files. 
   * Clean up tests. Disable tests at buildtime. 
   * Adjust install file. 
+  * Add watch file. 
 
  -- Rohan Garg <rohan at kde.org>  Mon, 09 Nov 2015 16:28:49 +0100

-- 
kscreenlocker packaging