[SCM] kwrited packaging branch, master, updated. 820c62799993b95f9f9c06e0906059ad88335730

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit c3a54968f92b9d873c4cbac6d3c79eb98b21c1dc
Merge: 9daca3d63156c64998dc0c329f55deb9ad716ed6 a7de0f3031bc0ea174e6eb3fb59d1569671bc4ac
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Mar 25 11:07:00 2015 +0100

    Merge commit 'a7de0f3031bc0ea174e6eb3fb59d1569671bc4ac'
    
    Conflicts:
    	debian/control
    	debian/kwrited.install
    	debian/watch

 debian/changelog | 12 ++++++++++++
 debian/watch     |  4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 770e22e,f6d3e0f..89ed3c6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,15 +1,33 @@@
 +kwrited (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:51:15 +0100
 +
+ kwrited (4:5.2.2-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 24 Mar 2015 07:33:32 -0700
+ 
+ kwrited (4:5.2.1-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 23 Feb 2015 09:42:51 -0800
+ 
 +kwrited (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.
 +  * Bump Standards-Version to 3.9.6, no changes needed.
 +  * Update install files.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 12 Feb 2015 23:52:44 +0100
 +
  kwrited (4:5.2.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release
diff --cc debian/watch
index bb20ddb,adcc077..1d43557
--- a/debian/watch
+++ b/debian/watch
@@@ -1,3 -1,2 +1,3 @@@
  version=3
- http://download.kde.org/unstable/plasma/([\d\.]+)/kwrited-([\d\.]+)\.tar\.xz
- http://download.kde.org/stable/plasma/([\d\.]+)/kwrited-([\d\.]+)\.tar\.xz
 -ftp://ftp.kde.org/pub/kde/unstable/plasma/([\d\.]+)/kwrited-(.*)\.tar\.xz
++http://download.kde.org/unstable/plasma/([\d.]+)/kwrited-([\d.]+)\.tar\.xz
++http://download.kde.org/stable/plasma/([\d.]+)/kwrited-([\d.]+)\.tar\.xz

-- 
kwrited packaging