r38655 - in /packages/libmesh/trunk/debian: ./ changelog control copyright patches/netcdf_support.patch patches/ripout_old_gnuc.patch patches/scotchmetis_support.patch patches/series patches/source.dfsg.patch rules
sylvestre at users.alioth.debian.org
sylvestre at users.alioth.debian.org
Tue Aug 2 23:00:39 UTC 2011
Author: sylvestre
Date: Tue Aug 2 23:00:39 2011
New Revision: 38655
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=38655
Log:
* Team upload
* New upstream release
- Use a more recent version of vtk (Closes: #577584)
* Update the dependency on libpetsc (Closes: #618233)
* doxygen-latex replaces doxygen and texlive-* dep (Closes: #616258)
* Standards-Version updated to version 3.9.2
* Package moved to Debian Science
* mpi-default-dev added a build dep (Closes: #576969)
* Switch to dpkg-source 3.0 (quilt) format
* old-fsf-address-in-copyright-file fixed
* debhelper-but-no-misc-depends fixed
* debian-rules-missing-recommended-target fixed
Modified:
packages/libmesh/trunk/debian/ (props changed)
packages/libmesh/trunk/debian/changelog
packages/libmesh/trunk/debian/control
packages/libmesh/trunk/debian/copyright
packages/libmesh/trunk/debian/patches/netcdf_support.patch
packages/libmesh/trunk/debian/patches/ripout_old_gnuc.patch
packages/libmesh/trunk/debian/patches/scotchmetis_support.patch
packages/libmesh/trunk/debian/patches/series
packages/libmesh/trunk/debian/patches/source.dfsg.patch
packages/libmesh/trunk/debian/rules
Propchange: packages/libmesh/trunk/debian/
------------------------------------------------------------------------------
mergeWithUpstream = 1
Modified: packages/libmesh/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/libmesh/trunk/debian/changelog?rev=38655&op=diff
==============================================================================
--- packages/libmesh/trunk/debian/changelog (original)
+++ packages/libmesh/trunk/debian/changelog Tue Aug 2 23:00:39 2011
@@ -1,3 +1,20 @@
+libmesh (0.7.1-1) unstable; urgency=low
+
+ * Team upload
+ * New upstream release
+ - Use a more recent version of vtk (Closes: #577584)
+ * Update the dependency on libpetsc (Closes: #618233)
+ * doxygen-latex replaces doxygen and texlive-* dep (Closes: #616258)
+ * Standards-Version updated to version 3.9.2
+ * Package moved to Debian Science
+ * mpi-default-dev added a build dep (Closes: #576969)
+ * Switch to dpkg-source 3.0 (quilt) format
+ * old-fsf-address-in-copyright-file fixed
+ * debhelper-but-no-misc-depends fixed
+ * debian-rules-missing-recommended-target fixed
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Tue, 02 Aug 2011 14:46:47 +0200
+
libmesh (0.6.4.dfsg-1) unstable; urgency=low
* New upstream (closes: #496143).
Modified: packages/libmesh/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/libmesh/trunk/debian/control?rev=38655&op=diff
==============================================================================
--- packages/libmesh/trunk/debian/control (original)
+++ packages/libmesh/trunk/debian/control Tue Aug 2 23:00:39 2011
@@ -1,20 +1,21 @@
Source: libmesh
Priority: extra
-Maintainer: Debian Scientific Computing Team <pkg-scicomp-devel at lists.alioth.debian.org>
-Uploaders: Christophe Prud'homme <prudhomm at debian.org>, Alan Woodland <ajw05 at aber.ac.uk>, "Adam C. Powell, IV" <hazelsct at debian.org>
+Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
+Uploaders: "Adam C. Powell, IV" <hazelsct at debian.org>, Christophe Prud'homme <prudhomm at debian.org>, Alan Woodland <ajw05 at aber.ac.uk>
XS-DM-Upload-Allowed: yes
Build-Depends: debhelper (>= 5), quilt, autotools-dev (>= 20070306.1), autoconf,
- libpetsc3.0.0-dev, libslepc3.0.0-dev, libscotchmetis-dev (>= 5.0.6-2),
- libblas-dev | libblas-3gf.so, libnetcdf-dev, libtbb-dev, libvtk5-dev
-Build-Depends-Indep: doxygen, graphviz, texlive-latex-base
-Standards-Version: 3.8.3
+ libpetsc3.1-dev, libslepc3.1-dev, libscotchmetis-dev (>= 5.0.6-2),
+ libblas-dev | libblas-3gf.so, libnetcdf-dev, libtbb-dev, libvtk5-dev, libtool,
+ automake, mpi-default-dev, enscript
+Build-Depends-Indep: graphviz, doxygen-latex
+Standards-Version: 3.9.2
Section: libs
Homepage: http://libmesh.sourceforge.net/
Package: libmesh-dev
Section: libdevel
Architecture: all
-Depends: libmesh0.6.4 (>= ${source:Version}), libpetsc3.0.0-dev, libslepc3.0.0-dev, libscotchmetis-dev (>= 5.0.6-2), libblas-dev | libblas-3gf.so, libnetcdf-dev, libtbb-dev, libvtk5-dev
+Depends: libmesh0.7.1 (>= ${binary:Version}), libpetsc3.0.0-dev, libslepc3.0.0-dev, libscotchmetis-dev (>= 5.0.6-2), libblas-dev | libblas-3gf.so, libnetcdf-dev, libtbb-dev, libvtk5-dev, ${misc:Depends}
Conflicts: libmesh0.6.1-dev, libmesh0.6.1-pure-dev, libmesh0.6.2-dev, libmesh0.6.2-pure-dev
Replaces: libmesh0.6.1-dev, libmesh0.6.1-pure-dev, libmesh0.6.2-dev, libmesh0.6.2-pure-dev
Suggests: libmesh-doc
@@ -30,10 +31,12 @@
This package contains the C++ header files and shared library links (only
needed for developing programs with libmesh).
-Package: libmesh0.6.4
+Package: libmesh0.7.1
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libmesh0.6.4
+Replaces: libmesh0.6.4
Description: libMesh - A C++ Finite Element Library
The libMesh library is a C++ framework for the numerical simulation of partial
differential equations on serial and parallel platforms. Development began in
@@ -48,6 +51,7 @@
Package: libmesh-doc
Section: doc
Architecture: all
+Depends: ${misc:Depends}
Suggests: libmesh-dev (>= ${source:Version}), dwww, libapache-mod-php5 | libapache2-mod-php5
Description: libMesh - A C++ Finite Element Library
The libMesh library is a C++ framework for the numerical simulation of partial
Modified: packages/libmesh/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-science/packages/libmesh/trunk/debian/copyright?rev=38655&op=diff
==============================================================================
--- packages/libmesh/trunk/debian/copyright (original)
+++ packages/libmesh/trunk/debian/copyright Tue Aug 2 23:00:39 2011
@@ -57,7 +57,7 @@
.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
.
On Debian systems, the complete text of the GNU Lesser General Public License
Version 2.1 (LGPL-2.1) can be found in file
Modified: packages/libmesh/trunk/debian/patches/netcdf_support.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/libmesh/trunk/debian/patches/netcdf_support.patch?rev=38655&op=diff
==============================================================================
--- packages/libmesh/trunk/debian/patches/netcdf_support.patch (original)
+++ packages/libmesh/trunk/debian/patches/netcdf_support.patch Tue Aug 2 23:00:39 2011
@@ -1,8 +1,8 @@
-Look for netcdf in the netcdf package places, not contrib.
-
---- libmesh-0.6.4.dfsg/libmesh/aclocal.m4~ 2008-06-10 22:34:12.000000000 +0000
-+++ libmesh-0.6.4.dfsg/libmesh/aclocal.m4 2008-06-10 22:36:20.000000000 +0000
-@@ -1481,8 +1481,8 @@
+Index: libmesh-0.7.1/libmesh/m4/netcdf.m4
+===================================================================
+--- libmesh-0.7.1.orig/libmesh/m4/netcdf.m4 2011-08-02 10:27:30.000000000 +0200
++++ libmesh-0.7.1/libmesh/m4/netcdf.m4 2011-08-02 10:27:43.000000000 +0200
+@@ -11,8 +11,8 @@
dnl where it might be installed...
if (test $enablenetcdf = yes); then
Modified: packages/libmesh/trunk/debian/patches/ripout_old_gnuc.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/libmesh/trunk/debian/patches/ripout_old_gnuc.patch?rev=38655&op=diff
==============================================================================
--- packages/libmesh/trunk/debian/patches/ripout_old_gnuc.patch (original)
+++ packages/libmesh/trunk/debian/patches/ripout_old_gnuc.patch Tue Aug 2 23:00:39 2011
@@ -1,7 +1,7 @@
-Remove old GNU C-related defines for doxygen to produce reasonable filenames.
-
---- libmesh-0.6.4.dfsg/libmesh/include/base/variant_filter_iterator.h~ 2008-08-15 21:31:24.000000000 +0000
-+++ libmesh-0.6.4.dfsg/libmesh/include/base/variant_filter_iterator.h 2008-10-03 18:11:51.000000000 +0000
+Index: libmesh-0.7.1/libmesh/include/base/variant_filter_iterator.h
+===================================================================
+--- libmesh-0.7.1.orig/libmesh/include/base/variant_filter_iterator.h 2011-08-02 10:30:16.000000000 +0200
++++ libmesh-0.7.1/libmesh/include/base/variant_filter_iterator.h 2011-08-02 10:31:02.000000000 +0200
@@ -26,10 +26,6 @@
#include <algorithm> // for std::swap
#include <cstdlib> // for std::abort()
@@ -10,10 +10,10 @@
-#include <typeinfo>
-#endif
-
+ #include "libmesh_common.h" // for libmesh_cast_ptr()
+
/**
- * Original Authors: Corwin Joy * Michael Gradman
- * cjoy at houston.rr.com * Michael.Gradman at caminus.com
-@@ -44,11 +40,7 @@
+@@ -46,11 +42,7 @@
* @author John W. Peterson, 2004.
*/
template<class Predicate, class Type, class ReferenceType = Type&, class PointerType = Type*>
@@ -25,31 +25,31 @@
{
public:
/**
-@@ -195,13 +187,8 @@
+@@ -198,13 +190,8 @@
*/
virtual bool equal(const IterBase *other) const
{
-#if defined(__SUNPRO_CC) || (defined(__GNUC__) && (__GNUC__ < 3) && !defined(__INTEL_COMPILER))
- const variant_filter_iterator::Iter<IterType>* p =
-- dynamic_cast<const variant_filter_iterator::Iter<IterType>*>(other);
+- libMesh::libmesh_cast_ptr<const variant_filter_iterator::Iter<IterType>*>(other);
-#else
const Iter<IterType>* p =
- dynamic_cast<const Iter<IterType>*>(other);
+ libMesh::libmesh_cast_ptr<const Iter<IterType>*>(other);
-#endif
- // Check for failed cast
- if (p == NULL)
- {
-@@ -287,13 +274,8 @@
+
+ return (iter_data == p->iter_data);
+ }
+@@ -284,13 +271,8 @@
libmesh_assert (in != NULL);
// Attempt downcast
-#if defined(__SUNPRO_CC) || (defined(__GNUC__) && (__GNUC__ < 3) && !defined(__INTEL_COMPILER))
- const variant_filter_iterator::Iter<IterType>* p =
-- dynamic_cast<const variant_filter_iterator::Iter<IterType>* >(in);
+- libMesh::libmesh_cast_ptr<const variant_filter_iterator::Iter<IterType>* >(in);
-#else
const Iter<IterType>* p =
- dynamic_cast<const Iter<IterType>* >(in);
+ libMesh::libmesh_cast_ptr<const Iter<IterType>* >(in);
-#endif
- // Check for failure
- if ( p == NULL )
+ // Return result of op() for the user's predicate.
+ return pred_data(p->iter_data);
Modified: packages/libmesh/trunk/debian/patches/scotchmetis_support.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/libmesh/trunk/debian/patches/scotchmetis_support.patch?rev=38655&op=diff
==============================================================================
--- packages/libmesh/trunk/debian/patches/scotchmetis_support.patch (original)
+++ packages/libmesh/trunk/debian/patches/scotchmetis_support.patch Tue Aug 2 23:00:39 2011
@@ -1,10 +1,12 @@
Look for metis includes and libs in the scotch metis package places.
---- libmesh-0.6.4.dfsg/libmesh/aclocal.m4~ 2008-08-15 21:32:24.000000000 +0000
-+++ libmesh-0.6.4.dfsg/libmesh/aclocal.m4 2008-08-22 19:11:31.000000000 +0000
-@@ -1190,11 +1190,11 @@
+Index: libmesh-0.7.1/libmesh/m4/metis.m4
+===================================================================
+--- libmesh-0.7.1.orig/libmesh/m4/metis.m4 2011-08-02 10:23:52.000000000 +0200
++++ libmesh-0.7.1/libmesh/m4/metis.m4 2011-08-02 10:24:49.000000000 +0200
+@@ -7,11 +7,11 @@
dnl -------------------------------------------------------------
- AC_DEFUN(CONFIGURE_METIS,
+ AC_DEFUN([CONFIGURE_METIS],
[
- AC_CHECK_FILE(./contrib/metis/Lib/metis.h,
+ AC_CHECK_FILE(/usr/include/metis/metis.h,
Modified: packages/libmesh/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/libmesh/trunk/debian/patches/series?rev=38655&op=diff
==============================================================================
--- packages/libmesh/trunk/debian/patches/series (original)
+++ packages/libmesh/trunk/debian/patches/series Tue Aug 2 23:00:39 2011
@@ -2,3 +2,5 @@
scotchmetis_support.patch
netcdf_support.patch
ripout_old_gnuc.patch
+wrong_path_doc.patch
+
Modified: packages/libmesh/trunk/debian/patches/source.dfsg.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/libmesh/trunk/debian/patches/source.dfsg.patch?rev=38655&op=diff
==============================================================================
--- packages/libmesh/trunk/debian/patches/source.dfsg.patch (original)
+++ packages/libmesh/trunk/debian/patches/source.dfsg.patch Tue Aug 2 23:00:39 2011
@@ -1,9 +1,10 @@
Remove make commands for non-free directories which are not here due to DFSG
restrictions.
-diff -Naru libmesh-0.6.4/libmesh/contrib/Makefile ../libmesh-0.6.2.dfsg/contrib/Makefile
---- libmesh-0.6.4/libmesh/contrib/Makefile 2007-12-03 11:10:44.000000000 -0300
-+++ ../libmesh-0.6.4.dfsg/libmesh/contrib/Makefile 2008-03-26 13:09:54.000000000 -0300
+Index: libmesh-0.7.1/libmesh/contrib/Makefile
+===================================================================
+--- libmesh-0.7.1.orig/libmesh/contrib/Makefile 2011-04-23 01:11:48.000000000 +0200
++++ libmesh-0.7.1/libmesh/contrib/Makefile 2011-08-02 10:17:50.000000000 +0200
@@ -3,30 +3,12 @@
#
all:
Modified: packages/libmesh/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/libmesh/trunk/debian/rules?rev=38655&op=diff
==============================================================================
--- packages/libmesh/trunk/debian/rules (original)
+++ packages/libmesh/trunk/debian/rules Tue Aug 2 23:00:39 2011
@@ -8,7 +8,7 @@
# from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-LIBMESH_VERSION=0.6.4
+LIBMESH_VERSION=0.7.1
# shared library versions, option 1
version=2.0.5
@@ -19,10 +19,10 @@
cp /usr/share/misc/config.guess libmesh/
cp /usr/share/misc/config.sub libmesh/
QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
- cd libmesh && autoconf
+ cd libmesh && libtoolize && autoreconf -I m4/
cd libmesh && PETSC_DIR=/usr/lib/petsc PETSC_ARCH=linux-gnu-c-opt \
SLEPC_DIR=/usr/lib/slepc \
- LDFLAGS=-Wl,-soname,libmesh.so.$(LIBMESH_VERSION),-lpetsc,-lpetscdm,-lpetscksp,-lpetscmat,-lpetscsnes,-lpetscvec,-lscotchmetis,-lblas-3gf,-ltbb,-ltbbmalloc,-lvtkIO,-lvtkCommon,-lvtkFiltering \
+ LDFLAGS=-Wl,-soname,libmesh.so.$(LIBMESH_VERSION),-lpetsc,-lpetscdm,-lpetscksp,-lpetscmat,-lpetscsnes,-lpetscvec,-lscotchmetis,-lblas,-ltbb,-ltbbmalloc,-lvtkIO,-lvtkCommon,-lvtkFiltering \
./configure --prefix=/usr \
--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
@@ -31,10 +31,10 @@
--disable-triangle --disable-exodus --disable-libHilbert \
--with-mpi=/usr --with-cxx=mpicxx --with-cc=mpicc --with-f77=mpif77\
--enable-second --enable-ifem --enable-metis --enable-perflog \
- --enable-vtk --with-vtk-include=/usr/include/vtk-5.2 --with-tbb=/usr
+ --enable-vtk --with-vtk-include=/usr/include/vtk-5.6 --with-tbb=/usr
-build: build-stamp
-build-stamp: libmesh/config.status
+build: build-arch
+build-arch: libmesh/config.status
dh_testdir
$(MAKE) -C libmesh
touch $@
@@ -47,7 +47,7 @@
clean:
dh_testdir
dh_testroot
- rm -f build-stamp
+ rm -f build-arch
QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
[ ! -f libmesh/Make.common ] || $(MAKE) -C libmesh distclean
@@ -74,14 +74,14 @@
mkdir -p $(meshdev)/usr/include/libmesh
cp libmesh/include/base/* libmesh/include/enums/* libmesh/include/error_estimation/* libmesh/include/fe/* libmesh/include/geom/* libmesh/include/mesh/* libmesh/include/numerics/* libmesh/include/parallel/* libmesh/include/partitioning/* libmesh/include/quadrature/* libmesh/include/solvers/* libmesh/include/utils/* $(meshdev)/usr/include/libmesh
rm $(meshdev)/usr/include/libmesh/libmesh_config.h.in
- rm $(meshdev)/usr/include/libmesh/libmesh_contrib_config.h.in
+ -rm $(meshdev)/usr/include/libmesh/libmesh_contrib_config.h.in
touch $@
# Build architecture-independent files here.
binary-indep: build-indep install-stamp
dh_testdir -i
dh_testroot -i
- dh_installchangelogs -i libmesh/ChangeLog
+ dh_installchangelogs -i libmesh/CHANGES
dh_installdocs -i
mv debian/libmesh-doc/usr/share/doc/libmesh-doc/man \
debian/libmesh-doc/usr/share/
@@ -106,7 +106,7 @@
binary-arch: build install-stamp
dh_testdir -a
dh_testroot -a
- dh_installchangelogs -a libmesh/ChangeLog
+ dh_installchangelogs -a libmesh/CHANGES
dh_installdocs -a
dh_installman -a
dh_link -a
More information about the debian-science-commits
mailing list