[SCM] LabPlot Debian packaging. branch, master, updated. debian/2.2.0-1-6-ge289630

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/labplot.git;a=commitdiff;h=ea25e5c

The following commit has been merged in the master branch:
commit ea25e5c6a7014f114d961301b54fe0adaca748cb
Author: Pino Toscano <pino at debian.org>
Date:   Mon Jul 25 23:14:23 2016 +0200

    update the patches
    
    - upstream_Include-cmath-for-std-isfinite.patch: drop, backported from
      upstream
---
 debian/changelog                                   |  3 +++
 debian/patches/series                              |  1 -
 .../upstream_Include-cmath-for-std-isfinite.patch  | 25 ----------------------
 3 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index afae697..5ebdbe4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ labplot (2.3.0-0r1) UNRELEASED; urgency=medium
   [ Pino Toscano ]
   * New upstream release.
   * Update Vcs-* fields.
+  * Update the patches:
+    - upstream_Include-cmath-for-std-isfinite.patch: drop, backported from
+      upstream
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Mon, 04 Jul 2016 06:14:45 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index d035318..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-upstream_Include-cmath-for-std-isfinite.patch
diff --git a/debian/patches/upstream_Include-cmath-for-std-isfinite.patch b/debian/patches/upstream_Include-cmath-for-std-isfinite.patch
deleted file mode 100644
index 531314b..0000000
--- a/debian/patches/upstream_Include-cmath-for-std-isfinite.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e3b55c7f8ff492e2db27794af53a8ad36fcc3c79 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino at kde.org>
-Date: Sat, 21 May 2016 07:48:08 +0200
-Subject: [PATCH] Include <cmath> for std::isfinite()
-
----
- src/backend/gsl/ExpressionParser.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/backend/gsl/ExpressionParser.cpp b/src/backend/gsl/ExpressionParser.cpp
-index 2c5d1b6..1c19b7c 100644
---- a/src/backend/gsl/ExpressionParser.cpp
-+++ b/src/backend/gsl/ExpressionParser.cpp
-@@ -38,6 +38,8 @@
- 
- #include <klocale.h>
- 
-+#include <cmath>
-+
- ExpressionParser* ExpressionParser::instance = NULL;
- 
- ExpressionParser::ExpressionParser(){
--- 
-2.8.1
-

-- 
LabPlot Debian packaging.