Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package getfem++
it fixes the RC-Bug #693567 and a minor one #680549
The diff is attached.
unblock getfem++/4.1.1+dfsg1-11
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)
Kernel: Linux 3.2.0-4-686-pae (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff --git a/debian/changelog b/debian/changelog
index 625f626..024967b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+getfem++ (4.1.1+dfsg1-11) unstable; urgency=low
+
+ [ Anton Gladky ]
+ * [2cba162] Add libmumps-dev to Depends of libgmm++-dev. (Closes: #680549)
+ * [f22dd56] Imported Upstream version 4.1.1+dfsg1. (Closes: #693567)
+
+ [ Sylvestre Ledru ]
+ * [0b9acd3] Add a missing header for Scilab build.
+
+ -- Anton Gladky <gladky.an...@gmail.com> Sat, 17 Nov 2012 22:44:01 +0100
+
getfem++ (4.1.1-10) unstable; urgency=low
* [da2d323] Fix FTBFS with gcc-4.7. Thanks to Philipp Büttgenbach.
diff --git a/debian/control b/debian/control
index 55ef618..7a93d5e 100644
--- a/debian/control
+++ b/debian/control
@@ -57,7 +57,7 @@ Description: Development files for the GETFEM++ generic finite element library
Package: libgmm++-dev
Section: libdevel
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, libmumps-dev
Description: Generic C++ template library for sparse, dense and skyline matrices
GMM++ is a framework of pre-defined methods for matrix computation. It is built
as a set of generic algorithms for any interfaced vector type or matrix type.
diff --git a/debian/patches/series b/debian/patches/series
index 50598df..ffdc602 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ addgetfempath.diff
ld-no-add-needed.patch
fix-gcc-4.7-ftbfs.patch
fix-gcc-4.7-ftbfs_part2.patch
+stream_redirect.diff
diff --git a/debian/patches/stream_redirect.diff b/debian/patches/stream_redirect.diff
new file mode 100644
index 0000000..e753060
--- /dev/null
+++ b/debian/patches/stream_redirect.diff
@@ -0,0 +1,108 @@
+Index: getfem/interface/src/scilab/sci_gateway/c/stream_redirect.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ getfem/interface/src/scilab/sci_gateway/c/stream_redirect.h 2012-11-17 16:54:43.115859494 +0100
+@@ -0,0 +1,103 @@
++/* -*- c++ -*- (enables emacs c++ mode) */
++/*========================================================================
++
++ Copyright (C) 2009-2011 Yann Collette
++
++ This file is a part of GETFEM++
++
++ Getfem++ is free software; you can redistribute it and/or modify
++ it under the terms of the GNU Lesser General Public License as
++ published by the Free Software Foundation; either version 2.1 of the
++ License, or (at your option) any later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU Lesser General Public License for more details.
++ You should have received a copy of the GNU Lesser General Public
++ License along with this program; if not, write to the Free Software
++ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
++ USA.
++
++ As a special exception, you may use this file as part of a free software
++ library without restriction. Specifically, if other files instantiate
++ templates or use macros or inline functions from this file, or you compile
++ this file and link it with other files to produce an executable, this
++ file does not by itself cause the resulting executable to be covered by
++ the GNU General Public License. This exception does not however
++ invalidate any other reasons why the executable file might be covered by
++ the GNU General Public License.
++
++ ========================================================================*/
++
++#ifndef STREAM_REDIRECT_H
++#define STREAM_REDIRECT_H
++
++#include <sciprint.h>
++
++#include <iostream>
++#include <streambuf>
++#include <string>
++
++//////////////////////////
++// For cout redirection //
++//////////////////////////
++
++class ScilabStream : public std::basic_streambuf<char>
++{
++public:
++ ScilabStream(std::ostream &stream) : m_stream(stream)
++ {
++ m_old_buf = stream.rdbuf();
++ stream.rdbuf(this);
++ }
++ ~ScilabStream()
++ {
++ // output anything that is left
++ if (!m_string.empty())
++ sciprint("symphony: %s\n",m_string.c_str());
++
++ m_stream.rdbuf(m_old_buf);
++ }
++
++protected:
++ virtual int_type overflow(int_type v)
++ {
++ if (v == EOF)
++ {
++ sciprint("symphony: %s\n",m_string.c_str());
++ m_string.clear();
++ }
++ else
++ m_string.push_back(v);
++
++ return v;
++ }
++
++ virtual std::streamsize xsputn(const char *p, std::streamsize n)
++ {
++ m_string.append(p, p + n);
++
++ int pos = 0;
++ while (pos != std::string::npos)
++ {
++ pos = m_string.find(EOF);
++ if (pos != std::string::npos)
++ {
++ std::string tmp(m_string.begin(), m_string.begin() + pos);
++ sciprint("symphony: %s\n",tmp.c_str());
++ m_string.erase(m_string.begin(), m_string.begin() + pos + 1);
++ }
++ }
++
++ return n;
++ }
++
++private:
++ std::ostream &m_stream;
++ std::streambuf *m_old_buf;
++ std::string m_string;
++};
++#endif
++
++
diff --git a/interface/src/scilab/sci_gateway/c/libscigetfem_c.so b/interface/src/scilab/sci_gateway/c/libscigetfem_c.so
deleted file mode 100755
index 7832984..0000000
Binary files a/interface/src/scilab/sci_gateway/c/libscigetfem_c.so and /dev/null differ
diff --git a/interface/src/scilab/src/c/libsp_get.so b/interface/src/scilab/src/c/libsp_get.so
deleted file mode 100755
index 2f141db..0000000
Binary files a/interface/src/scilab/src/c/libsp_get.so and /dev/null differ
