[SCM] cantor packaging branch, master, updated. debian/4.14.1-1-8-g7d1545f

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit b337b0c5d97ef075963273ecc7e1f57eae143b64
Merge: e568d9c7fe413fce02a63e1c002046c6d0443b02 2971539e582beb1be91b116296f94ece3b72dabb
Author: Maximiliano Curia <maxy at debian.org>
Date:   Tue Oct 21 19:45:24 2014 +0200

    Merge branch 'master' of git://git.debian.org/pkg-kde/kde-sc/cantor

 debian/changelog                           |  9 +++++++++
 debian/patches/octave_force_use_of_gnuplot | 13 -------------
 debian/patches/series                      |  1 -
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --cc debian/changelog
index c0c08b7,df0adaa..accd132
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,12 +1,18 @@@
 +cantor (4:4.14.2-1) unstable; urgency=medium
 +
 +  * New upstream release (4.14.2).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Mon, 20 Oct 2014 17:13:24 +0200
 +
+ cantor (4:4.14.2-0r1) UNRELEASED; urgency=medium
+ 
+   [ Pino Toscano ]
+   * New upstream release.
+   * Update patches:
+     - octave_force_use_of_gnuplot: drop, applied upstream
+ 
+  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 19 Oct 2014 11:20:21 +0200
+ 
  cantor (4:4.14.1-1) unstable; urgency=medium
  
    * Team upload.

-- 
cantor packaging