[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Pkg-octave-devel] Bug#756689: marked as done (octave: [hdf5 transition] please support hdf5 1.8.13 new packaging layout)

Your message dated Thu, 14 Aug 2014 12:04:37 +0000
with message-id <E1XHtll-0007nL-IL@franck.debian.org>
and subject line Bug#756689: fixed in octave 3.8.2-1
has caused the Debian Bug report #756689,
regarding octave: [hdf5 transition] please support hdf5 1.8.13 new packaging layout
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
756689: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=756689
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Source: octave
Version: 3.8.1-3
Severity: important
Tags: patch
User: pini@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

iQEcBAEBCAAGBQJT2sbvAAoJEO/obGx//s+Dj5sIAJsTeDsr95f3P6YzHPJIY8C6
Y0sLO3V8VzAYvXmXGZWW/cdVRR4M0cwuKcQ2Jb9NCvkwccI6kAFrJ7l9WR++r79T
aX6eJFc0U2ZhwfIj5WGwGGcJoOXY+46huYFjkdROwamSifQhVJkabvBrJ0NSuX0M
A1WQaSGbKa4p5Fvrgs6EJLyXCwfu4oTU7QV02yl3Y821WmOD0YJOBXa28YzNb/ty
fxlW6ZuTHnZpoQBvc+M6BpZVNG1EjSP6IfaMsO5JIRHMIqGyEhFVdyHui/fB0icB
y52w2vsMpNMYUB62YxlM/wS9EYRCXpKWS4u1LIGeCfoTsAMWTbpXKNTsA/ktJAk=
=xHe+
-----END PGP SIGNATURE-----

diff -Nru octave-3.8.1/debian/changelog octave-3.8.1/debian/changelog
--- octave-3.8.1/debian/changelog	2014-05-10 10:40:26.000000000 +0200
+++ octave-3.8.1/debian/changelog	2014-07-25 17:10:38.000000000 +0200
@@ -1,3 +1,12 @@
+octave (3.8.1-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Support hdf5 1.8.13 new packaging layout.
+  * New patch hdf5-flags.patch to fix a couple of makefiles regarding
+    new paths.
+
+ -- Gilles Filippini <pini@debian.org>  Fri, 25 Jul 2014 14:39:07 +0200
+
 octave (3.8.1-3) unstable; urgency=medium
 
   [ Thomas Weber ]
diff -Nru octave-3.8.1/debian/patches/hdf5-flags.patch octave-3.8.1/debian/patches/hdf5-flags.patch
--- octave-3.8.1/debian/patches/hdf5-flags.patch	1970-01-01 01:00:00.000000000 +0100
+++ octave-3.8.1/debian/patches/hdf5-flags.patch	2014-07-25 17:13:20.000000000 +0200
@@ -0,0 +1,24 @@
+Index: octave-3.8.1/libgui/src/module.mk
+===================================================================
+--- octave-3.8.1.orig/libgui/src/module.mk	2014-03-06 20:37:51.000000000 +0100
++++ octave-3.8.1/libgui/src/module.mk	2014-07-25 17:12:53.028220949 +0200
+@@ -172,6 +172,7 @@
+   $(AM_CPPFLAGS) \
+   @OCTGUI_DLL_DEFS@ \
+   @QT_CPPFLAGS@ \
++  @HDF5_CPPFLAGS@ \
+   -I$(srcdir)/qterminal/libqterminal \
+   -Isrc -I$(srcdir)/src \
+   -I$(srcdir)/src/m-editor \
+Index: octave-3.8.1/libinterp/Makefile.am
+===================================================================
+--- octave-3.8.1.orig/libinterp/Makefile.am	2014-07-25 14:38:24.000000000 +0200
++++ octave-3.8.1/libinterp/Makefile.am	2014-07-25 17:13:10.124810238 +0200
+@@ -22,6 +22,7 @@
+ 
+ ## Search local directories before those specified by the user.
+ AM_CPPFLAGS = \
++  @HDF5_CPPFLAGS@ \
+   -I$(top_srcdir)/liboctave/cruft/misc \
+   -I$(top_srcdir)/liboctave/array \
+   -I$(top_builddir)/liboctave/numeric -I$(top_srcdir)/liboctave/numeric \
diff -Nru octave-3.8.1/debian/patches/hdf5-mkoctfile.patch octave-3.8.1/debian/patches/hdf5-mkoctfile.patch
--- octave-3.8.1/debian/patches/hdf5-mkoctfile.patch	1970-01-01 01:00:00.000000000 +0100
+++ octave-3.8.1/debian/patches/hdf5-mkoctfile.patch	2014-07-27 21:33:04.000000000 +0200
@@ -0,0 +1,24 @@
+Description: Add hdf5 paths to CPPFLAGS and LDFLAGS in mkoctfile
+ so that packages build-depending on octave-dev don't have to care.
+Index: octave-3.8.1/src/mkoctfile.in.cc
+===================================================================
+--- octave-3.8.1.orig/src/mkoctfile.in.cc	2014-07-25 14:38:24.000000000 +0200
++++ octave-3.8.1/src/mkoctfile.in.cc	2014-07-27 18:47:49.439137810 +0200
+@@ -130,7 +130,7 @@
+   if (vars["LIBDIR"] != "/usr/lib")
+     DEFAULT_LFLAGS += " -L" + quote_path (vars["LIBDIR"]);
+ 
+-  vars["CPPFLAGS"] = get_variable ("CPPFLAGS", %OCTAVE_CONF_CPPFLAGS%);
++  vars["CPPFLAGS"] = get_variable ("CPPFLAGS", std::string(%OCTAVE_CONF_CPPFLAGS%) + " " + %OCTAVE_CONF_HDF5_CPPFLAGS%);
+   vars["INCFLAGS"] = get_variable ("INCFLAGS", DEFAULT_INCFLAGS);
+   vars["F77"] = get_variable ("F77", %OCTAVE_CONF_MKOCTFILE_F77%);
+   vars["FFLAGS"] = get_variable ("FFLAGS", %OCTAVE_CONF_FFLAGS%);
+@@ -182,7 +182,7 @@
+   vars["OCT_LINK_OPTS"] = get_variable ("OCT_LINK_OPTS",
+                                         %OCTAVE_CONF_OCT_LINK_OPTS%);
+   vars["LD_CXX"] = get_variable ("LD_CXX", %OCTAVE_CONF_MKOCTFILE_LD_CXX%);
+-  vars["LDFLAGS"] = get_variable ("LDFLAGS", %OCTAVE_CONF_LDFLAGS%);
++  vars["LDFLAGS"] = get_variable ("LDFLAGS", std::string(%OCTAVE_CONF_LDFLAGS%) + " " + %OCTAVE_CONF_HDF5_LDFLAGS%);
+   vars["LD_STATIC_FLAG"] = get_variable ("LD_STATIC_FLAG",
+                                          %OCTAVE_CONF_LD_STATIC_FLAG%);
+   vars["LFLAGS"] = get_variable ("LFLAGS", DEFAULT_LFLAGS);
diff -Nru octave-3.8.1/debian/patches/series octave-3.8.1/debian/patches/series
--- octave-3.8.1/debian/patches/series	2014-03-09 20:01:54.000000000 +0100
+++ octave-3.8.1/debian/patches/series	2014-07-27 21:30:47.000000000 +0200
@@ -7,3 +7,5 @@
 dblquad-s390x.diff
 hurd_path_max.diff
 always-build-octave-jar.patch
+hdf5-flags.patch
+hdf5-mkoctfile.patch
diff -Nru octave-3.8.1/debian/rules octave-3.8.1/debian/rules
--- octave-3.8.1/debian/rules	2014-05-10 10:40:01.000000000 +0200
+++ octave-3.8.1/debian/rules	2014-07-31 11:17:00.000000000 +0200
@@ -36,6 +36,12 @@
 # libraries, for example the mesa graphics stack which also uses LLVM.
 JIT_FLAG := --disable-jit
 
+# HDF5 paths
+ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so),)
+  HDF5_FLAGS := --with-hdf5-includedir=/usr/include/hdf5/serial \
+	--with-hdf5-libdir=/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial
+endif
+
 %:
 	dh $@ --with autoreconf --parallel
 
@@ -44,7 +50,7 @@
 
 # override normal dh_auto_configure call to pass OpenMP flag to it (#631831)
 override_dh_auto_configure:
-	dh_auto_configure -- --enable-openmp $(WITH_JAVA_FLAGS) $(JIT_FLAG)
+	dh_auto_configure -- --enable-openmp $(WITH_JAVA_FLAGS) $(JIT_FLAG) $(HDF5_FLAGS)
 
 # dh_auto_test tries to run "make test", so override it
 override_dh_auto_test:

--- End Message ---
--- Begin Message --- 
Source: octave
Source-Version: 3.8.2-1

We believe that the bug you reported is fixed in the latest version of
octave, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 756689@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Sébastien Villemot <sebastien@debian.org> (supplier of updated octave package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)


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

Format: 1.8
Date: Thu, 14 Aug 2014 12:19:21 +0200
Source: octave
Binary: octave octave-dbg octave-common octave-doc octave-htmldoc octave-info liboctave2 liboctave-dev
Architecture: source all
Version: 3.8.2-1
Distribution: unstable
Urgency: medium
Maintainer: Debian Octave Group <pkg-octave-devel@lists.alioth.debian.org>
Changed-By: Sébastien Villemot <sebastien@debian.org>
Description:
 liboctave-dev - Development files for the GNU Octave language
 liboctave2 - Shared libraries of the GNU Octave language
 octave     - GNU Octave language for numerical computations
 octave-common - architecture-independent files for octave
 octave-dbg - Debug symbols for octave
 octave-doc - PDF documentation on the GNU Octave language
 octave-htmldoc - HTML documentation on the GNU Octave language
 octave-info - GNU Info documentation on the GNU Octave language
Closes: 746924 755882 756689 757237
Changes:
 octave (3.8.2-1) unstable; urgency=medium
 .
   [ Sébastien Villemot ]
   * Imported Upstream version 3.8.2
     - statistics() function adapted to new signature of kurtosis() and
       skewness() functions. (Closes: #755882)
     - no longer pass -mieee flag to moc-qt4, should fix FTBFS on alpha.
       (Closes: #746924)
   * debian/copyright: reflect upstream changes.
   * Remove Thomas Weber from Uploaders. Thanks Thomas for your work!
   * Recommend OpenBLAS over ATLAS as the optimized BLAS library.
     OpenBLAS is a better default because its generic binary is able to
     dynamically select the kernel specialized for the current CPU, while ATLAS
     needs to be recompiled. However, OpenBLAS is not present on some
     architectures, so ATLAS will remain the default on those.
   * Allow virtual packages liblapack.so and libblas.so to satisfy dependencies
     of liboctave-dev. (Closes: #757237)
 .
   [ Gilles Filippini ]
   * Support hdf5 1.8.13 new packaging layout. (Closes: #756689)
     New patches:
     - hdf5-flags.patch to fix a couple of makefiles regarding
       new paths;
     - hdf5-mkoctfile.patch to fix hdf5 path when building octave
       modules.
Checksums-Sha1:
 2d189d00a2f20a96dce163ca072ea6c2ad3c98f3 2952 octave_3.8.2-1.dsc
 02c38e0f69bce4e6dd7be7d301898347085d9c2d 17834980 octave_3.8.2.orig.tar.bz2
 f7f524cf1a6b083c3c5d33295a71779059599448 58612 octave_3.8.2-1.debian.tar.xz
 84d2b604d975fef66265ff9c31fff84b4f3b0607 1379570 octave-common_3.8.2-1_all.deb
 6deda309e7c1bdfb4605b876acfa22a42918b5f7 3897982 octave-doc_3.8.2-1_all.deb
 acafcb9c20809ec7a279e7576e7c8c698c575b32 1749148 octave-htmldoc_3.8.2-1_all.deb
 0c5a99c3b49a2f77f6756d7414360cf5be767361 1070264 octave-info_3.8.2-1_all.deb
Checksums-Sha256:
 2521c21a3b56dd907e90e9ed6ff81218bf41cc4c42d28fca20aac0e1cf4af33f 2952 octave_3.8.2-1.dsc
 83bbd701aab04e7e57d0d5b8373dd54719bebb64ce0a850e69bf3d7454f33bae 17834980 octave_3.8.2.orig.tar.bz2
 91ced5bc569cfb4c8cfe1f2ba8fcfbe55693057bb554a7dbab68a295cdf4095b 58612 octave_3.8.2-1.debian.tar.xz
 2665b815fc841145b2740ea4a26acf917293f9a1e85933b6d9ba051eb45c65bc 1379570 octave-common_3.8.2-1_all.deb
 8a293b5c9019d9421580f143e5fab8de03c9911f252a0e2b40aa91db557a1818 3897982 octave-doc_3.8.2-1_all.deb
 5042a701e022ec51cd38181d1798b30280a4933f787cfeede8a72d0fd3e70e85 1749148 octave-htmldoc_3.8.2-1_all.deb
 61c377c6e922506d7ee51942c632569ae858e2aa74381466e93e92d960d38141 1070264 octave-info_3.8.2-1_all.deb
Files:
 4cb8030a385f3ad8576aeb328451d867 1379570 math optional octave-common_3.8.2-1_all.deb
 cffe1ab8b10a39b3a2955d1ca61be0cd 3897982 doc optional octave-doc_3.8.2-1_all.deb
 3807abea391ef61187007e43bce38db0 1749148 doc optional octave-htmldoc_3.8.2-1_all.deb
 43bc372e9561e7762cd4b331b268f6cd 1070264 doc optional octave-info_3.8.2-1_all.deb
 a93dee1ab7278e83c0550f2d97e8ca62 2952 math optional octave_3.8.2-1.dsc
 188bd97e22054f9c62701ee0e6800dc1 17834980 math optional octave_3.8.2.orig.tar.bz2
 7aca82671224b236623ad530862c57b7 58612 math optional octave_3.8.2-1.debian.tar.xz

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

iQIcBAEBCAAGBQJT7KJwAAoJECzs6TUOzr5KMAkQAJepewcaRUjxtAtKnP//hj9Q
Li7VWGSFG4uXUkURBeZMb8EdlSOUp/IrFaYNOzA9DOfKPu8/06xE2K/LDkrnnvAP
ubHJbzxm2wBc5OgZ0MgdEPOl7V8PcaO/MhSOjTFcdqwAUHfczDK8d2XviLNvgvbZ
lxI8Proc2b7BqwUGkhrv3tk8qyz/yqL1YsVVXr7pcAQDCJodMRDKylNnSH5R7/6W
03yYcWOzjHmrhwGX+pYktmHPjNFeK2H6YYCTzeGvhI/w/6CwloZ+KcbEkFUlgSd0
PEjmWAttY/+GiX6vO9rUpSrf3joTJd9w072IzdoXi8ykOMEElD7+SgfeEKCTQ8Jj
Z4ixYxjjVT81uACHhMA2HGkSEEsV64U32wtS8kGLAlj8I0OuSzAWc9ThrGvGmCeg
O2BhaYCsvSYT3q04Bt5tE9nxAvbuTfZ++xKgOIM6oo4QK2L0d+GT62YYLfBCHJ4J
VVRobGF6DxMcIwxHjWlGE/9CuDBpd8nEn78Si8uAlct9lznmSyU2avm4gaF6SJxA
CtSjkTxZlJJbBDWFxTLmlzTev/jlc0jnPoGsTGSzSRis1NE2tu+qNiXuJNjpSnvA
MQ7lwwyaZPpyojL7rZkQ2WUUkLBc17DgYcaKXky9xKlPfNWgelbMPVhlXC4hOiLX
uoLMnXCTPP3AcWVWXNr1
=Npir
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: