[SCM] LabPlot Debian packaging. branch, master, updated. debian/2.3.0-2-4-gc082878

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 201e1b770c962a72b4c0b32905154b941d463d53
Author: Pino Toscano <pino at debian.org>
Date:   Sun Jun 18 08:38:08 2017 +0200

    update the patches
    
    - upstream_cmake-do-not-hardcode-libdir-for-hdf5.patch: drop, fixed
      upstream
---
 debian/changelog                                   |  3 +++
 debian/patches/series                              |  1 -
 ...eam_cmake-do-not-hardcode-libdir-for-hdf5.patch | 26 ----------------------
 3 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 708c83e..0ebeb5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ labplot (2.4.0-0r1) UNRELEASED; urgency=medium
       and libkf5textwidgets-dev
     - add libcfitsio-dev, for new features
     - explicitly add gettext, and pkg-config
+  * Update the patches:
+    - upstream_cmake-do-not-hardcode-libdir-for-hdf5.patch: drop, fixed
+      upstream
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sun, 18 Jun 2017 08:25:38 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 10fad00..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-upstream_cmake-do-not-hardcode-libdir-for-hdf5.patch
diff --git a/debian/patches/upstream_cmake-do-not-hardcode-libdir-for-hdf5.patch b/debian/patches/upstream_cmake-do-not-hardcode-libdir-for-hdf5.patch
deleted file mode 100644
index ccf766f..0000000
--- a/debian/patches/upstream_cmake-do-not-hardcode-libdir-for-hdf5.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 3b69133fcf5a62f46d33a1e3adc8e44c854517d7 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino at kde.org>
-Date: Tue, 26 Jul 2016 22:31:57 +0200
-Subject: [PATCH] cmake: do not hardcode libdir for hdf5
-
-this allows to find it also on platforms different than Linux x86_64
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fb50552..12c6fae 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -91,7 +91,7 @@ FIND_LIBRARY(HDF5_LIBRARY hdf5
- 	PATHS
- 	/usr/lib
- 	/usr/local/lib
--	/usr/lib/x86_64-linux-gnu/hdf5/serial
-+	/usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/hdf5/serial
- )
- FIND_PATH (HDF5_INCLUDE_DIR hdf5.h
- 	/usr/include
--- 
-2.8.1
-

-- 
LabPlot Debian packaging.