Bug#710615: openmeeg: FTBFS: MatlabIO.H:116:100: error: 'BY_NAME' was not declared in this scope

2013-06-19 Thread Sébastien Villemot
Control: tags -1 + patch pending

Dear Maintainer,

Le vendredi 31 mai 2013 à 23:36 +0200, David Suárez a écrit :
 Source: openmeeg
 Version: 2.0.0.dfsg-5
 Severity: serious
 Tags: jessie sid
 User: debian...@lists.debian.org
 Usertags: qa-ftbfs-20130529 qa-ftbfs
 Justification: FTBFS on amd64

 During a rebuild of all packages in sid, your package failed to build on
 amd64.

I have uploaded to DELAYED/2 a NMU fixing this bug and versioned
2.0.0.dfsg-5.1. Feel free to tell me if I should delay it longer. The
debdiff is attached.

Cheers,

-- 
 .''`.Sébastien Villemot
: :' :Debian Developer
`. `' http://www.dynare.org/sebastien
  `-  GPG Key: 4096R/381A7594

diff -Nru openmeeg-2.0.0.dfsg/debian/changelog openmeeg-2.0.0.dfsg/debian/changelog
--- openmeeg-2.0.0.dfsg/debian/changelog	2012-06-25 19:02:02.0 +0200
+++ openmeeg-2.0.0.dfsg/debian/changelog	2013-06-19 12:55:06.0 +0200
@@ -1,3 +1,15 @@
+openmeeg (2.0.0.dfsg-5.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Adapt for API changes in MatIO 1.5
++ debian/patches/matio_1.5: new patch
++ debian/control: add versioned build dependency on libmatio-dev
+(Closes: #706804)
+  * debian/patches/cmake_clean: new patch, fixes FTBFS with recent versions of
+cmake
+
+ -- Sébastien Villemot sebast...@debian.org  Wed, 19 Jun 2013 12:53:37 +0200
+
 openmeeg (2.0.0.dfsg-5) unstable; urgency=low
 
   * debian/rules:
diff -Nru openmeeg-2.0.0.dfsg/debian/control openmeeg-2.0.0.dfsg/debian/control
--- openmeeg-2.0.0.dfsg/debian/control	2012-06-25 19:02:02.0 +0200
+++ openmeeg-2.0.0.dfsg/debian/control	2013-06-19 12:53:27.0 +0200
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: NeuroDebian Team t...@neuro.debian.net
 Uploaders: Yaroslav Halchenko deb...@onerussian.com, Michael Hanke michael.ha...@gmail.com
-Build-Depends: debhelper (= 7.0.50~), cmake, doxygen, python-numpy, swig, python-dev (= 2.4), python-support (= 0.6), libatlas-base-dev, libvtk5-dev, libtiff4-dev | libtiff-dev, libmatio-dev
+Build-Depends: debhelper (= 7.0.50~), cmake, doxygen, python-numpy, swig, python-dev (= 2.4), python-support (= 0.6), libatlas-base-dev, libvtk5-dev, libtiff4-dev | libtiff-dev, libmatio-dev (= 1.5)
 Standards-Version: 3.9.3
 Homepage: http://www-sop.inria.fr/odyssee/software/OpenMEEG/
 Vcs-Browser: http://git.debian.org/?p=pkg-exppsy/openmeeg.git
diff -Nru openmeeg-2.0.0.dfsg/debian/patches/cmake_clean openmeeg-2.0.0.dfsg/debian/patches/cmake_clean
--- openmeeg-2.0.0.dfsg/debian/patches/cmake_clean	1970-01-01 01:00:00.0 +0100
+++ openmeeg-2.0.0.dfsg/debian/patches/cmake_clean	2013-06-19 12:51:31.0 +0200
@@ -0,0 +1,16 @@
+Description: Fix REMOVE_DUPLICATES rule in cmake file
+Author: Sébastien Villemot sebast...@debian.org
+Forwarded: no
+Last-Update: 2013-06-19
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/tests/clean_tests.cmake
 b/tests/clean_tests.cmake
+@@ -1,6 +1,6 @@
+ FILE(GLOB OLD_FILES ${CMAKE_CURRENT_BINARY_DIR}/../tests/Head*)
+ SET(TMP_FILE Head-tmp.txt)
+ LIST(APPEND OLD_FILES ${OLD_FILES} ${TMP_FILE})
+-LIST(REMOVE_DUPLICATES OLD_FILES ${OLD_FILES})
++LIST(REMOVE_DUPLICATES OLD_FILES)
+ EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E touch ${TMP_FILE})
+ EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E remove -f ${OLD_FILES})
diff -Nru openmeeg-2.0.0.dfsg/debian/patches/matio_1.5 openmeeg-2.0.0.dfsg/debian/patches/matio_1.5
--- openmeeg-2.0.0.dfsg/debian/patches/matio_1.5	1970-01-01 01:00:00.0 +0100
+++ openmeeg-2.0.0.dfsg/debian/patches/matio_1.5	2013-06-19 12:53:12.0 +0200
@@ -0,0 +1,107 @@
+Description: Adapt for API changes in MatIO 1.5
+ See the PDF in package libmatio-doc for description of the API changes.
+Author: Sébastien Villemot sebast...@debian.org
+Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=706804
+Forwarded: no
+Last-Update: 2013-06-19
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/libs/MatLib/MatLib/MatlabIO.H
 b/libs/MatLib/MatLib/MatlabIO.H
+@@ -56,8 +56,8 @@
+ template 
+ struct helperVector {
+ static const int dim = 1;
+-static int* dims(const Vector m) {
+-static int dims[1];
++static size_t* dims(const Vector m) {
++static size_t dims[1];
+ dims[0] = m.nlin();
+ return dims;
+ }
+@@ -77,8 +77,8 @@
+ template 
+ struct helperMatrix {
+ static const int dim = 2;
+-static int* dims(const Matrix m) {
+-static int dims[2];
++static size_t* dims(const Matrix m) {
++static size_t dims[2];
+ dims[0] = m.nlin();
+ dims[1] = m.ncol();
+ return dims;
+@@ -113,7 +113,7 @@
+ static const void* size = size;
+ 

Bug#710615: openmeeg: FTBFS: MatlabIO.H:116:100: error: 'BY_NAME' was not declared in this scope

2013-06-19 Thread Yaroslav Halchenko
Thank you Sebastien,

if any urge -- feel free to upload without delay

Cheers,

On Wed, 19 Jun 2013, Sébastien Villemot wrote:

 Control: tags -1 + patch pending

 Dear Maintainer,

 Le vendredi 31 mai 2013 à 23:36 +0200, David Suárez a écrit :
  Source: openmeeg
  Version: 2.0.0.dfsg-5
  Severity: serious
  Tags: jessie sid
  User: debian...@lists.debian.org
  Usertags: qa-ftbfs-20130529 qa-ftbfs
  Justification: FTBFS on amd64

  During a rebuild of all packages in sid, your package failed to build on
  amd64.

 I have uploaded to DELAYED/2 a NMU fixing this bug and versioned
 2.0.0.dfsg-5.1. Feel free to tell me if I should delay it longer. The
 debdiff is attached.

 Cheers,
-- 
Yaroslav O. Halchenko, Ph.D.
http://neuro.debian.net http://www.pymvpa.org http://www.fail2ban.org
Senior Research Associate, Psychological and Brain Sciences Dept.
Dartmouth College, 419 Moore Hall, Hinman Box 6207, Hanover, NH 03755
Phone: +1 (603) 646-9834   Fax: +1 (603) 646-1419
WWW:   http://www.linkedin.com/in/yarik


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#710615: openmeeg: FTBFS: MatlabIO.H:116:100: error: 'BY_NAME' was not declared in this scope

2013-06-02 Thread Andrey Rahmatullin
Control: tags -1 + upstream

On Fri, May 31, 2013 at 11:36:28PM +0200, David Suárez wrote:
  /«PKGBUILDDIR»/libs/MatLib/MatLib/MatlabIO.H: In static member function 
  'static matvar_t* 
  OpenMEEG::maths::details::helperOpenMEEG::SymMatrix::set_type(matvar_t*, 
  OpenMEEG::LinOpInfo)':
  /«PKGBUILDDIR»/libs/MatLib/MatLib/MatlabIO.H:116:100: error: 'BY_NAME' was 
  not declared in this scope
Looks like BY_NAME was renamed to MAT_BY_NAME between libmatio-dev 1.3.4-4
and 1.5.1-1.

-- 
WBR, wRAR


signature.asc
Description: Digital signature


Bug#710615: openmeeg: FTBFS: MatlabIO.H:116:100: error: 'BY_NAME' was not declared in this scope

2013-06-01 Thread David Suárez
Source: openmeeg
Version: 2.0.0.dfsg-5
Severity: serious
Tags: jessie sid
User: debian...@lists.debian.org
Usertags: qa-ftbfs-20130529 qa-ftbfs
Justification: FTBFS on amd64

Hi,

During a rebuild of all packages in sid, your package failed to build on
amd64.

Relevant part:
 make[3]: Entering directory `/«PKGBUILDDIR»/obj-x86_64-linux-gnu'
 /usr/bin/cmake -E cmake_progress_report 
 /«PKGBUILDDIR»/obj-x86_64-linux-gnu/CMakeFiles 12
 [  2%] Building CXX object 
 libs/MatLib/MatLib/CMakeFiles/OpenMEEGMaths.dir/vector.cpp.o
 cd /«PKGBUILDDIR»/obj-x86_64-linux-gnu/libs/MatLib/MatLib  /usr/bin/c++   
 -DOpenMEEGMaths_EXPORTS -O2 -g -DNDEBUG -fPIC 
 -I/«PKGBUILDDIR»/contrib/matio/src -I/«PKGBUILDDIR»/contrib/matio/zlib 
 -I/«PKGBUILDDIR»/obj-x86_64-linux-gnu/contrib/matio/src 
 -I/«PKGBUILDDIR»/obj-x86_64-linux-gnu/contrib/matio/zlib -I/usr/include/atlas 
 -I/«PKGBUILDDIR»/obj-x86_64-linux-gnu -I/«PKGBUILDDIR» -I/«PKGBUILDDIR»/src 
 -I/«PKGBUILDDIR»/libs/MatLib/MatLib-o 
 CMakeFiles/OpenMEEGMaths.dir/vector.cpp.o -c 
 /«PKGBUILDDIR»/libs/MatLib/MatLib/vector.cpp
 /usr/bin/cmake -E cmake_progress_report 
 /«PKGBUILDDIR»/obj-x86_64-linux-gnu/CMakeFiles 13
 [  4%] Building CXX object 
 libs/MatLib/MatLib/CMakeFiles/OpenMEEGMaths.dir/matrix.cpp.o
 cd /«PKGBUILDDIR»/obj-x86_64-linux-gnu/libs/MatLib/MatLib  /usr/bin/c++   
 -DOpenMEEGMaths_EXPORTS -O2 -g -DNDEBUG -fPIC 
 -I/«PKGBUILDDIR»/contrib/matio/src -I/«PKGBUILDDIR»/contrib/matio/zlib 
 -I/«PKGBUILDDIR»/obj-x86_64-linux-gnu/contrib/matio/src 
 -I/«PKGBUILDDIR»/obj-x86_64-linux-gnu/contrib/matio/zlib -I/usr/include/atlas 
 -I/«PKGBUILDDIR»/obj-x86_64-linux-gnu -I/«PKGBUILDDIR» -I/«PKGBUILDDIR»/src 
 -I/«PKGBUILDDIR»/libs/MatLib/MatLib-o 
 CMakeFiles/OpenMEEGMaths.dir/matrix.cpp.o -c 
 /«PKGBUILDDIR»/libs/MatLib/MatLib/matrix.cpp
 /usr/bin/cmake -E cmake_progress_report 
 /«PKGBUILDDIR»/obj-x86_64-linux-gnu/CMakeFiles 14
 [  6%] Building CXX object 
 libs/MatLib/MatLib/CMakeFiles/OpenMEEGMaths.dir/symmatrix.cpp.o
 cd /«PKGBUILDDIR»/obj-x86_64-linux-gnu/libs/MatLib/MatLib  /usr/bin/c++   
 -DOpenMEEGMaths_EXPORTS -O2 -g -DNDEBUG -fPIC 
 -I/«PKGBUILDDIR»/contrib/matio/src -I/«PKGBUILDDIR»/contrib/matio/zlib 
 -I/«PKGBUILDDIR»/obj-x86_64-linux-gnu/contrib/matio/src 
 -I/«PKGBUILDDIR»/obj-x86_64-linux-gnu/contrib/matio/zlib -I/usr/include/atlas 
 -I/«PKGBUILDDIR»/obj-x86_64-linux-gnu -I/«PKGBUILDDIR» -I/«PKGBUILDDIR»/src 
 -I/«PKGBUILDDIR»/libs/MatLib/MatLib-o 
 CMakeFiles/OpenMEEGMaths.dir/symmatrix.cpp.o -c 
 /«PKGBUILDDIR»/libs/MatLib/MatLib/symmatrix.cpp
 /usr/bin/cmake -E cmake_progress_report 
 /«PKGBUILDDIR»/obj-x86_64-linux-gnu/CMakeFiles 15
 [  8%] Building CXX object 
 libs/MatLib/MatLib/CMakeFiles/OpenMEEGMaths.dir/sparse_matrix.cpp.o
 cd /«PKGBUILDDIR»/obj-x86_64-linux-gnu/libs/MatLib/MatLib  /usr/bin/c++   
 -DOpenMEEGMaths_EXPORTS -O2 -g -DNDEBUG -fPIC 
 -I/«PKGBUILDDIR»/contrib/matio/src -I/«PKGBUILDDIR»/contrib/matio/zlib 
 -I/«PKGBUILDDIR»/obj-x86_64-linux-gnu/contrib/matio/src 
 -I/«PKGBUILDDIR»/obj-x86_64-linux-gnu/contrib/matio/zlib -I/usr/include/atlas 
 -I/«PKGBUILDDIR»/obj-x86_64-linux-gnu -I/«PKGBUILDDIR» -I/«PKGBUILDDIR»/src 
 -I/«PKGBUILDDIR»/libs/MatLib/MatLib-o 
 CMakeFiles/OpenMEEGMaths.dir/sparse_matrix.cpp.o -c 
 /«PKGBUILDDIR»/libs/MatLib/MatLib/sparse_matrix.cpp
 /usr/bin/cmake -E cmake_progress_report 
 /«PKGBUILDDIR»/obj-x86_64-linux-gnu/CMakeFiles 16
 [ 10%] Building CXX object 
 libs/MatLib/MatLib/CMakeFiles/OpenMEEGMaths.dir/fast_sparse_matrix.cpp.o
 cd /«PKGBUILDDIR»/obj-x86_64-linux-gnu/libs/MatLib/MatLib  /usr/bin/c++   
 -DOpenMEEGMaths_EXPORTS -O2 -g -DNDEBUG -fPIC 
 -I/«PKGBUILDDIR»/contrib/matio/src -I/«PKGBUILDDIR»/contrib/matio/zlib 
 -I/«PKGBUILDDIR»/obj-x86_64-linux-gnu/contrib/matio/src 
 -I/«PKGBUILDDIR»/obj-x86_64-linux-gnu/contrib/matio/zlib -I/usr/include/atlas 
 -I/«PKGBUILDDIR»/obj-x86_64-linux-gnu -I/«PKGBUILDDIR» -I/«PKGBUILDDIR»/src 
 -I/«PKGBUILDDIR»/libs/MatLib/MatLib-o 
 CMakeFiles/OpenMEEGMaths.dir/fast_sparse_matrix.cpp.o -c 
 /«PKGBUILDDIR»/libs/MatLib/MatLib/fast_sparse_matrix.cpp
 /usr/bin/cmake -E cmake_progress_report 
 /«PKGBUILDDIR»/obj-x86_64-linux-gnu/CMakeFiles 17
 [ 12%] Building CXX object 
 libs/MatLib/MatLib/CMakeFiles/OpenMEEGMaths.dir/MathsIO.C.o
 cd /«PKGBUILDDIR»/obj-x86_64-linux-gnu/libs/MatLib/MatLib  /usr/bin/c++   
 -DOpenMEEGMaths_EXPORTS -O2 -g -DNDEBUG -fPIC 
 -I/«PKGBUILDDIR»/contrib/matio/src -I/«PKGBUILDDIR»/contrib/matio/zlib 
 -I/«PKGBUILDDIR»/obj-x86_64-linux-gnu/contrib/matio/src 
 -I/«PKGBUILDDIR»/obj-x86_64-linux-gnu/contrib/matio/zlib -I/usr/include/atlas 
 -I/«PKGBUILDDIR»/obj-x86_64-linux-gnu -I/«PKGBUILDDIR» -I/«PKGBUILDDIR»/src 
 -I/«PKGBUILDDIR»/libs/MatLib/MatLib-o 
 CMakeFiles/OpenMEEGMaths.dir/MathsIO.C.o -c 
 /«PKGBUILDDIR»/libs/MatLib/MatLib/MathsIO.C
 /usr/bin/cmake -E cmake_progress_report 
 /«PKGBUILDDIR»/obj-x86_64-linux-gnu/CMakeFiles 18
 [ 14%] Building CXX object 
 libs/MatLib/MatLib/CMakeFiles/OpenMEEGMaths.dir/MatlabIO.C.o
 cd