[SCM] cantor packaging branch, master, updated. debian/4.14.2-2-29-gb6f15bf

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 9b3c4225c18e03a8a69d38d22ff3a130a987920f
Merge: 0ae593b8c56030891808b1174673f83db422b454 763b755bda35e33bbf4ec5647b55882b4f9f1bbc
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Mar 26 16:18:15 2015 +0100

    Merge commit '763b755bda35e33bbf4ec5647b55882b4f9f1bbc'
    
    Conflicts:
    	debian/control

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

diff --cc debian/changelog
index 936f4dd,02d8806..c95a8c4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,16 +1,23 @@@
 +cantor (4:14.12.3-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (14.12.3).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 26 Mar 2015 13:19:20 +0100
 +
+ cantor (4:14.12.3-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release.
+   * Release to vivid
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 11 Mar 2015 14:52:09 -0700
+ 
 -cantor (4:14.12.2-0ubuntu1) UNRELEASED; urgency=medium
 +cantor (4:14.12.2-1) experimental; urgency=medium
 +
 +  * New upstream release (14.12.2).
  
    [ Scarlett Clark ]
 -  * New upstream release
    * Remove weaker suggests cantor-backend-qalculate, as
 -    it is already a recommends. 
 +    it is already a recommends.
  
    [ Harald Sitter ]
    * Add python-numpy to tests dependencies, should fix python test

-- 
cantor packaging