[SCM] kalgebra packaging branch, master, updated. debian/14.12.2-1-5-gaee9f70

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit aee9f70979278403c2c5ef8c0dde91b2a89d9f40
Merge: 6c9b0aa7149383b56625f186d44df488425b4263 80f403ef461b71f8103f1502a49d0e0ac9dbd5ad
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Mar 26 16:26:42 2015 +0100

    Merge commit '80f403ef461b71f8103f1502a49d0e0ac9dbd5ad'
    
    Conflicts:
    	debian/control

 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --cc debian/changelog
index dd4aa56,97d07ca..f40e9bd
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,9 +1,25 @@@
 +kalgebra (4:14.12.3-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (14.12.3).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 26 Mar 2015 12:56:25 +0100
 +
+ kalgebra (4:14.12.3-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 13 Mar 2015 14:39:43 -0700
+ 
 +kalgebra (4:14.12.2-1) experimental; urgency=medium
 +
 +  * New upstream release (14.12.2).
 +  * Bump Standards-Version to 3.9.6, no changes needed.
 +  * Update build dependencies to build against experimental and to
 +    follow cmake.
 +  * Update copyright information.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sat, 21 Feb 2015 13:41:43 +0100
 +
  kalgebra (4:14.12.2-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
kalgebra packaging