Source: ruby-hdfeos5
Version: 1.2-2
Severity: important
Tags: patch
User: p...@debian.org
Usertags: HDF5-transition

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Hi,

The hdf5 1.8.13 package in experimental features a new layout for
headers and libraries, so that all the binary packages are now
co-installable.

Please find attached a patch proposal to support both the current
and the new layouts.

Because this bug is in the way of the hdf5 transition I intend to NMU
in a few days. I apologize for the urge, and I hope this approach won't
offend you. Please tell me otherwise.

Kind regards,

_g.

- -- System Information:
Debian Release: jessie/sid
  APT prefers testing
  APT policy: (500, 'testing'), (1, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 3.14-1-486
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQEcBAEBCAAGBQJT2sf4AAoJEO/obGx//s+DHEYH/0iIh7KMfh+Cnu3zvW7IkGlQ
KF77rNDn4RrEZIbzkc57WyR23oMuriLsykCJXtAWz23RW3PjHzy+1wktiFk2gnuG
mSiWrnEQ++4eAzJLpu43AIsYNnm6+xlovEeU0Fer1COfk7QPgzuuCCRuAx9SNbrr
n7wAY3OcwGM/n9oWIOcvH34X6Fp0gFkYXaNMfx+wm9tGgQ8WqueJ94rKEDKBK0Mg
IxSzuBKV/hoUHmmcATCGuP1H8VWUr8LeNKafNM6aLZQIGmhQ3oFOEiHecjJyn3LD
eSk2PlErLKucv+9Inh0t2Jby7c4OMsl4VisQIzBAdKUPNnAGLrZVbVQJgScJniY=
=9jdu
-----END PGP SIGNATURE-----
diff -Nru ruby-hdfeos5-1.2/debian/changelog ruby-hdfeos5-1.2/debian/changelog
--- ruby-hdfeos5-1.2/debian/changelog	2014-07-22 20:46:48.000000000 +0200
+++ ruby-hdfeos5-1.2/debian/changelog	2014-07-26 18:26:51.000000000 +0200
@@ -1,3 +1,13 @@
+ruby-hdfeos5 (1.2-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Support hdf5 1.8.13 new packaging layout.
+  * New patch 0004-hdf5-dir.patch to hard code parameter
+    --with-hdf5-dir to extconf.rb, because dh_ruby doesn't allow
+    passing extra parameters.
+
+ -- Gilles Filippini <p...@debian.org>  Sat, 26 Jul 2014 16:47:19 +0200
+
 ruby-hdfeos5 (1.2-2) unstable; urgency=medium
 
   * Fix FTBFS: add multiarch search path (Closes: #753188)
diff -Nru ruby-hdfeos5-1.2/debian/patches/0004-hdf5-dir.patch ruby-hdfeos5-1.2/debian/patches/0004-hdf5-dir.patch
--- ruby-hdfeos5-1.2/debian/patches/0004-hdf5-dir.patch	1970-01-01 01:00:00.000000000 +0100
+++ ruby-hdfeos5-1.2/debian/patches/0004-hdf5-dir.patch	2014-07-26 18:17:47.000000000 +0200
@@ -0,0 +1,10 @@
+Index: ruby-hdfeos5-1.2/extconf.rb
+===================================================================
+--- ruby-hdfeos5-1.2.orig/extconf.rb	2014-07-26 18:17:18.871956985 +0200
++++ ruby-hdfeos5-1.2/extconf.rb	2014-07-26 18:17:45.180828598 +0200
+@@ -1,4 +1,5 @@
+ require "mkmf"
++$configure_args["--with-hdf5-dir"] = ENV["HDF5_DIR"]
+ 
+ require "rbconfig" unless defined? RbConfig
+ $vendorarchdir=RbConfig::CONFIG['vendorarchdir']
diff -Nru ruby-hdfeos5-1.2/debian/patches/series ruby-hdfeos5-1.2/debian/patches/series
--- ruby-hdfeos5-1.2/debian/patches/series	2014-07-22 20:46:48.000000000 +0200
+++ ruby-hdfeos5-1.2/debian/patches/series	2014-07-26 18:26:19.000000000 +0200
@@ -1,3 +1,4 @@
 0001-Fix-NArray-Library-Path.patch
 0002-Fix-test-data-path.patch
 0003-Fix-printf-debugging.patch
+0004-hdf5-dir.patch
diff -Nru ruby-hdfeos5-1.2/debian/rules ruby-hdfeos5-1.2/debian/rules
--- ruby-hdfeos5-1.2/debian/rules	2014-07-22 20:46:48.000000000 +0200
+++ ruby-hdfeos5-1.2/debian/rules	2014-07-31 18:26:13.000000000 +0200
@@ -1,5 +1,11 @@
 #!/usr/bin/make -f
 
+ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so),)
+  export HDF5_DIR := /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial
+else
+  export HDF5_DIR := /usr
+endif
+
 %:
 	dh $@ --with ruby --buildsystem ruby
 
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to