[code-saturne] 02/06: code-saturne (2.1.0-2) unstable; urgency=low

[Gilles Filippini]

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

pini pushed a commit to annotated tag debian/2.1.0-3
in repository code-saturne.

commit e2d66ff0b45ee491546c6c9757d51707fc595cea
Author: Sylvestre Ledru <sylvestre at debian.org>
Date:   Mon Nov 21 14:16:10 2011 +0000

    code-saturne (2.1.0-2) unstable; urgency=low
    
      * Fix some various issues reported by upstream.
---
 changelog                          |  6 ++++++
 code-saturne-bin.install           |  4 +---
 code-saturne-bin.lintian-overrides | 10 +++++++++-
 code-saturne-data.install          |  2 ++
 control                            |  5 +++--
 rules                              | 11 ++++++-----
 6 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/changelog b/changelog
index 57f1620..24be48a 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+code-saturne (2.1.0-2) unstable; urgency=low
+
+  * Fix some various issues reported by upstream.
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Mon, 21 Nov 2011 14:49:56 +0100
+
 code-saturne (2.1.0-1) unstable; urgency=low
 
   * New upstream release. Merge all dependencies into a single source package.
diff --git a/code-saturne-bin.install b/code-saturne-bin.install
index df831c0..9b09863 100644
--- a/code-saturne-bin.install
+++ b/code-saturne-bin.install
@@ -1,4 +1,2 @@
 debian/tmp/usr/lib/*.so*
-debian/tmp/usr/lib/code-saturne/code_saturne/cs_solver
-debian/tmp/usr/bin/code_saturne
-
+debian/tmp/usr/lib/code_saturne/cs_*
diff --git a/code-saturne-bin.lintian-overrides b/code-saturne-bin.lintian-overrides
index e319942..6188da9 100644
--- a/code-saturne-bin.lintian-overrides
+++ b/code-saturne-bin.lintian-overrides
@@ -1,3 +1,11 @@
 # No big deal
-code-saturne-bin: package-name-doesnt-match-sonames libsaturne0 libsyrcs0
+code-saturne-bin: package-name-doesnt-match-sonames libbft0 libfvm0 libfvm-filters0 libmei0 libple0 libsaturne0 libsyrcs0
 
+# Normal
+code-saturne-bin: non-dev-pkg-with-shlib-symlink usr/lib/libfvm.so.0.0.0 usr/lib/libfvm.so
+code-saturne-bin: non-dev-pkg-with-shlib-symlink usr/lib/libsyrcs.so.0.0.0 usr/lib/libsyrcs.so
+code-saturne-bin: non-dev-pkg-with-shlib-symlink usr/lib/libple.so.0.0.0 usr/lib/libple.so
+code-saturne-bin: non-dev-pkg-with-shlib-symlink usr/lib/libsaturne.so.0.0.0 usr/lib/libsaturne.so
+code-saturne-bin: non-dev-pkg-with-shlib-symlink usr/lib/libmei.so.0.0.0 usr/lib/libmei.so
+code-saturne-bin: non-dev-pkg-with-shlib-symlink usr/lib/libfvm_filters.so.0.0.0 usr/lib/libfvm_filters.so
+code-saturne-bin: non-dev-pkg-with-shlib-symlink usr/lib/libbft.so.0.0.0 usr/lib/libbft.so
diff --git a/code-saturne-data.install b/code-saturne-data.install
index 9602e01..c585920 100644
--- a/code-saturne-data.install
+++ b/code-saturne-data.install
@@ -2,3 +2,5 @@ debian/tmp/usr/lib/python*/
 debian/tmp/usr/share/code_saturne/
 debian/tmp/usr/share/locale/
 debian/tmp/etc/bash_completion.d/code_saturne
+debian/tmp/etc/code_saturne.cfg
+
diff --git a/control b/control
index dc2da63..dc8219e 100644
--- a/control
+++ b/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 7), autotools-dev, cdbs, python-qt4,
 # To help the configure detection on cs lib
   zlib1g-dev, libhdf5-mpi-dev, libcgns-dev, mpi-default-dev, libmedc-dev,
   libxml2-dev, libblas-dev | libatlas-dev, libopenmpi-dev,
-  chrpath, python
+  chrpath, python, libscotch-dev
 Standards-Version: 3.9.2
 Homepage: http://www.code-saturne.org/
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/code-saturne/code-saturne/
@@ -97,7 +97,8 @@ Description: General purpose Computational Fluid Dynamics (CFD) software - data
 Package: code-saturne-include
 Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, libcgns-dev, libmedc-dev,
+ libhdf5-dev | libhdf5-serial-dev, zlib1g-dev, mpi-default-dev, libxml2-dev
 Description: General purpose Computational Fluid Dynamics (CFD) software - includes
  The basic capabilities of Code_Saturne enable the handling of either
  incompressible or expandable flows with or without heat transfer and
diff --git a/rules b/rules
index 33610c8..e7b341f 100755
--- a/rules
+++ b/rules
@@ -4,13 +4,14 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
-DEB_CONFIGURE_USER_FLAGS := --with-syrthes=/usr/lib/syrthes/ --with-mpi CFLAGS="-I/usr/lib/openmpi/include/"
-DEB_MAKE_BUILD_TARGET    := all pdf
-DEB_MAKE_INSTALL_TARGET  := install install-pdf DESTDIR=`pwd`/debian/tmp
+DEB_CONFIGURE_USER_FLAGS := --with-syrthes=/usr/lib/syrthes/ --with-mpi  --libexecdir=/usr/lib/
+#--libdir=/usr/lib/code_saturne
+DEB_MAKE_BUILD_TARGET    := all
+DEB_MAKE_INSTALL_TARGET  := install DESTDIR=`pwd`/debian/tmp
 DEB_COMPRESS_EXCLUDE := .pdf
 
-binary-install/code-saturne-bin::
-	chrpath -d debian/tmp/usr/lib/code-saturne/code_saturne/cs_solver
+install/code-saturne-bin::
+	chrpath -d debian/tmp/usr/lib/code_saturne/cs_*
 
 binary-install/code-saturne-data::
 	chmod +x debian/code-saturne-data/usr/share/code_saturne/SaturneGUI \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/code-saturne.git