[SCM] Freefoam packaging. Programs and libraries for Computational Fluid Dynamics (CFD) branch, master, updated. upstream/0.1.0-9-gb94a84b

Gerber van der Graaf gerber.vdgraaf at gmail.com
Thu May 31 07:46:35 UTC 2012


The following commit has been merged in the master branch:
commit b94a84b587c12602fb34304b5fef0b3777c89f03
Author: Gerber van der Graaf <gerber.vdgraaf at gmail.com>
Date:   Thu May 31 09:34:56 2012 +0200

    copyright

diff --git a/debian/copyright b/debian/copyright
index f00eb22..0989159 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,20 +6,20 @@ It was downloaded from http://freefoam.wiki.sourceforge.net/
 FreeFOAM is a fork of OpenFOAM, written by OpenCFD Ltd
 
 Copyright Holders: OpenCFD Ltd
-                   Gerber van der Graaf <gerber_graaf at users.sourceforge.net>,
-                   Michael Wild <themiwi at users.sourceforge.net>
+	   Gerber van der Graaf <gerber_graaf at users.sourceforge.net>,
+	   Michael Wild <themiwi at users.sourceforge.net>
 
 License: 
 
-   Freefoam 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 3, or (at your option)
-   any later version.
+Freefoam 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 3, 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.
+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
@@ -37,22 +37,39 @@ Source: http://freefoam.wiki.sourceforge.net/
 Disclaimer: Autogenerated by CDBS
 
 Files: ./applications/test/readCHEMKINIII/CHEMKINdata/ckinterp.f
- ./applications/utilities/postProcessing/dataConversion/foamToFieldview9/fv_reader_tags.h
- ./applications/utilities/postProcessing/dataConversion/foamToFieldview9/write_binary_uns.c
- ./applications/utilities/postProcessing/graphics/fieldview9Reader/errno.c
+Copyright: Sandia National Laboratories, Reaction Design, Inc
+License: UNKNOWN
+ FIXME
+
+Files:
  ./applications/utilities/surface/surfaceCoarsen/bunnylod/font.h
  ./applications/utilities/surface/surfaceCoarsen/bunnylod/list.h
  ./applications/utilities/surface/surfaceCoarsen/bunnylod/vector.h
- ./data/asciidoc/dblatex/asciidoc-dblatex.xsl
- ./data/asciidoc/docbook-xsl/chunked.xsl
- ./data/asciidoc/docbook-xsl/common.xsl
- ./data/asciidoc/docbook-xsl/custom.xsl
- ./data/asciidoc/docbook-xsl/xhtml.xsl
+Copyright: (c) 1998, Stan Melax <melax at cs.ualberta.ca>
+Licence: Permission to use any of this code wherever you want is granted..
+         Although, please do acknowledge authorship if appropriate.
+ FIXME
+
+Files:
+ ./applications/utilities/postProcessing/dataConversion/foamToFieldview9/fv_reader_tags.h
+ ./applications/utilities/postProcessing/dataConversion/foamToFieldview9/write_binary_uns.c
+ ./applications/utilities/postProcessing/graphics/fieldview9Reader/errno.c
 Copyright: *No copyright*
 License: UNKNOWN
  FIXME
 
-Files: ./data/python/FreeFOAM/doxyFilter.py
+Files: ./applications/utilities/postProcessing/graphics/ensightFoamReader/global_extern.h
+ ./applications/utilities/postProcessing/graphics/ensightFoamReader/global_extern_proto.h
+Copyright: 1998, Computational Engineering International, Inc
+License: UNKNOWN
+ FIXME
+
+Files: ./data/asciidoc/dblatex/asciidoc-dblatex.xsl
+ ./data/asciidoc/docbook-xsl/chunked.xsl
+ ./data/asciidoc/docbook-xsl/common.xsl
+ ./data/asciidoc/docbook-xsl/custom.xsl
+ ./data/asciidoc/docbook-xsl/xhtml.xsl
+ ./data/python/FreeFOAM/doxyFilter.py
  ./data/python/FreeFOAM/doxyToAsciidoc.py
  ./data/python/FreeFOAM/path.py
  ./data/python/FreeFOAM/run.py
@@ -60,44 +77,33 @@ Files: ./data/python/FreeFOAM/doxyFilter.py
  ./data/python/FreeFOAM/util.py
 Copyright: 2008-2012, Michael Wild <themiwi at users.sf.net>
 License: GPL-3+
- FIXME
-
-Files: ./applications/utilities/postProcessing/graphics/ensightFoamReader/global_extern.h
- ./applications/utilities/postProcessing/graphics/ensightFoamReader/global_extern_proto.h
-Copyright: 1998, Computational Engineering International, Inc
-License: UNKNOWN
- FIXME
 
 Files: ./src/OpenFOAM/primitives/random/BSD_random.c
 Copyright: 1983, Regents of the University of California
 License: BSD (4 clause)
- FIXME
 
 Files: ./data/utilities/db2md.xsl
 Copyright: 2008-2012, Michael Wild themiwi at users.sf.net
 License: GPL-3+
- FIXME
 
 Files: ./src/OpenFOAM/db/IOstreams/gzstream/gzstream.h
 Copyright: 2001, Deepak Bandyopadhyay, Lutz Kettner
 License: LGPL-2.1+
- FIXME
 
 Files: ./data/python/FreeFOAM/compat.py
 Copyright: 2001-2007, Python Software
   2008-2012, Michael Wild <themiwi at users.sf.net>
 License: PSF-2. GPL-3+
- FIXME
 
 Files: ./applications/utilities/surface/surfaceCoarsen/bunnylod/progmesh.h
 Copyright: 1998
-License: UNKNOWN
+Copyright: (c) 1998, Stan Melax <melax at cs.ualberta.ca>
+License: None
  FIXME
 
 Files: ./data/editor-modes/foamdict-mode.el
 Copyright: 2008-2012, Michael Wild <themiwi at users.sf.net>
-License: UNKNOWN
- FIXME
+License: GPL-3+
 
 Files: ./applications/utilities/surface/surfaceCoarsen/bunnylod/rabdata.h
 Copyright: 1996, Viewpoint Datalabs Int'l, www.viewpoint.com, 1-800-DATASET */
diff --git a/debian/patches/copyright.diff b/debian/patches/copyright.diff
new file mode 100644
index 0000000..71fa961
--- /dev/null
+++ b/debian/patches/copyright.diff
@@ -0,0 +1,224 @@
+--- a/data/asciidoc/dblatex/asciidoc-dblatex.xsl
++++ b/data/asciidoc/dblatex/asciidoc-dblatex.xsl
+@@ -1,10 +1,41 @@
+ <?xml version='1.0'?>
+-<!--
+-Additional user-stylesheet for dblatex. It customizes
+-- the template matching the <alt> element such that no automatic math mode
+-  wrappers are added
+-- the appearance of <gui(menu|label|button|icon)> elements
+--->
++<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
++                ______                _     ____          __  __
++               |  ____|             _| |_  / __ \   /\   |  \/  |
++               | |__ _ __ ___  ___ /     \| |  | | /  \  | \  / |
++               |  __| '__/ _ \/ _ ( (| |) ) |  | |/ /\ \ | |\/| |
++               | |  | | |  __/  __/\_   _/| |__| / ____ \| |  | |
++               |_|  |_|  \___|\___|  |_|   \____/_/    \_\_|  |_|
++
++                    FreeFOAM: The Cross-Platform CFD Toolkit
++
++  Copyright (C) 2008-2012 Michael Wild themiwi at users.sf.net
++                          Gerber van der Graaf gerber_graaf at users.sf.net
++ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
++  License
++    This file is part of FreeFOAM.
++
++    FreeFOAM 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 3 of the License, or (at your
++    option) any later version.
++
++    FreeFOAM 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 FreeFOAM.  If not, see <http://www.gnu.org/licenses/>.
++
++  Description
++      Additional user-stylesheet for dblatex. It customizes
++      - the template matching the <alt> element such that no automatic math mode
++      wrappers are added
++      - the appearance of <gui(menu|label|button|icon)> elements
++ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
++
++
+ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0'>
+ 
+ <xsl:import href="orig-asciidoc-dblatex.xsl"/>
+--- a/data/asciidoc/docbook-xsl/chunked.xsl
++++ b/data/asciidoc/docbook-xsl/chunked.xsl
+@@ -1,7 +1,37 @@
+-<!--
+-  Generates chunked XHTML documents from DocBook XML source using DocBook XSL
+-  stylesheets.
+--->
++<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
++                ______                _     ____          __  __
++               |  ____|             _| |_  / __ \   /\   |  \/  |
++               | |__ _ __ ___  ___ /     \| |  | | /  \  | \  / |
++               |  __| '__/ _ \/ _ ( (| |) ) |  | |/ /\ \ | |\/| |
++               | |  | | |  __/  __/\_   _/| |__| / ____ \| |  | |
++               |_|  |_|  \___|\___|  |_|   \____/_/    \_\_|  |_|
++
++                    FreeFOAM: The Cross-Platform CFD Toolkit
++
++  Copyright (C) 2008-2012 Michael Wild themiwi at users.sf.net
++                          Gerber van der Graaf gerber_graaf at users.sf.net
++ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
++  License
++    This file is part of FreeFOAM.
++
++    FreeFOAM 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 3 of the License, or (at your
++    option) any later version.
++
++    FreeFOAM 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 FreeFOAM.  If not, see <http://www.gnu.org/licenses/>.
++
++  Description
++    Generates chunked XHTML documents from DocBook XML source using DocBook XSL
++    stylesheets.
++ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
++
+ <!DOCTYPE xsl:stylesheet
+ [
+   <!ENTITY nbsp " ">
+--- a/data/asciidoc/docbook-xsl/common.xsl
++++ b/data/asciidoc/docbook-xsl/common.xsl
+@@ -1,8 +1,38 @@
+-<!--
+-  Inlcuded in xhtml.xsl, xhtml.chunked.xsl, htmlhelp.xsl.
+-  Contains common XSL stylesheets parameters.
+-  Output documents styled by docbook.css.
+--->
++<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
++                ______                _     ____          __  __
++               |  ____|             _| |_  / __ \   /\   |  \/  |
++               | |__ _ __ ___  ___ /     \| |  | | /  \  | \  / |
++               |  __| '__/ _ \/ _ ( (| |) ) |  | |/ /\ \ | |\/| |
++               | |  | | |  __/  __/\_   _/| |__| / ____ \| |  | |
++               |_|  |_|  \___|\___|  |_|   \____/_/    \_\_|  |_|
++
++                    FreeFOAM: The Cross-Platform CFD Toolkit
++
++  Copyright (C) 2008-2012 Michael Wild themiwi at users.sf.net
++                          Gerber van der Graaf gerber_graaf at users.sf.net
++ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
++  License
++    This file is part of FreeFOAM.
++
++    FreeFOAM 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 3 of the License, or (at your
++    option) any later version.
++
++    FreeFOAM 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 FreeFOAM.  If not, see <http://www.gnu.org/licenses/>.
++
++  Description
++      Inlcuded in xhtml.xsl, xhtml.chunked.xsl, htmlhelp.xsl.
++      Contains common XSL stylesheets parameters.
++      Output documents styled by docbook.css.
++ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
++
+ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+ <xsl:include href="orig-common.xsl"/>
+ <!-- Exclude GNU FDL sections from TOC (how to do this with dblatex???) -->
+--- a/data/asciidoc/docbook-xsl/custom.xsl
++++ b/data/asciidoc/docbook-xsl/custom.xsl
+@@ -1,5 +1,37 @@
++<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
++                ______                _     ____          __  __
++               |  ____|             _| |_  / __ \   /\   |  \/  |
++               | |__ _ __ ___  ___ /     \| |  | | /  \  | \  / |
++               |  __| '__/ _ \/ _ ( (| |) ) |  | |/ /\ \ | |\/| |
++               | |  | | |  __/  __/\_   _/| |__| / ____ \| |  | |
++               |_|  |_|  \___|\___|  |_|   \____/_/    \_\_|  |_|
++
++                    FreeFOAM: The Cross-Platform CFD Toolkit
++
++  Copyright (C) 2008-2012 Michael Wild themiwi at users.sf.net
++                          Gerber van der Graaf gerber_graaf at users.sf.net
++ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
++  License
++    This file is part of FreeFOAM.
++
++    FreeFOAM 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 3 of the License, or (at your
++    option) any later version.
++
++    FreeFOAM 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 FreeFOAM.  If not, see <http://www.gnu.org/licenses/>.
++
++  Description
++      Custom parameters and user templates.
++ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
++
+ <!--
+-  Custom parameters and user templates.
+ -->
+ 
+ <!DOCTYPE xsl:stylesheet
+--- a/data/asciidoc/docbook-xsl/xhtml.xsl
++++ b/data/asciidoc/docbook-xsl/xhtml.xsl
+@@ -1,7 +1,36 @@
+-<!--
+-  Generates chunked XHTML documents from DocBook XML source using DocBook XSL
+-  stylesheets.
+--->
++<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
++                ______                _     ____          __  __
++               |  ____|             _| |_  / __ \   /\   |  \/  |
++               | |__ _ __ ___  ___ /     \| |  | | /  \  | \  / |
++               |  __| '__/ _ \/ _ ( (| |) ) |  | |/ /\ \ | |\/| |
++               | |  | | |  __/  __/\_   _/| |__| / ____ \| |  | |
++               |_|  |_|  \___|\___|  |_|   \____/_/    \_\_|  |_|
++
++                    FreeFOAM: The Cross-Platform CFD Toolkit
++
++  Copyright (C) 2008-2012 Michael Wild themiwi at users.sf.net
++                          Gerber van der Graaf gerber_graaf at users.sf.net
++ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
++  License
++    This file is part of FreeFOAM.
++
++    FreeFOAM 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 3 of the License, or (at your
++    option) any later version.
++
++    FreeFOAM 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 FreeFOAM.  If not, see <http://www.gnu.org/licenses/>.
++
++  Description
++      Generates chunked XHTML documents from DocBook XML source using DocBook XSL
++      stylesheets.
++ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ 
+ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+   xmlns="http://www.w3.org/1999/xhtml"
diff --git a/debian/patches/series b/debian/patches/series
index 34abff9..e88473c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 spelling.diff
+copyright.diff
diff --git a/debian/rules b/debian/rules
index a6780b1..1872eb2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,8 +9,6 @@ CXXFLAGS+=$(CPPFLAGS) -fpermissive
 
 include /usr/share/cdbs/1/class/cmake.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-## include /usr/share/cdbs/1/class/python-distutils.mk
-#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
  
 export OMPI_MCA_plm_rsh_agent=/bin/false
@@ -70,6 +68,7 @@ DEB_CMAKE_EXTRA_FLAGS= 					\
 	-DFOAM_ENABLE_PARMETIS=OFF			\
 	-DCMAKE_SKIP_RPATH=OFF				\
 	-DFOAM_ENABLE_CCMIO=OFF				\
+        -DBUILD_TESTING=OFF				\
 	-DFOAM_ENABLE_FULL_TUTORIAL_TEST=OFF		\
 	$(FF_CONFIG_THIRD_PARTY)			\
 	$(FF_DOC)					\

-- 
Freefoam packaging. Programs and libraries for Computational Fluid Dynamics (CFD)



More information about the debian-science-commits mailing list