[SCM] plasma-nm packaging branch, master, updated. debian/5.2.0-1-10-g3ac1099

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 53188c8db31bd84765e05b6476ea57624b2f9f20
Merge: 578fd0d7aecca955561d516c60629365d773db6d ce044c409618a3f7848bc2a19da0f014332406e4
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Mar 25 11:18:50 2015 +0100

    Merge commit 'ce044c409618a3f7848bc2a19da0f014332406e4'
    
    Conflicts:
    	debian/control

 debian/changelog | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --cc debian/changelog
index 04fce2a,b53a6d5..29e06df
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,15 +1,33 @@@
 +plasma-nm (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:57:50 +0100
 +
+ plasma-nm (4:5.2.2-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 24 Mar 2015 07:43:02 -0700
+ 
+ plasma-nm (4:5.2.1-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 23 Feb 2015 09:47:28 -0800
+ 
 +plasma-nm (4:5.2.0-1) experimental; urgency=medium
 +
 +  * Prepare initial Debian release.
 +  * Add myself as Uploader.
 +  * Update build dependencies to build against experimental and to
 +    follow cmake.
 +  * Update copyright information.
 +  * Update watch file.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 13 Feb 2015 13:58:53 +0100
 +
  plasma-nm (4:5.2.0-0ubuntu2) vivid; urgency=medium
  
    * Build with networkmanager-qt 5.6.0-0ubuntu2 for new symbols

-- 
plasma-nm packaging