[SCM] kscreen packaging branch, kubuntu_wily_archive, updated. debian/5.2.2-1-11-gdf44ed9

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit df44ed97b815ecb150455701f497f787e2e0c6bc
Merge: bd96f1b0793cf5d968f01941581c9030d29e62bc f0315e3a5362bc7fb39b3a4c1ff1dd6e1418f1b1
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Jun 29 18:16:08 2015 +0200

    merge master

 debian/.gitattributes           |  1 +
 debian/changelog                | 23 ++++++++++++
 debian/control                  | 28 ++++++++-------
 debian/copyright                | 80 +++++++++++++++++++++++++++++++----------
 debian/kscreen.install          | 11 +++++-
 debian/rules                    |  4 ++-
 debian/tests/testsuite.xsession |  9 +++--
 debian/watch                    |  4 +--
 8 files changed, 122 insertions(+), 38 deletions(-)

diff --cc debian/changelog
index 3992459,d4a0b00..78462e5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,17 +1,37 @@@
 +kscreen (4:5.3.2-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 29 Jun 2015 17:28:05 +0200
 +
 +kscreen (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:31:37 +0200
 +
+ kscreen (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:30 +0200
+ 
+ kscreen (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:25 +0100
+ 
  kscreen (4:5.2.2-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
kscreen packaging