r46824 - in /packages/ngsolve/trunk/debian: changelog compat control patches/configure.diff patches/g++-4.7.patch patches/series patches/shlibs.diff source/ source/format
trophime-guest at users.alioth.debian.org
trophime-guest at users.alioth.debian.org
Thu Jul 17 13:15:33 UTC 2014
Author: trophime-guest
Date: Thu Jul 17 13:15:33 2014
New Revision: 46824
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46824
Log:
start working on 5.1
Added:
packages/ngsolve/trunk/debian/patches/g++-4.7.patch
packages/ngsolve/trunk/debian/source/
packages/ngsolve/trunk/debian/source/format
Modified:
packages/ngsolve/trunk/debian/changelog
packages/ngsolve/trunk/debian/compat
packages/ngsolve/trunk/debian/control
packages/ngsolve/trunk/debian/patches/configure.diff
packages/ngsolve/trunk/debian/patches/series
packages/ngsolve/trunk/debian/patches/shlibs.diff
Modified: packages/ngsolve/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/ngsolve/trunk/debian/changelog?rev=46824&op=diff
==============================================================================
--- packages/ngsolve/trunk/debian/changelog (original)
+++ packages/ngsolve/trunk/debian/changelog Thu Jul 17 13:15:33 2014
@@ -1,3 +1,15 @@
+ngsolve (5.1-1) unstable; urgency=medium
+
+ * Newupstream release
+
+ -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr> Thu, 17 Jul 2014 15:12:32 +0200
+
+ngsolve (4.9.13-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr> Tue, 28 Aug 2012 17:11:20 +0200
+
ngsolve (4.9.12-1) unstable; urgency=low
* debian/control: change libnetgen-dev to libnglib-dev
Modified: packages/ngsolve/trunk/debian/compat
URL: http://svn.debian.org/wsvn/debian-science/packages/ngsolve/trunk/debian/compat?rev=46824&op=diff
==============================================================================
--- packages/ngsolve/trunk/debian/compat (original)
+++ packages/ngsolve/trunk/debian/compat Thu Jul 17 13:15:33 2014
@@ -1 +1 @@
-7
+9
Modified: packages/ngsolve/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/ngsolve/trunk/debian/control?rev=46824&op=diff
==============================================================================
--- packages/ngsolve/trunk/debian/control (original)
+++ packages/ngsolve/trunk/debian/control Thu Jul 17 13:15:33 2014
@@ -2,8 +2,13 @@
Section: math
Priority: extra
Maintainer: Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>
-Build-Depends: cdbs, debhelper (>= 7), quilt, autotools-dev, automake, libtool, g++ (>= 4.0), gfortran (>= 4.0), libnglib-dev, libblas-dev | libblas-3gf.so, liblapack-dev | liblapack-3gf.so, libmumps-seq-dev, tcl8.5-dev
-Standards-Version: 3.8.4
+Build-Depends: cdbs, debhelper (>= 9), quilt,
+ autotools-dev, automake, libtool,
+ g++ (>= 4.0), gfortran (>= 4.0),
+ libnglib-dev (>= 5.1~),
+ libblas-dev | libblas-3gf.so, liblapack-dev | liblapack-3gf.so,
+ libmumps-seq-dev, tcl8.6-dev
+Standards-Version: 3.9.5
Homepage: http://sourceforge.net/projects/ngsolve/
Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/ngsolve
Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/ngsolve
Modified: packages/ngsolve/trunk/debian/patches/configure.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/ngsolve/trunk/debian/patches/configure.diff?rev=46824&op=diff
==============================================================================
--- packages/ngsolve/trunk/debian/patches/configure.diff (original)
+++ packages/ngsolve/trunk/debian/patches/configure.diff Thu Jul 17 13:15:33 2014
@@ -1,10 +1,10 @@
-Index: ngsolve-4.9.12/configure.ac
+Index: ngsolve-4.9.13/configure.ac
===================================================================
---- ngsolve-4.9.12.orig/configure.ac 2010-07-06 16:31:45.000000000 +0200
-+++ ngsolve-4.9.12/configure.ac 2010-07-06 16:31:52.000000000 +0200
+--- ngsolve-4.9.13.orig/configure.ac 2010-05-20 23:07:36.000000000 +0200
++++ ngsolve-4.9.13/configure.ac 2012-08-31 09:32:19.000000000 +0200
@@ -71,7 +71,7 @@
AC_ARG_ENABLE([mumps],
- [ --enable-mumps enable sparse direct solver MUMPS],
+ [AC_HELP_STRING([--enable-mumps],[enable sparse direct solver MUMPS])],
[AC_SUBST([MUMPS_INCLUDES], ["-DUSE_MUMPS"])]
- [AC_SUBST([MUMPS_LIBS], ["-L/opt/netgen/lib -ldmumps -lzmumps -lmumps_common -lpord -lmpiseq -lgfortran"])]
+ [AC_SUBST([MUMPS_LIBS], ["-L/opt/netgen/lib -ldmumps -lzmumps -lmumps_common -lpord -lmpiseq_seq -lgfortran"])]
Added: packages/ngsolve/trunk/debian/patches/g++-4.7.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ngsolve/trunk/debian/patches/g%2B%2B-4.7.patch?rev=46824&op=file
==============================================================================
--- packages/ngsolve/trunk/debian/patches/g++-4.7.patch (added)
+++ packages/ngsolve/trunk/debian/patches/g++-4.7.patch Thu Jul 17 13:15:33 2014
@@ -0,0 +1,141 @@
+Index: ngsolve-4.9.13.obsolete.0.89850173921241/basiclinalg/expr.hpp
+===================================================================
+--- ngsolve-4.9.13.obsolete.0.89850173921241.orig/basiclinalg/expr.hpp 2012-08-31 10:04:46.000000000 +0200
++++ ngsolve-4.9.13.obsolete.0.89850173921241/basiclinalg/expr.hpp 2012-08-31 10:09:46.000000000 +0200
+@@ -1267,7 +1267,7 @@
+ int Height() const { return a.Width(); }
+ int Width() const { return a.Height(); }
+
+- TELEM operator() (int i, int j) const { return Trans (a(j,i)); }
++ TELEM operator() (int i, int j) const;
+ TELEM operator() (int i) const { return 0; }
+
+ enum { IS_LINEAR = 0 };
+@@ -1287,6 +1287,7 @@
+ template<int D, typename TAD>
+ inline AutoDiff<D,TAD> Trans (const AutoDiff<D,TAD> & a) { return a; }
+
++ template <class TA> typename TA::TELEM TransExpr<TA>::operator() (int i, int j) const { return Trans (a(j,i)); }
+
+ /* ************************* Conjugate *********************** */
+
+Index: ngsolve-4.9.13.obsolete.0.89850173921241/ngstd/array.hpp
+===================================================================
+--- ngsolve-4.9.13.obsolete.0.89850173921241.orig/ngstd/array.hpp 2010-05-03 09:30:27.000000000 +0200
++++ ngsolve-4.9.13.obsolete.0.89850173921241/ngstd/array.hpp 2012-08-31 10:14:59.000000000 +0200
+@@ -501,7 +501,7 @@
+ /// array copy
+ ArrayMem & operator= (const Array<T> & a2)
+ {
+- SetSize (a2.Size());
++ this->SetSize(a2.Size());
+ for (int i = 0; i < size; i++)
+ (*this)[i] = a2[i];
+ return *this;
+Index: ngsolve-4.9.13.obsolete.0.89850173921241/linalg/sparsematrix.cpp
+===================================================================
+--- ngsolve-4.9.13.obsolete.0.89850173921241.orig/linalg/sparsematrix.cpp 2010-05-03 12:10:48.000000000 +0200
++++ ngsolve-4.9.13.obsolete.0.89850173921241/linalg/sparsematrix.cpp 2012-08-31 10:27:43.000000000 +0200
+@@ -1128,7 +1128,7 @@
+
+ for (int i = 0; i < this->Height(); i++)
+ {
+- fy(i) += s * RowTimesVector (i, fx);
++ fy(i) += s * this->RowTimesVector (i, fx);
+ AddRowTransToVectorNoDiag (i, s * fx(i), fy);
+ }
+ }
+@@ -1165,7 +1165,7 @@
+ dynamic_cast<T_BaseVector<TV_COL> &> (y).FV();
+
+ for (int i = 0; i < this->Height(); i++)
+- AddRowTransToVector (i, s * fx(i), fy);
++ this->AddRowTransToVector (i, s * fx(i), fy);
+ }
+
+
+Index: ngsolve-4.9.13.obsolete.0.89850173921241/fem/recursive_pol.hpp
+===================================================================
+--- ngsolve-4.9.13.obsolete.0.89850173921241.orig/fem/recursive_pol.hpp 2010-01-08 18:54:46.000000000 +0100
++++ ngsolve-4.9.13.obsolete.0.89850173921241/fem/recursive_pol.hpp 2012-08-31 10:34:45.000000000 +0200
+@@ -344,6 +344,33 @@
+
+
+
++ template <class S, class T>
++ inline void JacobiPolynomial (int n, S x, double alpha, double beta, T & values)
++ {
++ S p1 = 1.0, p2 = 0.0, p3;
++
++ if (n >= 0)
++ p2 = values[0] = 1.0;
++ if (n >= 1)
++ p1 = values[1] = 0.5 * (2*(alpha+1)+(alpha+beta+2)*(x-1));
++
++ for (int i = 1; i < n; i++)
++ {
++ p3 = p2; p2=p1;
++ p1 =
++ 1.0 / ( 2 * (i+1) * (i+alpha+beta+1) * (2*i+alpha+beta) ) *
++ (
++ ( (2*i+alpha+beta+1)*(alpha*alpha-beta*beta) +
++ (2*i+alpha+beta)*(2*i+alpha+beta+1)*(2*i+alpha+beta+2) * x)
++ * p2
++ - 2*(i+alpha)*(i+beta) * (2*i+alpha+beta+2) * p3
++ );
++ values[i+1] = p1;
++ }
++ }
++
++
++
+
+
+
+@@ -846,33 +873,6 @@
+ }
+ }
+
+-
+-
+- template <class S, class T>
+- inline void JacobiPolynomial (int n, S x, double alpha, double beta, T & values)
+- {
+- S p1 = 1.0, p2 = 0.0, p3;
+-
+- if (n >= 0)
+- p2 = values[0] = 1.0;
+- if (n >= 1)
+- p1 = values[1] = 0.5 * (2*(alpha+1)+(alpha+beta+2)*(x-1));
+-
+- for (int i = 1; i < n; i++)
+- {
+- p3 = p2; p2=p1;
+- p1 =
+- 1.0 / ( 2 * (i+1) * (i+alpha+beta+1) * (2*i+alpha+beta) ) *
+- (
+- ( (2*i+alpha+beta+1)*(alpha*alpha-beta*beta) +
+- (2*i+alpha+beta)*(2*i+alpha+beta+1)*(2*i+alpha+beta+2) * x)
+- * p2
+- - 2*(i+alpha)*(i+beta) * (2*i+alpha+beta+2) * p3
+- );
+- values[i+1] = p1;
+- }
+- }
+-
+
+
+
+Index: ngsolve-4.9.13.obsolete.0.89850173921241/basiclinalg/cholesky.hpp
+===================================================================
+--- ngsolve-4.9.13.obsolete.0.89850173921241.orig/basiclinalg/cholesky.hpp 2009-08-10 13:44:01.000000000 +0200
++++ ngsolve-4.9.13.obsolete.0.89850173921241/basiclinalg/cholesky.hpp 2012-08-31 10:39:34.000000000 +0200
+@@ -74,7 +74,7 @@
+ public:
+ /// Factor the matrix A
+ CholeskyFactors (const FlatMatrix<T> & a)
+- : FlatCholeskyFactors<T> (a, new T[RequiredMem(a.Height())])
++ : FlatCholeskyFactors<T> (a, new T[this->RequiredMem(a.Height())])
+ { ; }
+ /// Delete memory
+ ~CholeskyFactors ()
Modified: packages/ngsolve/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/ngsolve/trunk/debian/patches/series?rev=46824&op=diff
==============================================================================
--- packages/ngsolve/trunk/debian/patches/series (original)
+++ packages/ngsolve/trunk/debian/patches/series Thu Jul 17 13:15:33 2014
@@ -1,3 +1,4 @@
+g++-4.7.patch
configure.diff
shlibs.diff
openmp.diff
Modified: packages/ngsolve/trunk/debian/patches/shlibs.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/ngsolve/trunk/debian/patches/shlibs.diff?rev=46824&op=diff
==============================================================================
--- packages/ngsolve/trunk/debian/patches/shlibs.diff (original)
+++ packages/ngsolve/trunk/debian/patches/shlibs.diff Thu Jul 17 13:15:33 2014
@@ -1,7 +1,7 @@
-Index: ngsolve-4.9.12/linalg/Makefile.am
+Index: ngsolve-4.9.13/linalg/Makefile.am
===================================================================
---- ngsolve-4.9.12.orig/linalg/Makefile.am 2010-07-06 16:39:54.000000000 +0200
-+++ ngsolve-4.9.12/linalg/Makefile.am 2010-07-06 16:40:15.000000000 +0200
+--- ngsolve-4.9.13.orig/linalg/Makefile.am 2009-08-10 13:44:01.000000000 +0200
++++ ngsolve-4.9.13/linalg/Makefile.am 2012-08-31 09:34:54.000000000 +0200
@@ -9,4 +9,5 @@
include_HEADERS = basematrix.hpp basevector.hpp blockjacobi.hpp cg.hpp chebyshev.hpp commutingAMG.hpp eigen.hpp jacobi.hpp la.hpp order.hpp pardisoinverse.hpp sparsecholesky.hpp sparsematrix.hpp special_matrix.hpp superluinverse.hpp mumpsinverse.hpp vvector.hpp
@@ -9,10 +9,10 @@
-libngla_la_LDFLAGS = -avoid-version $(MUMPS_LIBS)
+libngla_la_LDFLAGS = -release $(PACKAGE_VERSION)
+#-avoid-version $(MUMPS_LIBS)
-Index: ngsolve-4.9.12/comp/Makefile.am
+Index: ngsolve-4.9.13/comp/Makefile.am
===================================================================
---- ngsolve-4.9.12.orig/comp/Makefile.am 2010-07-06 16:39:54.000000000 +0200
-+++ ngsolve-4.9.12/comp/Makefile.am 2010-07-06 16:40:15.000000000 +0200
+--- ngsolve-4.9.13.orig/comp/Makefile.am 2009-08-24 05:06:32.000000000 +0200
++++ ngsolve-4.9.13/comp/Makefile.am 2012-08-31 09:34:54.000000000 +0200
@@ -19,4 +19,5 @@
postproc.hpp preconditioner.hpp vectorfacetfespace.hpp wirebasket.hpp
@@ -20,10 +20,10 @@
-libngcomp_la_LDFLAGS = -avoid-version
+libngcomp_la_LDFLAGS = -release $(PACKAGE_VERSION)
+#-avoid-version
-Index: ngsolve-4.9.12/fem/Makefile.am
+Index: ngsolve-4.9.13/fem/Makefile.am
===================================================================
---- ngsolve-4.9.12.orig/fem/Makefile.am 2010-07-06 16:39:54.000000000 +0200
-+++ ngsolve-4.9.12/fem/Makefile.am 2010-07-06 16:59:02.000000000 +0200
+--- ngsolve-4.9.13.orig/fem/Makefile.am 2010-03-16 19:41:10.000000000 +0100
++++ ngsolve-4.9.13/fem/Makefile.am 2012-08-31 09:34:54.000000000 +0200
@@ -8,7 +8,8 @@
libngfemng_la_CPPFLAGS = -I$(top_srcdir)/include $(NETGEN_INCLUDES) $(LAPACK_INCLUDES)
@@ -34,8 +34,8 @@
libngfemng_la_SOURCES = bdbequations.cpp recursive_pol_trig.cpp \
coefficient.cpp integrator.cpp specialelement.cpp elementtopology.cpp \
-@@ -20,7 +21,8 @@
- # pml.cpp
+@@ -19,7 +20,8 @@
+ recursive_pol.cpp hybridDG.cpp DGIntegrators.cpp pml.cpp
libngfem_la_CPPFLAGS = -I$(top_srcdir)/include $(LAPACK_INCLUDE)
-libngfem_la_LDFLAGS = -avoid-version
@@ -44,17 +44,10 @@
libngfem_la_SOURCES = bdbequations.cpp recursive_pol_trig.cpp \
coefficient.cpp integrator.cpp specialelement.cpp elementtopology.cpp \
-@@ -41,4 +43,4 @@
- scalarfe.hpp specialelement.hpp thdivfe.hpp tscalarfe.hpp \
- vectorfacetfe.hpp tscalarfe.cpp hdivlofe.hpp hdivhofefo.hpp
-
--# pml.hpp
-\ No newline at end of file
-+# pml.hpp
-Index: ngsolve-4.9.12/multigrid/Makefile.am
+Index: ngsolve-4.9.13/multigrid/Makefile.am
===================================================================
---- ngsolve-4.9.12.orig/multigrid/Makefile.am 2010-07-06 16:39:54.000000000 +0200
-+++ ngsolve-4.9.12/multigrid/Makefile.am 2010-07-06 16:40:15.000000000 +0200
+--- ngsolve-4.9.13.orig/multigrid/Makefile.am 2009-08-10 13:44:00.000000000 +0200
++++ ngsolve-4.9.13/multigrid/Makefile.am 2012-08-31 09:34:54.000000000 +0200
@@ -8,4 +8,5 @@
include_HEADERS = mgpre.hpp multigrid.hpp prolongation.hpp smoother.hpp
@@ -62,10 +55,10 @@
-libngmg_la_LDFLAGS = -avoid-version
+libngmg_la_LDFLAGS = -release $(PACKAGE_VERSION)
+#-avoid-version
-Index: ngsolve-4.9.12/ngstd/Makefile.am
+Index: ngsolve-4.9.13/ngstd/Makefile.am
===================================================================
---- ngsolve-4.9.12.orig/ngstd/Makefile.am 2010-07-06 16:39:54.000000000 +0200
-+++ ngsolve-4.9.12/ngstd/Makefile.am 2010-07-06 16:40:15.000000000 +0200
+--- ngsolve-4.9.13.orig/ngstd/Makefile.am 2009-08-10 13:43:57.000000000 +0200
++++ ngsolve-4.9.13/ngstd/Makefile.am 2012-08-31 09:34:54.000000000 +0200
@@ -19,4 +19,5 @@
localheap.hpp stringops.hpp
@@ -74,10 +67,10 @@
\ No newline at end of file
+libngstd_la_LDFLAGS = -release $(PACKAGE_VERSION)
+#-avoid-version
-Index: ngsolve-4.9.12/parallel/Makefile.am
+Index: ngsolve-4.9.13/parallel/Makefile.am
===================================================================
---- ngsolve-4.9.12.orig/parallel/Makefile.am 2010-07-06 16:39:54.000000000 +0200
-+++ ngsolve-4.9.12/parallel/Makefile.am 2010-07-06 16:40:15.000000000 +0200
+--- ngsolve-4.9.13.orig/parallel/Makefile.am 2009-08-10 13:43:59.000000000 +0200
++++ ngsolve-4.9.13/parallel/Makefile.am 2012-08-31 09:34:54.000000000 +0200
@@ -13,5 +13,6 @@
parallelngs.hpp superlu_dist.hpp
@@ -86,10 +79,10 @@
+libparallel_la_LDFLAGS = -release $(PACKAGE_VERSION)
+#-avoid-version
-Index: ngsolve-4.9.12/solve/Makefile.am
+Index: ngsolve-4.9.13/solve/Makefile.am
===================================================================
---- ngsolve-4.9.12.orig/solve/Makefile.am 2010-07-06 16:39:54.000000000 +0200
-+++ ngsolve-4.9.12/solve/Makefile.am 2010-07-06 16:40:15.000000000 +0200
+--- ngsolve-4.9.13.orig/solve/Makefile.am 2009-08-26 22:04:13.000000000 +0200
++++ ngsolve-4.9.13/solve/Makefile.am 2012-08-31 09:34:54.000000000 +0200
@@ -16,7 +16,8 @@
include_HEADERS = numproc.hpp pde.hpp solve.hpp
@@ -100,10 +93,10 @@
# libngsolve_la_LDFLAGS = -avoid-version -rdynamic
-Index: ngsolve-4.9.12/basiclinalg/Makefile.am
+Index: ngsolve-4.9.13/basiclinalg/Makefile.am
===================================================================
---- ngsolve-4.9.12.orig/basiclinalg/Makefile.am 2010-07-06 17:01:33.000000000 +0200
-+++ ngsolve-4.9.12/basiclinalg/Makefile.am 2010-07-06 17:01:48.000000000 +0200
+--- ngsolve-4.9.13.orig/basiclinalg/Makefile.am 2009-11-03 20:01:43.000000000 +0100
++++ ngsolve-4.9.13/basiclinalg/Makefile.am 2012-08-31 09:34:54.000000000 +0200
@@ -10,4 +10,5 @@
include_HEADERS = bandmatrix.hpp cholesky.hpp matrix.hpp ng_lapack.hpp \
vector.hpp bla.hpp expr.hpp symmetricmatrix.hpp arch.hpp clapack.h
Added: packages/ngsolve/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/debian-science/packages/ngsolve/trunk/debian/source/format?rev=46824&op=file
==============================================================================
--- packages/ngsolve/trunk/debian/source/format (added)
+++ packages/ngsolve/trunk/debian/source/format Thu Jul 17 13:15:33 2014
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the debian-science-commits
mailing list