[SCM] kscd packaging branch, kubuntu_xenial_archive, updated. ubuntu/4%15.08.2-0ubuntu1-11-g1868f93

[Clive Johnston]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kscd.git;a=commitdiff;h=1868f93

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 1868f93ffbbaa66985c5874b000a15126a2cd2e3
Merge: a56736aed2454d07b7b3f0ba532f55aa375cfb51 2dd7b62246d25c8573be4152ecf9702173678a31
Author: Clive Johnston <clivejo at aol.com>
Date:   Thu Feb 11 12:19:44 2016 +0000

    Merged with Debian and New upstream release

 debian/.gitattributes |  1 +
 debian/changelog      | 25 +++++++++++++++++++------
 debian/control        |  5 ++---
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --cc debian/changelog
index c332dc2,fad2667..c5e9faf
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,46 -1,16 +1,60 @@@
- kscd (4:15.12.0-0ubuntu1) UNRELEASED; urgency=medium
++kscd (4:15.12.1-0ubuntu1) UNRELEASED; urgency=medium
 +
++  * Merged with Debian
 +  * New upstream release
 +
-  -- Clive Johnston <clivejo at aol.com>  Sat, 02 Jan 2016 14:14:54 +0000
++ -- Clive Johnston <clivejo at aol.com>  Thu, 11 Feb 2016 12:17:45 +0000
 +
 +kscd (4:15.08.2-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 14 Oct 2015 12:43:39 +0100
 +
 +kscd (4:15.08.1-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream release (15.08.1)
 +
 + -- Clive Johnston <clivejo at aol.com>  Tue, 22 Sep 2015 17:21:58 +0100
 +
+ kscd (4:15.08.0-1) unstable; urgency=medium
+ 
+   * New upstream release (15.08.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sat, 19 Sep 2015 19:10:55 +0200
+ 
 +kscd (4:15.08.0-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream release
 +
 + -- Clive Johnston <clivejo at aol.com>  Wed, 26 Aug 2015 17:36:59 +0100
 +
 +kscd (4:15.07.90-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream beta release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 18 Aug 2015 11:12:02 +0100
 +
 +kscd (4:15.04.2-0ubuntu1) wily; urgency=medium
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 09 Jun 2015 19:21:15 +0200
 +
 +kscd (4:14.12.3-0ubuntu1) vivid; urgency=medium
 +
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 13 Mar 2015 14:05:14 -0700
 +
+ kscd (4:14.12.2-1) experimental; urgency=medium
+ 
+   * Prepare Debian release.
+   * Bump Standards-Version to 3.9.6, no changes needed.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Thu, 19 Feb 2015 12:01:32 +0100
+ 
  kscd (4:14.12.2-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
kscd packaging