[SCM] libkdeedu packaging branch, kubuntu_xenial_archive, updated. ubuntu/4%15.08.2-0ubuntu2-11-g266849e

[Clive Johnston]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/libkdeedu.git;a=commitdiff;h=266849e

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 266849e7d3232b83b119301f657cff210d345384
Merge: baaa1a1fb8bda10341904100abd96b94bcda641f 744a25a7df202208c90062b6384cab86796260a8
Author: Clive Johnston <clivejo at aol.com>
Date:   Sat Feb 13 21:03:00 2016 +0000

    Merged with Debian and New upstream release

 debian/.gitattributes |  1 +
 debian/changelog      | 30 ++++++++++++++++++++++--------
 debian/control        |  5 ++---
 debian/rules          |  4 +++-
 4 files changed, 28 insertions(+), 12 deletions(-)

diff --cc debian/changelog
index 21768bc,1a73ec0..94f3abf
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,64 -1,16 +1,78 @@@
- libkdeedu (4:15.12.0-0ubuntu1) UNRELEASED; urgency=medium
++libkdeedu (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:30:54 +0000
++ -- Clive Johnston <clivejo at aol.com>  Sat, 13 Feb 2016 21:01:31 +0000
 +
 +libkdeedu (4:15.08.2-0ubuntu2) xenial; urgency=medium
 +
 +  * Fix autopackagetests by adding allow-stderr to the requirements.
 +
 + -- Philip Muškovac <yofel at kubuntu.org>  Tue, 03 Nov 2015 15:34:52 +0100
 +
 +libkdeedu (4:15.08.2-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 14 Oct 2015 12:55:57 +0100
 +
 +libkdeedu (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:39:10 +0100
 +
+ libkdeedu (4:15.08.0-1) unstable; urgency=medium
+ 
+   * New upstream release (15.04.0).
+   * New upstream release (15.08.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sun, 30 Aug 2015 23:27:20 +0200
+ 
 +libkdeedu (4:15.08.0-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream release
 +
 + -- Clive Johnston <clivejo at aol.com>  Wed, 26 Aug 2015 17:45:25 +0100
 +
 +libkdeedu (4:15.07.90-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream beta release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 18 Aug 2015 11:23:20 +0100
 +
 +libkdeedu (4:15.04.2-0ubuntu1) wily; urgency=medium
 +
 +  [ Scarlett Clark ]
 +  * New upstream release
 +  * Fix kdelibs version
 +  * New upstream release
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 09 Jun 2015 19:43:06 +0200
 +
 +libkdeedu (4:14.12.3-0ubuntu2) vivid; urgency=medium
 +
 +  * Fix depends on kdelibs5-dev
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Mar 2015 12:22:29 +0100
 +
 +libkdeedu (4:14.12.3-0ubuntu1) vivid; urgency=medium
 +
 +  * New upstream release
 +  * Fix kdelibs5 version in build depends 
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 13 Mar 2015 13:50:02 -0700
 +
+ libkdeedu (4:14.12.2-1) experimental; urgency=medium
+ 
+   * Prepare Debian release.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Thu, 19 Feb 2015 11:39:08 +0100
+ 
  libkdeedu (4:14.12.2-0ubuntu3) vivid; urgency=medium
  
    * Fix depends version on kdelibs5-dev

-- 
libkdeedu packaging