[med-svn] [fw4spl] 01/01: add patch to fix missing hdf5 and use symlinks for qt plugins

[Corentin Desfarges]

This is an automated email from the git hooks/post-receive script.

corentin-guest pushed a commit to branch master
in repository fw4spl.

commit 2e4f69e1d8c9aed69267c6819a5b258088e9aa52
Author: Corentin Desfarges <corentin.desfarges.dev at gmail.com>
Date:   Fri Mar 27 17:01:31 2015 +0100

    add patch to fix missing hdf5 and use symlinks for qt plugins
---
 debian/changelog                      |  7 +++++++
 debian/control                        |  5 ++++-
 debian/patches/fix_missing_hdf5.patch | 26 ++++++++++++++++++++++++++
 debian/patches/series                 |  1 +
 debian/rules                          |  2 ++
 5 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8af84fe..73be6c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+fw4spl (0.9.2-1.1) unstable; urgency=medium
+
+  * Replace files from libqt4-qt3support by symlinks. Closes: #781298.
+  * Fix FindHdf5.cmake to find the missing library on i386 arch. Closes: #781294.
+
+ -- Corentin Desfarges <corentin.desfarges.dev at gmail.com>  Fri, 27 Mar 2015 17:03:34 +0100
+
 fw4spl (0.9.2-1) unstable; urgency=low
 
   * Initial release (Closes: #779632)
diff --git a/debian/control b/debian/control
index 569eb3b..7769e84 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Build-Depends: debhelper (>= 9),
                libhdf5-dev,
                libqt4-dev,
                libqt4-opengl-dev,
+               libqt4-qt3support,
                libvtk5-dev,
                libgdcm2-dev,
                libinsighttoolkit3-dev,
@@ -24,7 +25,9 @@ Build-Depends: debhelper (>= 9),
                libcamp0.7-dev,
                xvfb,
                xauth,
-               dbus-x11
+               dbus-x11,
+               rdfind,
+               symlinks
 Standards-Version: 3.9.6
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/fw4spl.git
 Vcs-Git: git://anonscm.debian.org/debian-med/fw4spl.git
diff --git a/debian/patches/fix_missing_hdf5.patch b/debian/patches/fix_missing_hdf5.patch
new file mode 100644
index 0000000..326e552
--- /dev/null
+++ b/debian/patches/fix_missing_hdf5.patch
@@ -0,0 +1,26 @@
+--- fw4spl.orig/CMake/Modules/FindHDF5.cmake
++++ fw4spl/CMake/Modules/FindHDF5.cmake
+@@ -1,5 +1,3 @@
+-
+-
+ FIND_PATH(HDF5_INCLUDE_DIR H5Cpp.h
+   HINTS
+   $ENV{HDF5_DIR}
+@@ -15,8 +13,6 @@
+   /opt
+ )
+ 
+-message("#### : ${HDF5_INCLUDE_DIR}")
+-
+ FIND_LIBRARY(HDF5_LIBRARY 
+   NAMES hdf5ddll hdf5dll hdf5 hdf5d hdf5_debug libhdf5
+   HINTS
+@@ -25,7 +21,7 @@
+   PATHS
+   ~/Library/Frameworks
+   /Library/Frameworks
+-  /usr/lib/x86_64-linux-gnu/hdf5/serial
++  /usr/lib/*/hdf5/serial
+   /usr/lib
+   /usr
+   /sw
diff --git a/debian/patches/series b/debian/patches/series
index 49ca987..394c0a5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ remove_fwItkIOTest.patch
 set_media_as_bundle.patch
 fix_unit_tests.patch
 fix_cmakelists.patch
+fix_missing_hdf5.patch
diff --git a/debian/rules b/debian/rules
index 7635628..82220b1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,8 @@ override_dh_auto_configure:
 
 override_dh_auto_install:
 	dh_auto_install --destdir=debian/fw4spl
+	rdfind -outputname /dev/null -makesymlinks true debian/fw4spl/
+	symlinks -r -s -c debian/fw4spl
 
 override_dh_auto_test:
 	echo "test disabled"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/fw4spl.git