[code-saturne] 03/70: misc modifications for code saturne main package

Gilles Filippini pini at debian.org
Sun Jan 18 22:32:58 UTC 2015


This is an automated email from the git hooks/post-receive script.

pini pushed a commit to branch master
in repository code-saturne.

commit e6cd2ddef6756b293133e5e31759afa529e6c3c9
Author: Sylvestre Ledru <sylvestre at debian.org>
Date:   Sat Oct 17 00:16:29 2009 +0000

    misc modifications for code saturne main package
---
 debian/changelog                                   |  4 +--
 debian/{ncs.manpages => code-saturne-bin.manpages} |  4 +--
 debian/control                                     | 39 +++++++++++-----------
 debian/docs                                        |  4 +++
 debian/patches/have_mpi.diff                       | 18 ++++++++++
 debian/rules                                       | 10 +++---
 debian/watch                                       |  2 +-
 7 files changed, 52 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2b33260..b34524d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-ncs (1.4.0-1) unstable; urgency=low
+ncs (2.0.0.beta2-1) unstable; urgency=low
 
   * Initial release (Closes: #501915)
 
- -- Sylvestre Ledru <sylvestre.ledru at inria.fr>  Sat, 11 Oct 2008 13:38:20 +0200
+ -- Sylvestre Ledru <sylvestre at debian.org>  Sat, 11 Oct 2008 13:38:20 +0200
 
diff --git a/debian/ncs.manpages b/debian/code-saturne-bin.manpages
similarity index 73%
rename from debian/ncs.manpages
rename to debian/code-saturne-bin.manpages
index a1ae664..fe49521 100644
--- a/debian/ncs.manpages
+++ b/debian/code-saturne-bin.manpages
@@ -2,6 +2,6 @@ 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_config.1
-
+doc/manpages/cs_compile.1
diff --git a/debian/control b/debian/control
index 3a8de36..83894e3 100644
--- a/debian/control
+++ b/debian/control
@@ -2,45 +2,47 @@ Source: ncs
 Section: science
 Priority: optional
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
-Uploaders: Sylvestre Ledru <sylvestre.ledru at inria.fr>,
- Torsten Werner <twerner at debian.org>
-Build-Depends: debhelper (>= 7), autotools-dev, cdbs, libbft-dev, libfvm-dev
+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
 # libmed-dev, libparmetis-dev, libmedc-dev, libopenmpi-dev, 
 # libhdf5-serial-dev, libcgns-dev
-Standards-Version: 3.8.1
+Standards-Version: 3.8.3
 Homepage: http://www.code-saturne.org/
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/ncs/
 Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/ncs/
-DM-Upload-Allowed: yes
 
-Package: ncs
+Package: code-saturne
 Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},  python (>= 2.5), libncs0
-Description: Code_Saturne Preprocessor
+Depends: ${shlibs:Depends}, ${misc:Depends}, ecs, 
+ code-saturne-bin (= ${binary:Version}),
+ code-saturne-data (= ${binary:Version}),
+ code-saturne-include (= ${binary:Version})
+Recommands: syrthes
+Description: Code_Saturne
  NCS means "Noyau Code Saturne". This package is the Kernel of
  of Code_Saturne (a computational fluid dynamics free software).
 
-Package: code_saturne
+Package: code-saturne-bin
 Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},  ncs, ecs, ics
+Depends: ${shlibs:Depends}, ${misc:Depends}, python
+Recommands: code-saturne
 Description: Code_Saturne
  NCS means "Noyau Code Saturne". This package is the Kernel of
  of Code_Saturne (a computational fluid dynamics free software).
 
-
-Package: libncs0
+Package: code-saturne-data
 Priority: optional
-Architecture: any
+Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Code_Saturne Preprocessor - Library
+Recommands: code-saturne
+Description: Code_Saturne
  NCS means "Noyau Code Saturne". This package is the Kernel of
  of Code_Saturne (a computational fluid dynamics free software).
- .
- This package contains the library used by ncs
 
-Package: ncs-include
+Package: code-saturne-include
 Priority: optional
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -48,5 +50,4 @@ Description: Code_Saturne Preprocessor - include files
  NCS means "Noyau Code Saturne". This package is the Kernel of
  of Code_Saturne (a computational fluid dynamics free software).
  .
- This package contains the include files
-
+ This package contains the include files.
diff --git a/debian/docs b/debian/docs
index 50bd824..184a1e6 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,2 +1,6 @@
 NEWS
 README
+COMPATIBILITY
+QUALITY_ASSURANCE
+TODO
+
diff --git a/debian/patches/have_mpi.diff b/debian/patches/have_mpi.diff
new file mode 100644
index 0000000..80a01ef
--- /dev/null
+++ b/debian/patches/have_mpi.diff
@@ -0,0 +1,18 @@
+--- ncs-2.0.0-beta2.orig/src/base/cs_join_util.c	2009-10-16 22:15:33.000000000 +0200
++++ ncs-2.0.0-beta2/src/base/cs_join_util.c	2009-10-16 21:51:42.000000000 +0200
+@@ -374,6 +374,7 @@
+   *contig_faces = _contig_faces;
+ }
+ 
++#if defined(HAVE_MPI)
+ /*----------------------------------------------------------------------------
+  * Initialize a structure for the synchronization of single
+  * elements
+@@ -421,7 +422,6 @@
+   *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/debian/rules b/debian/rules
index 8af1ca7..6ca8040 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,11 @@
 #!/usr/bin/make -f
-# Copyright 2009 Sylvestre Ledru <sylvestre.ledru at inria.fr>
+# Copyright 2009 Sylvestre Ledru <sylvestre at debian.org>
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-
-#DEB_CONFIGURE_NORMAL_ARGS += --with-metis-include=/usr/include/metis/
-#	--with-med-include=/usr/include/ 
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_MAKE_INSTALL_TARGET  := install DESTDIR=`pwd`/debian/tmp
+
+binary-install/code-saturne-data::
+	find debian/code-saturne-data/ -name '*.pyc' -exec rm '{}' ';'
diff --git a/debian/watch b/debian/watch
index 818d7b8..86cdac8 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
- http://rd.edf.com/the-edf-offers/research-and-development/softwares/code-saturne/code-saturne-download-107009.html .*/ncs-(\d)(\d)(\d)\.tgz debian
+ http://rd.edf.com/the-edf-offers/research-and-development/softwares/code-saturne/code-saturne-download-107009.html .*/ncs-(\d)(\d)(\d)-(.*)\.tgz debian

-- 
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