[SCM] polkit-kde-agent-1 packaging branch, master, updated. debian/0.99.1-1-37-g2f21cdd

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/polkit-kde-agent-1.git;a=commitdiff;h=edc541d

The following commit has been merged in the master branch:
commit edc541db86af3d88a6c2586c53000e39709fcdd6
Merge: e5aacd4899fcfc3bd41e6359fd5db1c3ad3e42f2 6396ca46254fa1cfa22a952bc09191e6d7136d93
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Mar 25 11:25:39 2015 +0100

    Merge commit '6396ca46254fa1cfa22a952bc09191e6d7136d93'
    
    Conflicts:
    	debian/control
    	debian/polkit-kde-agent-1.install

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

diff --cc debian/changelog
index 990568d,a583a28..c7b90e4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,15 +1,33 @@@
 +polkit-kde-agent-1 (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:43 +0100
 +
+ polkit-kde-agent-1 (4:5.2.2-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 24 Mar 2015 07:44:58 -0700
+ 
+ polkit-kde-agent-1 (4:5.2.1-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 23 Feb 2015 09:49:49 -0800
+ 
 +polkit-kde-agent-1 (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 install files.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 12 Feb 2015 23:54:37 +0100
 +
  polkit-kde-agent-1 (4:5.2.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
polkit-kde-agent-1 packaging