r38649 - in /packages/libmesh/trunk/debian: ./ patches/
sylvestre at users.alioth.debian.org
sylvestre at users.alioth.debian.org
Tue Aug 2 07:39:46 UTC 2011
Author: sylvestre
Date: Tue Aug 2 07:39:45 2011
New Revision: 38649
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=38649
Log:
Modifications from the package version
Added:
packages/libmesh/trunk/debian/README.source
packages/libmesh/trunk/debian/libmesh-doc.doc-base
packages/libmesh/trunk/debian/libmesh-doc.docs
packages/libmesh/trunk/debian/libmesh-doc.examples
packages/libmesh/trunk/debian/patches/source.dfsg.patch
Modified:
packages/libmesh/trunk/debian/README.Debian
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/rules
packages/libmesh/trunk/debian/watch
Modified: packages/libmesh/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/debian-science/packages/libmesh/trunk/debian/README.Debian?rev=38649&op=diff
==============================================================================
--- packages/libmesh/trunk/debian/README.Debian (original)
+++ packages/libmesh/trunk/debian/README.Debian Tue Aug 2 07:39:45 2011
@@ -1,8 +1,7 @@
libmesh for Debian
==================
-When developing with the libmesh library, install the
-"libmesh-dev" package.
+When developing with the libmesh library, install the "libmesh-dev" package.
How to compile your first project
---------------------------------
@@ -16,7 +15,7 @@
/usr/share/doc/libmesh-doc/examples/ into your working directory
- Run "make"
-It should just work (if not, please file a bug report using the reportbug).
+It should just work (if not, please file a bug report).
In many cases, it will run the compiled program, generating output.
Unfortunately, most of these examples come with post-processing output for
Added: packages/libmesh/trunk/debian/README.source
URL: http://svn.debian.org/wsvn/debian-science/packages/libmesh/trunk/debian/README.source?rev=38649&op=file
==============================================================================
--- packages/libmesh/trunk/debian/README.source (added)
+++ packages/libmesh/trunk/debian/README.source Tue Aug 2 07:39:45 2011
@@ -1,0 +1,3 @@
+Please refer to /usr/share/doc/quilt/README.source for information on how to
+manipulate the patches for this package, which are in the debian/patches
+directory.
Modified: packages/libmesh/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/libmesh/trunk/debian/changelog?rev=38649&op=diff
==============================================================================
--- packages/libmesh/trunk/debian/changelog (original)
+++ packages/libmesh/trunk/debian/changelog Tue Aug 2 07:39:45 2011
@@ -1,19 +1,19 @@
-libmesh (0.6.4.dfsg-1) UNRELEASED; urgency=low
+libmesh (0.6.4.dfsg-1) unstable; urgency=low
- [ Adam C. Powell, IV ]
- * Added libmesh-doc package with doxygen-generated .php files. I think they
- require a PHP-capable web server, so I have dwww and the Apache PHP module
- in Suggests.
- * In include/base/variant_filter_iterator.h, had to remove old GNU C-related
- defines for doxygen to produce reasonable filenames.
+ * New upstream (closes: #496143).
+ * Added libmesh-doc package with doxygen-generated .php documentation files
+ (closes: #496139).
+ * I think docs require a PHP-capable web server, so I have dwww and the
+ Apache PHP module in Suggests.
+ * Added README.source.
+ * Bumped Standards-Version.
+ * Changed petsc dependencies from 2.3.3 to 3.0.0 (closes: #529477, #534057).
+ * Uses new copyright format.
+ * Included QPL in copyright (closes: #513814).
+ * Removed Ondrej Certik from Uploaders list (closes: #550413).
+ * Added SLEPc support (closes: #491382).
- [ Sylvestre Ledru ]
- * New upstream release (fails with petsc 3.1)
- * Package moved to Debian Science
- * Standards-Version updated to version 3.9.1
- * Reupload against the current version of vtk (Closes: #577584)
-
- -- Sylvestre Ledru <sylvestre at debian.org> Sat, 09 Oct 2010 13:56:47 +0200
+ -- Adam C. Powell, IV <hazelsct at debian.org> Wed, 11 Nov 2009 14:34:41 -0500
libmesh (0.6.3.dfsg~rc1-1) unstable; urgency=low
Modified: packages/libmesh/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/libmesh/trunk/debian/control?rev=38649&op=diff
==============================================================================
--- packages/libmesh/trunk/debian/control (original)
+++ packages/libmesh/trunk/debian/control Tue Aug 2 07:39:45 2011
@@ -1,22 +1,22 @@
Source: libmesh
Priority: extra
-Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
-Uploaders: Christophe Prud'homme <prudhomm at debian.org>, Ondrej Certik <ondrej at certik.cz>, Alan Woodland <ajw05 at aber.ac.uk>, "Adam C. Powell, IV" <hazelsct at debian.org>
+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>
XS-DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 5), autotools-dev (>= 20070306.1), libpetsc3.0.0-dev, quilt (>= 0.46-4), autoconf, libscotchmetis-dev (>= 5.0.6-2), libvtk5-dev
+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.9.1
+Standards-Version: 3.8.3
Section: libs
Homepage: http://libmesh.sourceforge.net/
-Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/libmesh/
-Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/libmesh/
Package: libmesh-dev
Section: libdevel
Architecture: all
-Depends: libmesh0.6.4 (>= ${source:Version}), libpetsc2.3.3-dev (>= 2.3.3-3), libscotchmetis-dev (>= 5.0.6-2), libvtk5-dev
-Conflicts: libmesh0.6.1-dev, libmesh0.6.1-pure-dev, libmesh0.6.2-dev, libmesh0.6.3-dev, libmesh0.6.2-pure-dev
-Replaces: libmesh0.6.1-dev, libmesh0.6.1-pure-dev, libmesh0.6.2-dev, libmesh0.6.3-dev, libmesh0.6.2-pure-dev
+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
+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
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=38649&op=diff
==============================================================================
--- packages/libmesh/trunk/debian/copyright (original)
+++ packages/libmesh/trunk/debian/copyright Tue Aug 2 07:39:45 2011
@@ -1,91 +1,182 @@
-This package was debianized by Ondrej Certik <ondrej at certik.cz> on
-Tue, 29 May 2007 11:47:45 +0200.
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
+Debianized-By: Ondrej Certik <ondrej at certik.cz>
+Debianized-Date: Tue, 29 May 2007 11:47:45 +0200.
+Upstream-Author: Benjamin S. Kirk <benkirk at cfdlab.ae.utexas.edu>,
+ John W. Peterson <peterson at cfdlab.ae.utexas.edu>,
+ Roy Stogner <roystgnr at ices.utexas.edu>,
+ Steffen Petersen <steffen.petersenattu-harburg.de>
+Original-Source: http://libmesh.sourceforge.net/
-It was downloaded from http://libmesh.sourceforge.net/,
-the file: libmesh_0.6.0-rc2.tar.gz was unpacked, these directories were
-deleted (all of the packages have a non-free license):
+Note: The following directories in upstream source are non-free and have been
+ removed from this source to make the .dfsg tarball: contrib/laspack,
+ contrib/metis, contrib/parmetis, contrib/sfcurves, contrib/tecplot,
+ contrib/tetgen, contrib/triangle.
-contrib/laspack,
-contrib/metis,
-contrib/parmetis,
-contrib/sfcurves,
-contrib/tecplot,
-contrib/tetgen,
-contrib/triangle
+Files: *
+Copyright: Copyright (C) 2002-2009 Benjamin S. Kirk, John W. Peterson, Roy H. Stogner
+License: LGPL-2.1
+ On Debian systems, the complete text of the GNU Lesser General Public License
+ Version 2.1 (LGPL-2.1) can be found in file
+ "/usr/share/common-licenses/LGPL-2.1".
-and then it was packed into the file: libmesh_0.6.0~rc2.dfsg.orig.tar.gz. You
-can repeat this process by executing "debian/rules get-orig-source" in any
-directory - it will create the libmesh_0.6.0~rc2.dfsg.orig.tar.gz for you.
+Files: debian/*
+Copyright: (C) 2007, Ondrej Certik <ondrej at certik.cz>
+License: GPL
+ On Debian systems, the complete text of the GNU General Public License
+ (GPL) can be found in file "/usr/share/common-licenses/GPL".
-Upstream Authors:
+Files: install-sh
+Copyright: Copyright 1991 by the Massachusetts Institute of Technology
+License:
+ Permission to use, copy, modify, distribute, and sell this software and its
+ documentation for any purpose is hereby granted without fee, provided that
+ the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation, and that the name of M.I.T. not be used in advertising or
+ publicity pertaining to distribution of the software without specific,
+ written prior permission. M.I.T. makes no representations about the
+ suitability of this software for any purpose. It is provided "as is"
+ without express or implied warranty.
+ .
+ Calling this script install-sh is preferred over install.sh, to prevent
+ `make' implicit rules from creating a file called install from it
+ when there is no Makefile.
- Benjamin S. Kirk <benkirk at cfdlab.ae.utexas.edu>
- John W. Peterson <peterson at cfdlab.ae.utexas.edu>
- Roy Stogner
- Steffen Petersen <steffen.petersenattu-harburg.de>
+Files: contrib/gzstream/*
+Copyright: Copyright (C) 2001 Deepak Bandyopadhyay, Lutz Kettner
+License: LGPL-2.1+
+ This library 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 library 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 library; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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
+ "/usr/share/common-licenses/LGPL-2.1".
-Copyright:
+Files: contrib/bin/make_dependencies.pl
+Copyright: Copyright W. Bangerth, University of Heidelberg, 1998, 1999, 2000, 2001, 2002
+License: QPL
+ deal.II is distributed under the Open Source license called the Q Public License (or "QPL") listed in full below.
+ .
+ In addition to the terms imposed by the QPL, we ask for the following courtesy:
+ .
+ Every publication presenting numerical results obtained with the help of deal.II should state the name of the library and its principal authors, as well as cite the canonical deal.II reference listed at the top of the publications page.
+ .
+ THE Q PUBLIC LICENSE
+ version 1.0
+ .
+ Copyright (C) 1999 Troll Tech AS, Norway.
+ Everyone is permitted to copy and
+ distribute this license document.
+ .
+ The intent of this license is to establish freedom to share and change the software regulated by this license under the open source model.
+ .
+ This license applies to any software containing a notice placed by the copyright holder saying that it may be distributed under the terms of the Q Public License version 1.0. Such software is herein referred to as the Software. This license covers modification and distribution of the Software, use of third-party application programs based on the Software, and development of free software which uses the Software.
+ Granted Rights
+ .
+ 1. You are granted the non-exclusive rights set forth in this license provided you agree to and comply with any and all conditions in this license. Whole or partial distribution of the Software, or software items that link with the Software, in any form signifies acceptance of this license.
+ .
+ 2. You may copy and distribute the Software in unmodified form provided that the entire package, including - but not restricted to - copyright, trademark notices and disclaimers, as released by the initial developer of the Software, is distributed.
+ .
+ 3. You may make modifications to the Software and distribute your modifications, in a form that is separate from the Software, such as patches. The following restrictions apply to modifications:
+ .
+ a. Modifications must not alter or remove any copyright notices in the Software.
+ .
+ b. When modifications to the Software are released under this license, a non-exclusive royalty-free right is granted to the initial developer of the Software to distribute your modification in future versions of the Software provided such versions remain available under these terms in addition to any other license(s) of the initial developer.
+ .
+ 4. You may distribute machine-executable forms of the Software or machine-executable forms of modified versions of the Software, provided that you meet these restrictions:
+ .
+ a. You must include this license document in the distribution.
+ .
+ b. You must ensure that all recipients of the machine-executable forms are also able to receive the complete machine-readable source code to the distributed Software, including all modifications, without any charge beyond the costs of data transfer, and place prominent notices in the distribution explaining this.
+ .
+ c. You must ensure that all modifications included in the machine-executable forms are available under the terms of this license.
+ .
+ 5. You may use the original or modified versions of the Software to compile, link and run application programs legally developed by you or by others.
+ .
+ 6. You may develop application programs, reusable components and other software items that link with the original or modified versions of the Software. These items, when distributed, are subject to the following requirements:
+ .
+ a. You must ensure that all recipients of machine-executable forms of these items are also able to receive and use the complete machine-readable source code to the items without any charge beyond the costs of data transfer.
+ .
+ b. You must explicitly license all recipients of your items to use and re-distribute original and modified versions of the items in both machine-executable and source code forms. The recipients must be able to do so without any charges whatsoever, and they must be able to re-distribute to anyone they choose.
+ .
+ c. If the items are not available to the general public, and the initial developer of the Software requests a copy of the items, then you must supply one.
+ .
+ Limitations of Liability
+ .
+ In no event shall the initial developers or copyright holders be liable for any damages whatsoever, including - but not restricted to - lost revenue or profits or other direct, indirect, special, incidental or consequential damages, even if they have been advised of the possibility of such damages, except to the extent invariable law, if any, provides otherwise.
+ .
+ No Warranty
+ .
+ The Software and this license document are provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+Choice of Law
+ .
+ This license is governed by the Laws of Germany. Disputes shall be settled by Amtsgericht Heidelberg.
- Copyright (C) 2002-2007 Benjamin S. Kirk, John W. Peterson
+Files: contrib/bin/cvs2html is GPL
+Copyright: Copyright under GPL 1997 - 2002 by Peter Toft (pto at sslug.dk) + the persons above
+ Holger L. Bille <hlb at vitesse.com>
+ Henner Zeller <zeller at think.de>
+ Henning Niss <hniss at diku.dk>
+ Henrik Carlquist <Henrik.Carlqvist at dynamics.saab.se>
+ Tim Bradshaw <tfb at cley.com>
+ David Miller
+ Parkes, Lloyd <lloyd.parkes at eds.com>
+ David Carson <DCarson at extremenetworks.com>
+ Finn Aarup Nielsen <fn at imm.dtu.dk>
+ Michael Krause <mkrause at teuto.net>
+ Jim Phillips <jim at ks.uiuc.edu>
+ Jon S. Berndt <jsb at hal-pc.org>
+ Edward S. Marshall <emarshal at logic.net>
+ Curtis L. Olson <curt at me.umn.edu>
+ Aubrey Jaffer <jaffer at colorage.com>
+ Mark Cooke <mpc at star.sr.bham.ac.uk>
+ Carlo Wood <carlo at runaway.xs4all.nl>
+ Kirby Vandivort <kvandivo at ks.uiuc.edu>
+ Dag Brück <dag at Dynasim.se>
+ Wolfgang Bangerth <wolfgang.bangerth at iwr.uni-heidelberg.de>
+ Robert Merkle <r.merkle at siep.shell.com>
+ Jody Lewis <jody.lewis at philips.com>
+ Peter V. Pretsch <pvp at pe.dk>
+ Grzegorz Pawelczak <gpawel at adlex.com>
+ Stefan Kost <st_kost at gmx.de>
+ Anna Jonna Armannsdottir <a at sleepy.dk>
+ John Hardin <johnh at aproposretail.com>
+ Magnus Ahlman <magnus.ahlman at eds.com>
+License: GPL
+ This program is protected by the GPL, and all modifications of
+ general interest can be emailed to Peter Toft <pto at sslug.dk>
+ .
+ The GPL can be found at http://www.gnu.org/copyleft/gpl.html
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ (GPL) can be found in file "/usr/share/common-licenses/GPL".
-License of all files in the package (unless stated otherwise, see below):
+Files: contrib/bin/program2html.pl contrib/bin/stripcomments.pl
+Copyright: Copyright (C) 1999, 2000, 2001, 2002 by Wolfgang Bangerth, University of Heidelberg
+ With modifications for libmesh by John W. Peterson, 2003.
+License: QPL
+ See above license for contrib/bin/make_dependencies.pl
- GNU LESSER GENERAL PUBLIC LICENSE
-
-The Debian packaging is (C) 2007, Ondrej Certik <ondrej at certik.cz> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
-
-The file install-sh has the following copyright and license:
-
-# Copyright 1991 by the Massachusetts Institute of Technology
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of M.I.T. not be used in advertising or
-# publicity pertaining to distribution of the software without specific,
-# written prior permission. M.I.T. makes no representations about the
-# suitability of this software for any purpose. It is provided "as is"
-# without express or implied warranty.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-
-the package contrib/gzstream is LGPL and has the following copyright:
-
-Copyright (C) 2001 Deepak Bandyopadhyay, Lutz Kettner
-
-the file contrib/bin/make_dependencies.pl is:
-
-Copyright W. Bangerth, University of Heidelberg, 1998, 1999, 2000, 2001, 2002
-
-and using the license QPL (http://www.opensource.org/licenses/qtpl.php).
-
-the file contrib/bin/cvs2html is GPL and copyright:
-
-# Copyright under GPL 1997 - 2002 by
-# Peter Toft (pto at sslug.dk) + the persons above
-
-the files contrib/bin/program2html.pl and contrib/bin/stripcomments.pl are:
-
-Copyright (C) 1999, 2000, 2001, 2002 by Wolfgang Bangerth, University of
-Heidelberg
-With modifications for libmesh by John W. Peterson, 2003.
-
-and are using the license QPL (http://www.opensource.org/licenses/qtpl.php).
-
-the contrib/boost library is
-
-// Copyright (c) 2001, 2002 Peter Dimov and Multi Media Ltd.
-// Copyright (c) 1999, 2000, 2001, 2002 boost.org
-// Copyright (c) 2002, 2003 Peter Dimov
-// Copyright (c) 2003 Daniel Frey
-// Copyright (c) 2003 Howard Hinnant
-// (C) Copyright Boost.org 2001.
-//
-// Permission to copy, use, modify, sell and distribute this software
-// is granted provided this copyright notice appears in all copies.
-// This software is provided "as is" without express or implied
-// warranty, and with no claim as to its suitability for any purpose.
+Files: contrib/boost/*
+Copyright: Copyright (c) 2001, 2002 Peter Dimov and Multi Media Ltd.
+ Copyright (c) 1999, 2000, 2001, 2002 boost.org
+ Copyright (c) 2002, 2003 Peter Dimov
+ Copyright (c) 2003 Daniel Frey
+ Copyright (c) 2003 Howard Hinnant
+ (C) Copyright Boost.org 2001.
+License:
+ Permission to copy, use, modify, sell and distribute this software
+ is granted provided this copyright notice appears in all copies.
+ This software is provided "as is" without express or implied
+ warranty, and with no claim as to its suitability for any purpose.
Added: packages/libmesh/trunk/debian/libmesh-doc.doc-base
URL: http://svn.debian.org/wsvn/debian-science/packages/libmesh/trunk/debian/libmesh-doc.doc-base?rev=38649&op=file
==============================================================================
--- packages/libmesh/trunk/debian/libmesh-doc.doc-base (added)
+++ packages/libmesh/trunk/debian/libmesh-doc.doc-base Tue Aug 2 07:39:45 2011
@@ -1,0 +1,20 @@
+Document: libmesh-doc
+Title: libMesh Documentation
+Author: Benjamin S. Kirk, John W. Peterson, Roy Stogner and Steffen Petersen
+Abstract: The libMesh library is a C++ framework for the numerical simulation
+ of partial differential equations on serial and parallel platforms.
+ Development began in March 2002 with the intent of providing a friendly
+ interface to a number of high-quality software packages that are publicly
+ available. Currently the library supports 1D, 2D, and 3D steady and transient
+ finite element and finite volume simulations. PETSc is currently used for the
+ solution of linear systems on both serial and parallel platforms.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libmesh-doc/html/index.php
+Files: /usr/share/doc/libmesh-doc/*.php
+ /usr/share/doc/libmesh-doc/*/*.php
+ /usr/share/doc/libmesh-doc/*/*/*.php
+
+Format: PDF
+Files: /usr/share/doc/libmesh-doc/*.pdf
Added: packages/libmesh/trunk/debian/libmesh-doc.docs
URL: http://svn.debian.org/wsvn/debian-science/packages/libmesh/trunk/debian/libmesh-doc.docs?rev=38649&op=file
==============================================================================
--- packages/libmesh/trunk/debian/libmesh-doc.docs (added)
+++ packages/libmesh/trunk/debian/libmesh-doc.docs Tue Aug 2 07:39:45 2011
@@ -1,0 +1,2 @@
+libmesh/doc/*
+debian/README.Debian
Added: packages/libmesh/trunk/debian/libmesh-doc.examples
URL: http://svn.debian.org/wsvn/debian-science/packages/libmesh/trunk/debian/libmesh-doc.examples?rev=38649&op=file
==============================================================================
--- packages/libmesh/trunk/debian/libmesh-doc.examples (added)
+++ packages/libmesh/trunk/debian/libmesh-doc.examples Tue Aug 2 07:39:45 2011
@@ -1,0 +1,1 @@
+libmesh/examples/*
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=38649&op=diff
==============================================================================
--- packages/libmesh/trunk/debian/patches/netcdf_support.patch (original)
+++ packages/libmesh/trunk/debian/patches/netcdf_support.patch Tue Aug 2 07:39:45 2011
@@ -1,6 +1,8 @@
---- libmesh-0.6.2.dfsg/aclocal.m4~ 2008-06-10 22:34:12.000000000 +0000
-+++ libmesh-0.6.2.dfsg/aclocal.m4 2008-06-10 22:36:20.000000000 +0000
-@@ -1375,8 +1375,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 @@
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=38649&op=diff
==============================================================================
--- packages/libmesh/trunk/debian/patches/ripout_old_gnuc.patch (original)
+++ packages/libmesh/trunk/debian/patches/ripout_old_gnuc.patch Tue Aug 2 07:39:45 2011
@@ -1,5 +1,7 @@
---- libmesh-0.6.3.dfsg~rc1/include/base/variant_filter_iterator.h~ 2008-08-15 21:31:24.000000000 +0000
-+++ libmesh-0.6.3.dfsg~rc1/include/base/variant_filter_iterator.h 2008-10-03 18:11:51.000000000 +0000
+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
@@ -26,10 +26,6 @@
#include <algorithm> // for std::swap
#include <cstdlib> // for std::abort()
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=38649&op=diff
==============================================================================
--- packages/libmesh/trunk/debian/patches/scotchmetis_support.patch (original)
+++ packages/libmesh/trunk/debian/patches/scotchmetis_support.patch Tue Aug 2 07:39:45 2011
@@ -1,6 +1,8 @@
---- libmesh-0.6.3.dfsg~rc1/aclocal.m4~ 2008-08-15 21:32:24.000000000 +0000
-+++ libmesh-0.6.3.dfsg~rc1/aclocal.m4 2008-08-22 19:11:31.000000000 +0000
-@@ -1120,11 +1120,11 @@
+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 @@
dnl -------------------------------------------------------------
AC_DEFUN(CONFIGURE_METIS,
[
Modified: packages/libmesh/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/libmesh/trunk/debian/patches/series?rev=38649&op=diff
==============================================================================
--- packages/libmesh/trunk/debian/patches/series (original)
+++ packages/libmesh/trunk/debian/patches/series Tue Aug 2 07:39:45 2011
@@ -1,3 +1,4 @@
+source.dfsg.patch
scotchmetis_support.patch
netcdf_support.patch
ripout_old_gnuc.patch
Added: 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=38649&op=file
==============================================================================
--- packages/libmesh/trunk/debian/patches/source.dfsg.patch (added)
+++ packages/libmesh/trunk/debian/patches/source.dfsg.patch Tue Aug 2 07:39:45 2011
@@ -1,0 +1,80 @@
+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
+@@ -3,30 +3,12 @@
+ #
+ all:
+ @echo "----------------------------------------------"
+- @echo "------- Building Contributed Packages --------"
++ @echo "------- Building Contributed Packages (DFSG) -"
+ @echo "----------------------------------------------"
+ @echo ""
+- @echo "--- Building LASPACK -------------------------"
+- @$(MAKE) -C laspack $(MAKECMDGOALS)
+- @echo ""
+- @echo "--- Building Metis ---------------------------"
+- @$(MAKE) -C metis/Lib $(MAKECMDGOALS)
+- @echo ""
+- @echo "--- Building Parmetis ------------------------"
+- @$(MAKE) -C parmetis/Lib $(MAKECMDGOALS)
+- @echo ""
+- @echo "--- Building sfcurves ------------------------"
+- @$(MAKE) -C sfcurves $(MAKECMDGOALS)
+- @echo ""
+ @echo "--- Building libgzstream ---------------------"
+ @$(MAKE) -C gzstream $(MAKECMDGOALS)
+ @echo ""
+- @echo "--- Building TetGen ---------------------"
+- @$(MAKE) -C tetgen $(MAKECMDGOALS)
+- @echo ""
+- @echo "--- Building triangle ---------------------"
+- @$(MAKE) -C triangle $(MAKECMDGOALS)
+- @echo ""
+ @echo "--- Building gmv ---------------------"
+ @$(MAKE) -C gmv $(MAKECMDGOALS)
+ @echo ""
+@@ -53,13 +35,7 @@
+ #
+ clean:
+ @rm -f *~
+- @$(MAKE) -C laspack $(MAKECMDGOALS)
+- @$(MAKE) -C metis/Lib $(MAKECMDGOALS)
+- @$(MAKE) -C parmetis/Lib $(MAKECMDGOALS)
+- @$(MAKE) -C sfcurves $(MAKECMDGOALS)
+ @$(MAKE) -C gzstream $(MAKECMDGOALS)
+- @$(MAKE) -C tetgen $(MAKECMDGOALS)
+- @$(MAKE) -C triangle $(MAKECMDGOALS)
+ @$(MAKE) -C gmv $(MAKECMDGOALS)
+ @$(MAKE) -C netcdf/Lib $(MAKECMDGOALS)
+ @$(MAKE) -C exodusii/Lib/src $(MAKECMDGOALS)
+@@ -71,13 +47,7 @@
+ #
+ clobber:
+ @$(MAKE) clean
+- @$(MAKE) -C laspack $(MAKECMDGOALS)
+- @$(MAKE) -C metis/Lib $(MAKECMDGOALS)
+- @$(MAKE) -C parmetis/Lib $(MAKECMDGOALS)
+- @$(MAKE) -C sfcurves $(MAKECMDGOALS)
+ @$(MAKE) -C gzstream $(MAKECMDGOALS)
+- @$(MAKE) -C tetgen $(MAKECMDGOALS)
+- @$(MAKE) -C triangle $(MAKECMDGOALS)
+ @$(MAKE) -C gmv $(MAKECMDGOALS)
+ @$(MAKE) -C netcdf/Lib $(MAKECMDGOALS)
+ @$(MAKE) -C exodusii/Lib/src $(MAKECMDGOALS)
+@@ -89,13 +59,7 @@
+ #
+ distclean:
+ @$(MAKE) clobber
+- @$(MAKE) -C laspack $(MAKECMDGOALS)
+- @$(MAKE) -C metis/Lib $(MAKECMDGOALS)
+- @$(MAKE) -C parmetis/Lib $(MAKECMDGOALS)
+- @$(MAKE) -C sfcurves $(MAKECMDGOALS)
+ @$(MAKE) -C gzstream $(MAKECMDGOALS)
+- @$(MAKE) -C tetgen $(MAKECMDGOALS)
+- @$(MAKE) -C triangle $(MAKECMDGOALS)
+ @$(MAKE) -C gmv $(MAKECMDGOALS)
+ @$(MAKE) -C netcdf/Lib $(MAKECMDGOALS)
+ @$(MAKE) -C exodusii/Lib/src $(MAKECMDGOALS)
Modified: packages/libmesh/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/libmesh/trunk/debian/rules?rev=38649&op=diff
==============================================================================
--- packages/libmesh/trunk/debian/rules (original)
+++ packages/libmesh/trunk/debian/rules Tue Aug 2 07:39:45 2011
@@ -14,23 +14,34 @@
version=2.0.5
major=2
-config.status: configure.in
+libmesh/config.status: libmesh/configure.in
dh_testdir
- cp /usr/share/misc/config.guess .
- cp /usr/share/misc/config.sub .
+ cp /usr/share/misc/config.guess libmesh/
+ cp /usr/share/misc/config.sub libmesh/
QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
- autoconf
- PETSC_DIR=/usr/lib/petsc PETSC_ARCH=linux-gnu-c-opt LDFLAGS=-Wl,-soname,libmesh.so.$(LIBMESH_VERSION),-lpetsc,-lpetscdm,-lpetscksp,-lpetscmat,-lpetscsnes,-lpetscvec,-lscotchmetis,-lvtkIO ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --disable-laspack --disable-slepc --disable-sfc --disable-gzstreams --disable-tecplot --disable-parmetis --disable-tetgen --disable-triangle --disable-gmv --disable-exodus --disable-netcdf --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.4
+ cd libmesh && autoconf
+ 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 \
+ ./configure --prefix=/usr \
+ --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
+ --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
+ --disable-laspack --disable-sfc --disable-gzstreams --disable-gmv \
+ --disable-tecplot --disable-parmetis --disable-tetgen \
+ --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
build: build-stamp
-build-stamp: config.status
+build-stamp: libmesh/config.status
dh_testdir
- $(MAKE)
+ $(MAKE) -C libmesh
touch $@
-build-indep: config.status
+build-indep: libmesh/config.status
dh_testdir
- $(MAKE) doc
+ $(MAKE) -C libmesh doc
touch $@
clean:
@@ -39,29 +50,29 @@
rm -f build-stamp
QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
- [ ! -f Make.common ] || $(MAKE) distclean
- rm -f config.sub config.guess config.log
+ [ ! -f libmesh/Make.common ] || $(MAKE) -C libmesh distclean
+ rm -f libmesh/config.sub libmesh/config.guess libmesh/config.log
find -type f -name '.*' -exec '{}' ';'
- dh_clean --exclude ./contrib/triangle/makefile.orig --exclude ./contrib/tetgen/makefile.orig
+ dh_clean
-meshbin = $(CURDIR)/debian/libmesh$(LIBMESH_VERSION)
+meshlib = $(CURDIR)/debian/libmesh$(LIBMESH_VERSION)
meshdev = $(CURDIR)/debian/libmesh-dev
install: install-stamp
install-stamp: build
dh_testdir
dh_testroot
- dh_clean -k --exclude ./contrib/triangle/makefile.orig --exclude ./contrib/tetgen/makefile.orig
+ dh_clean
dh_installdirs
- mkdir -p $(meshbin)/usr/lib
+ mkdir -p $(meshlib)/usr/lib
mkdir -p $(meshdev)/usr/lib
- libdir=`grep "hosttype " Make.common | cut -d "=" -f 2 | cut -c 2-`; \
- cp lib/$${libdir}_opt/libmesh.so $(meshbin)/usr/lib/libmesh.so.$(LIBMESH_VERSION)
- ln -s /usr/lib/libmesh.so.$(LIBMESH_VERSION) $(meshdev)/usr/lib/libmesh.so
+ libdir=`grep "hosttype " libmesh/Make.common | cut -d "=" -f 2 | cut -c 2-`; \
+ cp libmesh/lib/$${libdir}_opt/libmesh.so $(meshlib)/usr/lib/libmesh.so.$(LIBMESH_VERSION)
+ ln -s libmesh.so.$(LIBMESH_VERSION) $(meshdev)/usr/lib/libmesh.so
mkdir -p $(meshdev)/usr/include/libmesh
- cp include/base/* include/enums/* include/error_estimation/* include/fe/* include/geom/* include/mesh/* include/numerics/* include/parallel/* include/partitioning/* include/quadrature/* include/solvers/* include/utils/* $(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
touch $@
@@ -70,7 +81,7 @@
binary-indep: build-indep install-stamp
dh_testdir -i
dh_testroot -i
- dh_installchangelogs -i ChangeLog
+ dh_installchangelogs -i libmesh/ChangeLog
dh_installdocs -i
mv debian/libmesh-doc/usr/share/doc/libmesh-doc/man \
debian/libmesh-doc/usr/share/
@@ -95,7 +106,7 @@
binary-arch: build install-stamp
dh_testdir -a
dh_testroot -a
- dh_installchangelogs -a ChangeLog
+ dh_installchangelogs -a libmesh/ChangeLog
dh_installdocs -a
dh_installman -a
dh_link -a
@@ -104,7 +115,7 @@
dh_fixperms -a
dh_makeshlibs -a
dh_installdeb -a
- dh_shlibdeps -a
+ dh_shlibdeps -av
dh_gencontrol -a
dh_md5sums -a
dh_builddeb -a
@@ -115,16 +126,14 @@
get-orig-source:
wget http://qa.debian.org/watch/sf.php/libmesh/libmesh-0.6.4.tar.gz
tar xzf libmesh-0.6.4.tar.gz
- cd libmesh-0.6.4; \
- rm -r CVSROOT; cd libmesh; \
- rm -r contrib/laspack; \
- rm -r contrib/metis; \
- rm -r contrib/parmetis; \
- rm -r contrib/sfcurves; \
- rm -r contrib/tecplot; \
- rm -r contrib/tetgen; \
- rm -r contrib/triangle; \
- find -type f -name '.*' -exec rm '{}' ';' ; cd ..; \
- mv libmesh ../libmesh-0.6.4.dfsg; cd ..
+ rm -r libmesh-0.6.4/libmesh/contrib/laspack
+ rm -r libmesh-0.6.4/libmesh/contrib/metis
+ rm -r libmesh-0.6.4/libmesh/contrib/parmetis
+ rm -r libmesh-0.6.4/libmesh/contrib/sfcurves
+ rm -r libmesh-0.6.4/libmesh/contrib/tecplot
+ rm -r libmesh-0.6.4/libmesh/contrib/tetgen
+ rm -r libmesh-0.6.4/libmesh/contrib/triangle
+ find libmesh-0.6.4 -type f -name '.*' -exec rm '{}' ';'
+ mv libmesh-0.6.4 libmesh-0.6.4.dfsg
tar czf libmesh_0.6.4.dfsg.orig.tar.gz libmesh-0.6.4.dfsg
- rm -r libmesh-0.6.4 libmesh-0.6.4.dfsg libmesh-0.6.4.tar.gz
+ rm -r libmesh-0.6.4.dfsg libmesh-0.6.4.tar.gz
Modified: packages/libmesh/trunk/debian/watch
URL: http://svn.debian.org/wsvn/debian-science/packages/libmesh/trunk/debian/watch?rev=38649&op=diff
==============================================================================
--- packages/libmesh/trunk/debian/watch (original)
+++ packages/libmesh/trunk/debian/watch Tue Aug 2 07:39:45 2011
@@ -1,3 +1,3 @@
version=3
-opts=dversionmangle=s/\.dfsg[^~]*//,uversionmangle=s/-(rc\d+)/~$1/ \
+opts=dversionmangle=s/\.dfsg.*$//,uversionmangle=s/-(rc\d+)/~$1/ \
http://sf.net/libmesh/libmesh-([\d\.rc-]+)\.tar\.gz
More information about the debian-science-commits
mailing list