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

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit c332ceefcdb7dffcf914f642ac1bb8736491529b
Author: Pino Toscano <pino at debian.org>
Date:   Tue Jul 26 23:28:45 2016 +0200

    fix HDF5 detection on any arch different than amd64
    
    backport upstream commit 3b69133fcf5a62f46d33a1e3adc8e44c854517d7
---
 debian/changelog                                   |  4 ++++
 debian/patches/series                              |  1 +
 ...eam_cmake-do-not-hardcode-libdir-for-hdf5.patch | 26 ++++++++++++++++++++++
 3 files changed, 31 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index cba3a91..a22c1c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 labplot (2.3.0-2) UNRELEASED; urgency=medium
 
+  [ Pino Toscano ]
+  * Backport upstream commit 3b69133fcf5a62f46d33a1e3adc8e44c854517d7 to fix
+    the HDF5 detection on architecture different than amd64; patch
+    upstream_cmake-do-not-hardcode-libdir-for-hdf5.patch.
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Tue, 26 Jul 2016 23:26:51 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..10fad00
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+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
new file mode 100644
index 0000000..ccf766f
--- /dev/null
+++ b/debian/patches/upstream_cmake-do-not-hardcode-libdir-for-hdf5.patch
@@ -0,0 +1,26 @@
+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.