r43903 - in /packages/freefem3d/trunk/debian: changelog control copyright freefem3d.doc-base patches/ patches/10_gcc44_enum.patch patches/20_gcc44_include.patch rules
sylvestre at users.alioth.debian.org
sylvestre at users.alioth.debian.org
Mon Sep 19 12:31:17 UTC 2011
Author: sylvestre
Date: Mon Sep 19 12:31:17 2011
New Revision: 43903
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=43903
Log:
freefem3d (1.0pre10-2.1) unstable; urgency=low
* Non-maintainer upload.
* Introduce CDBS' simple-patchsys to include the patch below
+ use CDBS facilities to run autotools
* Fix "FTBFS with GCC 4.4: missing #include" with patches
debian/patches/10_gcc44_enum.patch similar to upstream and
debian/patches/20_gcc44_include.patch thanks Martin Michlmayr
(Closes: #504845)
Added:
packages/freefem3d/trunk/debian/patches/
packages/freefem3d/trunk/debian/patches/10_gcc44_enum.patch
packages/freefem3d/trunk/debian/patches/20_gcc44_include.patch
Modified:
packages/freefem3d/trunk/debian/changelog
packages/freefem3d/trunk/debian/control
packages/freefem3d/trunk/debian/copyright
packages/freefem3d/trunk/debian/freefem3d.doc-base
packages/freefem3d/trunk/debian/rules
Modified: packages/freefem3d/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/freefem3d/trunk/debian/changelog?rev=43903&op=diff
==============================================================================
--- packages/freefem3d/trunk/debian/changelog (original)
+++ packages/freefem3d/trunk/debian/changelog Mon Sep 19 12:31:17 2011
@@ -1,13 +1,14 @@
-freefem3d (1.0pre10-3) UNRELEASED; urgency=low
-
- * debian/control: Vcs fields transition. Added Homepage field.
- (Vcs-Svn): Fixed.
- * debian/copyright: Added missing information.
- * debian/freefem3d.doc-base: Fixed encoding.
- (Section): Fixed accordingly to doc-base (>= 0.8.10).
- * debian/watch: Added.
-
- -- Daniel Leidert (dale) <daniel.leidert at wgdd.de> Tue, 18 Mar 2008 05:23:42 +0100
+freefem3d (1.0pre10-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Introduce CDBS' simple-patchsys to include the patch below
+ + use CDBS facilities to run autotools
+ * Fix "FTBFS with GCC 4.4: missing #include" with patches
+ debian/patches/10_gcc44_enum.patch similar to upstream and
+ debian/patches/20_gcc44_include.patch thanks Martin Michlmayr
+ (Closes: #504845)
+
+ -- Filippo Giunchedi <filippo at debian.org> Sat, 13 Feb 2010 11:57:36 +0100
freefem3d (1.0pre10-2) unstable; urgency=low
Modified: packages/freefem3d/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/freefem3d/trunk/debian/control?rev=43903&op=diff
==============================================================================
--- packages/freefem3d/trunk/debian/control (original)
+++ packages/freefem3d/trunk/debian/control Mon Sep 19 12:31:17 2011
@@ -1,13 +1,12 @@
Source: freefem3d
Priority: optional
-Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
+Maintainer: Debian Scientific Computing Team <pkg-scicomp-devel at lists.alioth.debian.org>
Uploaders: Christophe Prud'homme <prudhomm at debian.org>
Section: math
+Standards-Version: 3.7.2
+XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-scicomp/freefem3d/
+XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-scicomp/freefem3d/
Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 4.1.0), automake1.10, libtool (>= 1.5), doc-base, bison, texlive, texlive-latex-extra
-Standards-Version: 3.9.2
-Homepage: http://www.freefem.org/ff3d/
-Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/freefem3d/trunk/
-Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/freefem3d/trunk/
Package: freefem3d
Architecture: any
Modified: packages/freefem3d/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-science/packages/freefem3d/trunk/debian/copyright?rev=43903&op=diff
==============================================================================
--- packages/freefem3d/trunk/debian/copyright (original)
+++ packages/freefem3d/trunk/debian/copyright Mon Sep 19 12:31:17 2011
@@ -3,41 +3,6 @@
It was downloaded from http://savannah.nongnu.org/projects/ff3d
-Authors:
-
- Stéphane Del Pino et al.
-
Copyright:
- Copyright (C) 2001-2007 Stéphane Del Pino
- Copyright (C) 2001-2003 Pascal Havé
- Copyright (C) 2007 Driss Yakoubi
-
- Examples are
- Copyright (C) 2003 Laboratoire J.-L. Lions UPMC Paris
-
- ansi2knr.c is
- Copyright (C) 1989, 2000 Aladdin Enterprises.
-
- language/parse.xml.cc, language/parse.ff.cc, language/parse.pov.c are
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
- Free Software Foundation, Inc.
-
-License: GNU GPL v2 or later
-
- ff3d is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 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 General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-On Debian systems a copy of the GNU General Public License v2 or later can be
-found in `/usr/share/common-licenses/GPL*'.
+/usr/share/common-licenses/GPL
Modified: packages/freefem3d/trunk/debian/freefem3d.doc-base
URL: http://svn.debian.org/wsvn/debian-science/packages/freefem3d/trunk/debian/freefem3d.doc-base?rev=43903&op=diff
==============================================================================
--- packages/freefem3d/trunk/debian/freefem3d.doc-base (original)
+++ packages/freefem3d/trunk/debian/freefem3d.doc-base Mon Sep 19 12:31:17 2011
@@ -1,9 +1,8 @@
Document: freefem3d
Title: FreeFEM 3D User Manual
-Author: Stéphane Del Pino <delpino at ann.jussieu.fr>
-Abstract: FreeFEM 3D User Manual. FreeFEM3D is a language and finite
- element solver for partial differential equations in 3D.
-Section: Science/Mathematics
+Author: Stéphane Del Pino <delpino at ann.jussieu.fr>
+Abstract: FreeFEM 3D User Manual. FreeFEM3D is a language and finite element solver for partial differential equations in 3D
+Section: Apps/Math
Format: PDF
Files: /usr/share/doc/freefem3d/freefem3dDoc.pdf.gz
@@ -11,5 +10,5 @@
Format: PostScript
Files: /usr/share/doc/freefem3d/freefem3dDoc.ps.gz
-Format: DVI
+Format: dvi
Files: /usr/share/doc/freefem3d/freefem3dDoc.dvi.gz
Added: packages/freefem3d/trunk/debian/patches/10_gcc44_enum.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/freefem3d/trunk/debian/patches/10_gcc44_enum.patch?rev=43903&op=file
==============================================================================
--- packages/freefem3d/trunk/debian/patches/10_gcc44_enum.patch (added)
+++ packages/freefem3d/trunk/debian/patches/10_gcc44_enum.patch Mon Sep 19 12:31:17 2011
@@ -1,0 +1,179 @@
+diff --git a/solver/FEMFunction.hpp b/solver/FEMFunction.hpp
+index 6f2dcf2..bda53cd 100644
+--- a/solver/FEMFunction.hpp
++++ b/solver/FEMFunction.hpp
+@@ -217,7 +217,7 @@ public:
+ * @param mesh mesh supporting the function
+ */
+ FEMFunction(ConstReferenceCounting<MeshType> mesh)
+- : FEMFunctionBase(mesh, DiscretizationType::Type(FiniteElementTraits::DiscretizationType)),
++ : FEMFunctionBase(mesh, DiscretizationType::Type(FiniteElementTraits::discretizationType)),
+ __mesh(mesh)
+ {
+ ;
+@@ -231,7 +231,7 @@ public:
+ */
+ FEMFunction(ConstReferenceCounting<MeshType> mesh,
+ const ScalarFunctionBase& f)
+- : FEMFunctionBase(mesh, DiscretizationType::Type(FiniteElementTraits::DiscretizationType)),
++ : FEMFunctionBase(mesh, DiscretizationType::Type(FiniteElementTraits::discretizationType)),
+ __mesh(mesh)
+ {
+ (*this) = f;
+@@ -245,7 +245,7 @@ public:
+ */
+ FEMFunction(ConstReferenceCounting<MeshType> mesh,
+ const real_t& d)
+- : FEMFunctionBase(mesh, DiscretizationType::Type(FiniteElementTraits::DiscretizationType)),
++ : FEMFunctionBase(mesh, DiscretizationType::Type(FiniteElementTraits::discretizationType)),
+ __mesh(mesh)
+ {
+ __values = d;
+@@ -259,7 +259,7 @@ public:
+ */
+ FEMFunction(ConstReferenceCounting<MeshType> mesh,
+ const Vector<real_t>& values)
+- : FEMFunctionBase(mesh, DiscretizationType::Type(FiniteElementTraits::DiscretizationType)),
++ : FEMFunctionBase(mesh, DiscretizationType::Type(FiniteElementTraits::discretizationType)),
+ __mesh(mesh)
+ {
+ ASSERT(__values.size() == values.size());
+diff --git a/solver/FiniteElementTraits.hpp b/solver/FiniteElementTraits.hpp
+index 47bc691..0cb11ac 100644
+--- a/solver/FiniteElementTraits.hpp
++++ b/solver/FiniteElementTraits.hpp
+@@ -54,7 +54,7 @@ struct FiniteElementTraits<Hexahedron,
+ DiscretizationType::lagrangianFEM0>
+ {
+ enum {
+- DiscretizationType = DiscretizationType::lagrangianFEM0
++ discretizationType = DiscretizationType::lagrangianFEM0
+ };
+
+ typedef Q0HexahedronFiniteElement Type;
+@@ -71,7 +71,7 @@ struct FiniteElementTraits<Hexahedron,
+ DiscretizationType::lagrangianFEM1>
+ {
+ enum {
+- DiscretizationType = DiscretizationType::lagrangianFEM1
++ discretizationType = DiscretizationType::lagrangianFEM1
+ };
+
+ typedef Q1HexahedronFiniteElement Type;
+@@ -88,7 +88,7 @@ struct FiniteElementTraits<Hexahedron,
+ DiscretizationType::lagrangianFEM2>
+ {
+ enum {
+- DiscretizationType = DiscretizationType::lagrangianFEM2
++ discretizationType = DiscretizationType::lagrangianFEM2
+ };
+
+ typedef Q2HexahedronFiniteElement Type;
+@@ -105,7 +105,7 @@ struct FiniteElementTraits<CartesianHexahedron,
+ DiscretizationType::lagrangianFEM0>
+ {
+ enum {
+- DiscretizationType = DiscretizationType::lagrangianFEM0
++ discretizationType = DiscretizationType::lagrangianFEM0
+ };
+
+ typedef Q0HexahedronFiniteElement Type;
+@@ -122,7 +122,7 @@ struct FiniteElementTraits<CartesianHexahedron,
+ DiscretizationType::lagrangianFEM1>
+ {
+ enum {
+- DiscretizationType = DiscretizationType::lagrangianFEM1
++ discretizationType = DiscretizationType::lagrangianFEM1
+ };
+
+ typedef Q1HexahedronFiniteElement Type;
+@@ -139,7 +139,7 @@ struct FiniteElementTraits<CartesianHexahedron,
+ DiscretizationType::lagrangianFEM2>
+ {
+ enum {
+- DiscretizationType = DiscretizationType::lagrangianFEM2
++ discretizationType = DiscretizationType::lagrangianFEM2
+ };
+
+ typedef Q2HexahedronFiniteElement Type;
+@@ -156,7 +156,7 @@ struct FiniteElementTraits<Tetrahedron,
+ DiscretizationType::lagrangianFEM0>
+ {
+ enum {
+- DiscretizationType = DiscretizationType::lagrangianFEM0
++ discretizationType = DiscretizationType::lagrangianFEM0
+ };
+
+ typedef P0TetrahedronFiniteElement Type;
+@@ -173,7 +173,7 @@ struct FiniteElementTraits<Tetrahedron,
+ DiscretizationType::lagrangianFEM1>
+ {
+ enum {
+- DiscretizationType = DiscretizationType::lagrangianFEM1
++ discretizationType = DiscretizationType::lagrangianFEM1
+ };
+
+ typedef P1TetrahedronFiniteElement Type;
+@@ -190,7 +190,7 @@ struct FiniteElementTraits<Tetrahedron,
+ DiscretizationType::lagrangianFEM2>
+ {
+ enum {
+- DiscretizationType = DiscretizationType::lagrangianFEM2
++ discretizationType = DiscretizationType::lagrangianFEM2
+ };
+
+ typedef P2TetrahedronFiniteElement Type;
+@@ -207,7 +207,7 @@ struct FiniteElementTraits<Triangle,
+ DiscretizationType::lagrangianFEM0>
+ {
+ enum {
+- DiscretizationType = DiscretizationType::lagrangianFEM0
++ discretizationType = DiscretizationType::lagrangianFEM0
+ };
+
+
+@@ -225,7 +225,7 @@ struct FiniteElementTraits<Triangle,
+ DiscretizationType::lagrangianFEM1>
+ {
+ enum {
+- DiscretizationType = DiscretizationType::lagrangianFEM1
++ discretizationType = DiscretizationType::lagrangianFEM1
+ };
+
+
+@@ -243,7 +243,7 @@ struct FiniteElementTraits<Triangle,
+ DiscretizationType::lagrangianFEM2>
+ {
+ enum {
+- DiscretizationType = DiscretizationType::lagrangianFEM2
++ discretizationType = DiscretizationType::lagrangianFEM2
+ };
+
+ typedef P2Triangle3DFiniteElement Type;
+@@ -260,7 +260,7 @@ struct FiniteElementTraits<Quadrangle,
+ DiscretizationType::lagrangianFEM0>
+ {
+ enum {
+- DiscretizationType = DiscretizationType::lagrangianFEM0
++ discretizationType = DiscretizationType::lagrangianFEM0
+ };
+
+ typedef Q0Quadrangle3DFiniteElement Type;
+@@ -277,7 +277,7 @@ struct FiniteElementTraits<Quadrangle,
+ DiscretizationType::lagrangianFEM1>
+ {
+ enum {
+- DiscretizationType = DiscretizationType::lagrangianFEM1
++ discretizationType = DiscretizationType::lagrangianFEM1
+ };
+
+ typedef Q1Quadrangle3DFiniteElement Type;
+@@ -295,7 +295,7 @@ struct FiniteElementTraits<Quadrangle,
+ DiscretizationType::lagrangianFEM2>
+ {
+ enum {
+- DiscretizationType = DiscretizationType::lagrangianFEM2
++ discretizationType = DiscretizationType::lagrangianFEM2
+ };
+
+ typedef Q2Quadrangle3DFiniteElement Type;
Added: packages/freefem3d/trunk/debian/patches/20_gcc44_include.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/freefem3d/trunk/debian/patches/20_gcc44_include.patch?rev=43903&op=file
==============================================================================
--- packages/freefem3d/trunk/debian/patches/20_gcc44_include.patch (added)
+++ packages/freefem3d/trunk/debian/patches/20_gcc44_include.patch Mon Sep 19 12:31:17 2011
@@ -1,0 +1,24 @@
+diff --git a/language/FFLexer.cpp b/language/FFLexer.cpp
+index c202728..21d10a0 100644
+--- a/language/FFLexer.cpp
++++ b/language/FFLexer.cpp
+@@ -75,6 +75,7 @@
+ #include <parse.ff.h>
+
+ #include <cstdlib>
++#include <cstdio>
+ #include <cstring>
+ #include <cctype>
+
+diff --git a/language/POVLexer.cpp b/language/POVLexer.cpp
+index 8024ab1..d93ce2f 100644
+--- a/language/POVLexer.cpp
++++ b/language/POVLexer.cpp
+@@ -26,6 +26,7 @@
+ #include <Stringify.hpp>
+ #include <ErrorHandler.hpp>
+
++#include <cstdio>
+ #include <cctype>
+ #include <sstream>
+
Modified: packages/freefem3d/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/freefem3d/trunk/debian/rules?rev=43903&op=diff
==============================================================================
--- packages/freefem3d/trunk/debian/rules (original)
+++ packages/freefem3d/trunk/debian/rules Mon Sep 19 12:31:17 2011
@@ -2,9 +2,16 @@
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/m4
DEB_CONFIGURE_EXTRA_FLAGS := --enable-optimize --disable-gui
+
+DEB_AUTO_UPDATE_ACLOCAL = 1.10
+DEB_AUTO_UPDATE_LIBTOOL = pre -c -f
+DEB_AUTO_UPDATE_AUTOMAKE = 1.10 -a -c
+DEB_AUTO_UPDATE_AUTOCONF = yes
+DEB_AUTO_UPDATE_AUTOHEADER = yes
clean::
rm -f aclocal.m4 config.guess config.h.in config.sub install-sh
@@ -12,18 +19,3 @@
rm -f depcomp stamp-h1 configure
rm -rf autom4te.cache
find -name Makefile.in | xargs -r rm -f
-
-# Unfortunately, cdbs's version of this doesn't work when aclocal.m4
-# is missing.
-post-patches:: debian/stamp-my-autotools
-debian/stamp-my-autotools:
- libtoolize -c -f
- aclocal -I m4
- autoconf
- autoheader
- automake -a -c
- touch debian/stamp-my-autotools
-
-clean::
- rm -f debian/stamp-my-autotools
-
More information about the debian-science-commits
mailing list