[SCM] sddm-kcm packaging branch, master, updated. a2ba2070123f3d3a65a1af2d4d5eae46b666b107

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/sddm-kcm.git;a=commitdiff;h=02cfc1e

The following commit has been merged in the master branch:
commit 02cfc1e5447859c6593a2245a3328cd0aa0704ca
Merge: c642de14c2c3785d01c2ebac0cebf404bf49f668 7dc0999ecf3c7a37b89807ee179a439a66402a9d
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Mar 25 11:30:55 2015 +0100

    Merge commit '7dc0999ecf3c7a37b89807ee179a439a66402a9d'
    
    Conflicts:
    	debian/control
    	debian/copyright
    	debian/kde-config-sddm.install

 debian/changelog | 13 +++++++++++++
 debian/control   |  1 -
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 2b9c790,3042d85..e93473a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,16 +1,32 @@@
 +sddm-kcm (4:5.2.2-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.2.1).
 +  * New upstream release (5.2.2).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Wed, 25 Mar 2015 09:58:34 +0100
 +
+ sddm-kcm (4:5.2.2-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 24 Mar 2015 07:45:44 -0700
+ 
+ sddm-kcm (4:5.2.1-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release 
+   * Add new depends to control. 
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 23 Feb 2015 09:50:32 -0800
+ 
 +sddm-kcm (4:5.2.0-1) experimental; urgency=medium
 +
 +  * Prepare initial Debian release.
 +  * Update build dependencies to build against experimental and to
 +    follow cmake.
 +  * Update copyright information.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 13 Feb 2015 14:42:38 +0100
 +
  sddm-kcm (4:5.2.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release
diff --cc debian/control
index 2bbf138,06825ec..0dd8ee7
--- a/debian/control
+++ b/debian/control
@@@ -35,11 -32,11 +35,10 @@@ Description: KCM module for SDD
   KDE systemsettings module to configure SDDM login manager.
  
  Package: kde-config-sddm-dbg
 -Architecture: any
  Section: debug
  Priority: extra
 +Architecture: any
  Depends: kde-config-sddm (= ${binary:Version}), ${misc:Depends}
--Description: KCM module for SDDM -- debugging symbols
   KDE systemsettings module to configure SDDM login manager.
   .
   This package contains debugging symbols.

-- 
sddm-kcm packaging