[SCM] cantor packaging branch, master, updated. debian/4.13.3-2-4-gfb0e844

Maximiliano Curia maxy at moszumanska.debian.org
Fri Aug 22 22:43:25 UTC 2014


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

The following commit has been merged in the master branch:
commit 2c67cf1a0e05ecbc79c435df670408ea34132944
Author: Maximiliano Curia <maxy at debian.org>
Date:   Fri Aug 22 21:58:14 2014 +0200

    Refresh patches.
---
 debian/changelog                           | 1 +
 debian/patches/maxima_waiting_the_carriage | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a38a8c8..0919c03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ cantor (4:4.14.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Update install files.
+  * Refresh patches.
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 18 Aug 2014 18:32:30 +0200
 
diff --git a/debian/patches/maxima_waiting_the_carriage b/debian/patches/maxima_waiting_the_carriage
index 4dd0d65..782560c 100644
--- a/debian/patches/maxima_waiting_the_carriage
+++ b/debian/patches/maxima_waiting_the_carriage
@@ -1,8 +1,8 @@
 Index: cantor/src/backends/maxima/maximasession.cpp
 ===================================================================
---- cantor.orig/src/backends/maxima/maximasession.cpp	2014-08-12 18:19:56.406941240 +0000
-+++ cantor/src/backends/maxima/maximasession.cpp	2014-08-12 21:17:27.123704399 +0000
-@@ -222,6 +222,12 @@
+--- cantor.orig/src/backends/maxima/maximasession.cpp	2014-08-22 21:42:56.128913156 +0200
++++ cantor/src/backends/maxima/maximasession.cpp	2014-08-22 21:42:56.128913156 +0200
+@@ -228,6 +228,12 @@
      QString out=m_process->readAllStandardOutput();
  #endif
  

-- 
cantor packaging



More information about the pkg-kde-commits mailing list