[SCM] kwrited packaging branch, kubuntu_wily_archive, updated. debian/5.2.2-1-24-ge5e467b

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit e5e467bf008f0a262e7a1d5ee1603b9b4bbd8a7d
Merge: 03b295278a140f17387a8a02b614632010267a4c 0e66403dd45442a4617f84a6d8b329a07e26a945
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Jun 29 18:25:38 2015 +0200

    merge master

 debian/.gitattributes           |  1 +
 debian/changelog                | 25 +++++++++++++++++++++++++
 debian/control                  | 26 +++++++++++++++-----------
 debian/copyright                | 18 +++++++++++-------
 debian/kwrited.install          |  3 +++
 debian/source/lintian-overrides |  1 -
 debian/watch                    |  3 ++-
 7 files changed, 57 insertions(+), 20 deletions(-)

diff --cc debian/changelog
index 1daf607,ee6849a..50b601d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,17 +1,37 @@@
 +kwrited (4:5.3.2-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 29 Jun 2015 17:29:42 +0200
 +
 +kwrited (4:5.3.1-0ubuntu1) wily; urgency=medium
 +
 +  [ Jonathan Riddell ]
 +  * Plasma 5.3 beta
 +  * new upstream release
 +
 +  [ Scarlett Clark ]
 +  * Vivid backport
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 05 Jun 2015 02:34:54 +0200
 +
+ kwrited (4:5.3.1-1~) UNRELEASED; urgency=medium
+ 
+   * New upstream release (5.3.0).
+   * New upstream release (5.3.1).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Fri, 05 Jun 2015 11:54:57 +0200
+ 
+ kwrited (4:5.2.2-1) experimental; urgency=medium
+ 
+   * New upstream release (5.2.1).
+   * New upstream release (5.2.2).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Wed, 25 Mar 2015 23:17:34 +0100
+ 
  kwrited (4:5.2.2-0ubuntu1) vivid; urgency=medium
  
    * New upstream release
diff --cc debian/kwrited.install
index e3aabe7,c4d877b..f5d8351
--- a/debian/kwrited.install
+++ b/debian/kwrited.install
@@@ -1,3 -1,3 +1,6 @@@
+ etc/xdg/autostart/kwrited-autostart.desktop
+ usr/bin/kwrited
 +usr/lib/*/qt5/plugins/kded_kwrited.so
  usr/share/knotifications5/kwrited.notifyrc
++usr/share/knotifications5/kwrited.notifyrc
 +usr/share/kservices5/kded/kwrited.desktop

-- 
kwrited packaging