[code-saturne] 01/04: tag of version 2.0.0.rc1-4
Gilles Filippini
pini at debian.org
Sun Jan 18 22:37:14 UTC 2015
This is an automated email from the git hooks/post-receive script.
pini pushed a commit to annotated tag debian/2.0.0.rc1-4
in repository code-saturne.
commit 4e506e53963b7ab7a20ddee45c1d978741bf4045
Author: Sylvestre Ledru <sylvestre at debian.org>
Date: Wed Feb 24 17:35:59 2010 +0000
tag of version 2.0.0.rc1-4
---
changelog | 31 +++++++++-
code-saturne-bin.install | 2 +-
code-saturne-bin.lintian-overrides | 3 +
code-saturne-bin.manpages | 7 +--
code-saturne-data.install | 2 +-
code-saturne-data.lintian-overrides | 2 +
control | 21 ++++---
patches/cs-20rc1.diff | 115 ++++++++++++++++++++++++++++++++++++
patches/have_mpi.diff | 18 ------
patches/pypathissue.diff | 13 ++++
rules | 11 +++-
11 files changed, 185 insertions(+), 40 deletions(-)
diff --git a/changelog b/changelog
index b6c2c36..2f6b6ba 100644
--- a/changelog
+++ b/changelog
@@ -1,8 +1,35 @@
-code-saturne (2.0.0.beta2-3) UNRELEASED; urgency=low
+code-saturne (2.0.0.rc1-4) unstable; urgency=low
+ * Fix a build issue under kfreebsd-*. Thanks to Petr Salinger for the patch
+ (Closes: #571007)
+ * code-saturne recommends pdf-viewer
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Wed, 24 Feb 2010 18:04:26 +0100
+
+code-saturne (2.0.0.rc1-3) unstable; urgency=low
+
+ * Do not compress pdf files
+ * Install in code-saturne-data the bash_completion script
+ * Uses syrthes features
+ * Ship dev libraries in code-saturne-bin
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Mon, 22 Feb 2010 20:34:15 +0100
+
+code-saturne (2.0.0.rc1-2) unstable; urgency=low
+
+ * Explicit minimal versions on code-saturne dependencies
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Mon, 22 Feb 2010 10:28:01 +0100
+
+code-saturne (2.0.0.rc1-1) unstable; urgency=low
+
+ * New upstream release (Closes: #557297, #557020)
* watch file updated
+ * Update of Vcs-Svn Vcs-Browser
+ * Standards-Version updated to 3.8.4
+ * Apply cs-20rc1.diff provided by upstream to fix minor issues
- -- Sylvestre Ledru <sylvestre at debian.org> Sun, 14 Feb 2010 17:48:00 +0100
+ -- Sylvestre Ledru <sylvestre at debian.org> Sat, 20 Feb 2010 15:06:01 +0100
code-saturne (2.0.0.beta2-2) unstable; urgency=low
diff --git a/code-saturne-bin.install b/code-saturne-bin.install
index 484119f..4b6ce51 100644
--- a/code-saturne-bin.install
+++ b/code-saturne-bin.install
@@ -1,4 +1,4 @@
debian/tmp/usr/lib/*.so*
debian/tmp/usr/bin/cs_solver
-debian/tmp/usr/bin/cs
+debian/tmp/usr/bin/code_saturne
diff --git a/code-saturne-bin.lintian-overrides b/code-saturne-bin.lintian-overrides
new file mode 100644
index 0000000..e319942
--- /dev/null
+++ b/code-saturne-bin.lintian-overrides
@@ -0,0 +1,3 @@
+# No big deal
+code-saturne-bin: package-name-doesnt-match-sonames libsaturne0 libsyrcs0
+
diff --git a/code-saturne-bin.manpages b/code-saturne-bin.manpages
index fe49521..13f36b2 100644
--- a/code-saturne-bin.manpages
+++ b/code-saturne-bin.manpages
@@ -1,7 +1,2 @@
-doc/manpages/cs_create.1
-doc/manpages/cs_plot_probes.1
-doc/manpages/cs_check_mesh.1
-doc/manpages/cs_check_consistency.1
doc/manpages/cs_solver.1
-doc/manpages/cs_info.1
-doc/manpages/cs_compile.1
+doc/manpages/code_saturne.1
diff --git a/code-saturne-data.install b/code-saturne-data.install
index 91e9a0a..114e367 100644
--- a/code-saturne-data.install
+++ b/code-saturne-data.install
@@ -1,4 +1,4 @@
debian/tmp/usr/lib/python2.5/
debian/tmp/usr/share/ncs/
debian/tmp/usr/share/locale/
-
+debian/tmp/etc/bash_completion.d/code_saturne
diff --git a/code-saturne-data.lintian-overrides b/code-saturne-data.lintian-overrides
new file mode 100644
index 0000000..0615ea2
--- /dev/null
+++ b/code-saturne-data.lintian-overrides
@@ -0,0 +1,2 @@
+code-saturne-data: image-file-in-usr-lib usr/lib/python2.5/site-packages/ncs/Base/icons/SplashScreen/logocs.png
+
diff --git a/control b/control
index 53e2a0a..90f8dfd 100644
--- a/control
+++ b/control
@@ -3,15 +3,17 @@ Section: science
Priority: optional
Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Sylvestre Ledru <sylvestre at debian.org>
-Build-Depends: debhelper (>= 7), autotools-dev, cdbs, libbft-dev, libfvm-dev,
- libmei-dev, python-qt4, pyqt4-dev-tools, texlive-latex-recommended,
- texlive-fonts-recommended, texlive-latex-extra, fig2ps
-# libmed-dev, libparmetis-dev, libmedc-dev, libopenmpi-dev,
-# libhdf5-serial-dev, libcgns-dev
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 7), autotools-dev, cdbs, libbft-dev (>= 1.1.2),
+ libfvm-dev (>= 0.15.0), libmei-dev (>= 1.0.1), python-qt4, pyqt4-dev-tools,
+ texlive-latex-recommended, texlive-fonts-recommended, texlive-latex-extra,
+ fig2ps, syrthes, ecs (>= 2.0.0.rc1), gfortran, autoconf,
+# To help the configure detection on cs lib
+ zlib1g-dev, libhdf5-serial-dev, libcgns-dev, mpi-default-dev, libmedc-dev,
+ libxml2-dev, libblas-dev | libatlas-dev
+Standards-Version: 3.8.4
Homepage: http://www.code-saturne.org/
-Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/code-saturne/
-Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/code-saturne/
+Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/code-saturne/code-saturne/
+Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/code-saturne/code-saturne/
Package: code-saturne
Priority: optional
@@ -20,7 +22,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ecs,
code-saturne-bin (= ${binary:Version}),
code-saturne-data (= ${source:Version}),
code-saturne-include (= ${binary:Version}), python-qt4
-Recommends: syrthes
+Recommends: syrthes, bash-completion, paraview, pdf-viewer
Description: General purpose Computational Fluid Dynamics (CFD) software
The basic capabilities of Code_Saturne enable the handling of either
incompressible or expandable flows with or without heat transfer and
@@ -112,6 +114,7 @@ Description: General purpose Computational Fluid Dynamics (CFD) software - inclu
Package: code-saturne-doc
Priority: optional
+Section: doc
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: General purpose Computational Fluid Dynamics (CFD) software - Documentation
diff --git a/patches/cs-20rc1.diff b/patches/cs-20rc1.diff
new file mode 100644
index 0000000..247dbb4
--- /dev/null
+++ b/patches/cs-20rc1.diff
@@ -0,0 +1,115 @@
+Index: ChangeLog
+===================================================================
+--- ChangeLog (révision 1344)
++++ ChangeLog (copie de travail)
+@@ -1,6 +1,31 @@
+-* 18/02/2010 - David Monfort <david.monfort at edf.fr>
++* 19/02/2010 - David Monfort <david.monfort at edf.fr>
+ Release of Code_Saturne 2.0-rc1.
+
++* 19/02/2010 - David Monfort <david.monfort at edf.fr>
++ Remove a line introduced twice in the arguments of usray4.
++ modified routine:
++ src/rayt/raycli.f90
++
++* 19/02/2010 - David Monfort <david.monfort at edf.fr>
++ Add Clamart 2 cluster "scratchdir" to the list of the temporary directories.
++ modified scripts:
++ bin/runcase.in
++ bin/runcase.py.in
++
++* 19/02/2010 - Yvan Fournier <yvan.fournier at edf.fr>
++ Fix a bug in handling FVM long-gnum option in the restart files.
++ modified routine:
++ src/base/cs_io.c
++
++* 19/02/2010 - David Monfort <david.monfort at edf.fr>
++ Fix last-minute bug where the number of arguments of a subroutine did not
++ match (with no impact on the calculation).
++ modified routine:
++ src/cfbl/cfvarp.f90
++
++* 18/02/2010 - David Monfort <david.monfort at edf.fr>
++ Pre-release of Code_Saturne 2.0-rc1.
++
+ * 18/02/2010 - Pierre Plion <pierre.plion at edf.fr>
+ Improve combustion documentation in the theory manual.
+ added files:
+Index: src/rayt/raycli.f90
+===================================================================
+--- src/rayt/raycli.f90 (révision 1344)
++++ src/rayt/raycli.f90 (copie de travail)
+@@ -722,7 +722,6 @@
+ dt , rtp , rtpa , propce , propfa , propfb , &
+ coefa , coefb , &
+ w1 , w2 , w3 , w4 , w5 , w6 , &
+- rdevel , rtuser , &
+ propfb(1,ipprob(itparo)) , tbord , tempk , &
+ ! Resultat : T en K
+ rdevel , rtuser , &
+Index: src/cfbl/cfvarp.f90
+===================================================================
+--- src/cfbl/cfvarp.f90 (révision 1344)
++++ src/cfbl/cfvarp.f90 (copie de travail)
+@@ -144,12 +144,12 @@
+ ii , ii , ii , ii , &
+ iit , iit , iit , iit , iit , &
+ iit , iit , iit , iit , &
+- iit , iit , iit , iit , &
++ iit , iit , iit , &
+ dblpre , dblpre , dblpre , dblpre , dblpre , dblpre , dblpre , &
+ dblpre , dblpre , dblpre , dblpre , dblpre , dblpre , &
+ dblpre , dblpre , &
+ dblpre , dblpre , dblpre , dblpre , &
+- dblpre , dblpre , dblpre , dblpre )
++ dblpre , dblpre , dblpre )
+
+ ! --> Utilisation d'un flux de masse specifique pour la vitesse
+
+Index: src/base/cs_io.c
+===================================================================
+--- src/base/cs_io.c (révision 1344)
++++ src/base/cs_io.c (copie de travail)
+@@ -1937,7 +1937,7 @@
+ break;
+ case FVM_INT64:
+ outp->type_name[0] = 'i';
+- outp->type_name[1] = '4';
++ outp->type_name[1] = '8';
+ break;
+ case FVM_UINT32:
+ outp->type_name[0] = 'u';
+@@ -1945,7 +1945,7 @@
+ break;
+ case FVM_UINT64:
+ outp->type_name[0] = 'u';
+- outp->type_name[1] = '4';
++ outp->type_name[1] = '8';
+ break;
+ case FVM_CHAR:
+ outp->type_name[0] = 'c';
+Index: bin/runcase.py.in
+===================================================================
+--- bin/runcase.py.in (révision 1344)
++++ bin/runcase.py.in (copie de travail)
+@@ -205,6 +205,7 @@
+ user = os.getenv('USER')
+
+ exec_prefix_prefs = [os.getenv('SCRATCHDIR'),
++ os.path.join('/scratch', user),
+ os.path.join('/local00/users', user),
+ os.path.join('/local01/users', user)]
+
+Index: bin/runcase.in
+===================================================================
+--- bin/runcase.in (révision 1344)
++++ bin/runcase.in (copie de travail)
+@@ -315,6 +315,8 @@
+ # On the CCRT, there is no TMPDIR. We work by default in SCRATCHDIR
+ if [ "$SCRATCHDIR" != "" ] ; then
+ RUN=$SCRATCHDIR/tmp_Saturne/$STUDY.$CASE.$DATE
++ elif [ -d "/scratch/$USER" ] ; then
++ RUN=/scratch/$USER/tmp_Saturne/$STUDY.$CASE.$DATE
+ #
+ elif [ "$TMPDIR" != "" -a "$TMPDIR" != "/tmp" ] ; then
+ RUN=$TMPDIR/tmp_Saturne/$STUDY.$CASE.$DATE
diff --git a/patches/have_mpi.diff b/patches/have_mpi.diff
deleted file mode 100644
index 2233044..0000000
--- a/patches/have_mpi.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/base/cs_join_util.c.orig 2009-11-02 22:49:48.000000000 +0100
-+++ src/base/cs_join_util.c 2009-11-02 22:50:45.000000000 +0100
-@@ -374,7 +374,6 @@
- *contig_faces = _contig_faces;
- }
-
--#if defined(HAVE_MPI)
- /*----------------------------------------------------------------------------
- * Initialize a structure for the synchronization of single
- * elements
-@@ -422,6 +421,7 @@
- *sync = _sync;
- }
-
-+#if defined(HAVE_MPI)
- /*----------------------------------------------------------------------------
- * Define a structure used for synchronizing "single" vertices.
- * Use a fvm_interface_t structure to help the build.
diff --git a/patches/pypathissue.diff b/patches/pypathissue.diff
new file mode 100644
index 0000000..2a108c1
--- /dev/null
+++ b/patches/pypathissue.diff
@@ -0,0 +1,13 @@
+Index: code-saturne-2.0.0.rc1/configure.ac
+===================================================================
+--- code-saturne-2.0.0.rc1.orig/configure.ac 2010-02-24 18:05:28.000000000 +0100
++++ code-saturne-2.0.0.rc1/configure.ac 2010-02-24 18:05:45.000000000 +0100
+@@ -447,7 +447,7 @@
+ path = app.applicationDirPath()
+ sys.stdout.write(path)]"
+
+- PYPATH=`${PYTHON} -c "${prog}"`
++ PYPATH=$PATH:`${PYTHON} -c "${prog}"`
+
+ else
+ PYPATH=${PYQT4_EXE}
diff --git a/rules b/rules
index 3256625..e25f91b 100755
--- a/rules
+++ b/rules
@@ -4,12 +4,17 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
+
+DEB_CONFIGURE_USER_FLAGS := --with-syrthes=/usr/lib/syrthes/3.4.2
DEB_MAKE_BUILD_TARGET := all pdf
DEB_MAKE_INSTALL_TARGET := install install-pdf DESTDIR=`pwd`/debian/tmp
+DEB_COMPRESS_EXCLUDE := .pdf
+
+debian/stamp-autotools-files:
+ autoconf
+ touch $@
binary-install/code-saturne-data::
find debian/code-saturne-data/ -name '*.pyc' -exec rm '{}' ';'
chmod +x debian/code-saturne-data/usr/share/ncs/SaturneGUI \
- debian/code-saturne-data/usr/share/ncs/runcase \
- debian/code-saturne-data/usr/share/ncs/runcase_coupling
-
+ debian/code-saturne-data/usr/share/ncs/runcase
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/code-saturne.git
More information about the debian-science-commits
mailing list