[code-saturne] 01/06: code-saturne (2.1.0-1) 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 df68fd851a39352733cb6f99f780e45d7ff616f5
Author: Sylvestre Ledru <sylvestre at debian.org>
Date:   Mon Nov 21 12:21:46 2011 +0000

    code-saturne (2.1.0-1) unstable; urgency=low
    
      * New upstream release. Merge all dependencies into a single source package.
      * Fix some minor lintian warnings.
---
 changelog                 | 3 ++-
 code-saturne-bin.install  | 2 +-
 code-saturne-bin.manpages | 1 -
 code-saturne-data.install | 2 +-
 code-saturne-doc.install  | 2 +-
 control                   | 8 ++++++--
 rules                     | 7 +++----
 7 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/changelog b/changelog
index 29aefe1..57f1620 100644
--- a/changelog
+++ b/changelog
@@ -1,6 +1,7 @@
 code-saturne (2.1.0-1) unstable; urgency=low
 
-  * New upstream release. Merge all dependencies into a single package.
+  * New upstream release. Merge all dependencies into a single source package.
+  * Fix some minor lintian warnings.
 
  -- Sylvestre Ledru <sylvestre at debian.org>  Tue, 01 Nov 2011 17:43:32 +0100
 
diff --git a/code-saturne-bin.install b/code-saturne-bin.install
index 4b6ce51..df831c0 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/lib/code-saturne/code_saturne/cs_solver
 debian/tmp/usr/bin/code_saturne
 
diff --git a/code-saturne-bin.manpages b/code-saturne-bin.manpages
index 13f36b2..8469139 100644
--- a/code-saturne-bin.manpages
+++ b/code-saturne-bin.manpages
@@ -1,2 +1 @@
-doc/manpages/cs_solver.1
 doc/manpages/code_saturne.1
diff --git a/code-saturne-data.install b/code-saturne-data.install
index c9502a1..9602e01 100644
--- a/code-saturne-data.install
+++ b/code-saturne-data.install
@@ -1,4 +1,4 @@
 debian/tmp/usr/lib/python*/
-debian/tmp/usr/share/ncs/
+debian/tmp/usr/share/code_saturne/
 debian/tmp/usr/share/locale/
 debian/tmp/etc/bash_completion.d/code_saturne
diff --git a/code-saturne-doc.install b/code-saturne-doc.install
index 1560064..74b9cdc 100644
--- a/code-saturne-doc.install
+++ b/code-saturne-doc.install
@@ -1 +1 @@
-debian/tmp/usr/share/doc/ncs/*
+debian/tmp/usr/share/doc/code_saturne/*
diff --git a/control b/control
index 126365b..dc2da63 100644
--- a/control
+++ b/control
@@ -47,6 +47,8 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python,
  libxml2-dev, libblas-dev
 Recommends: code-saturne
+Replaces: libbft-dev, libfvm-dev, libmei-dev
+Conflicts: libbft-dev, libfvm-dev, libmei-dev
 Description: General purpose Computational Fluid Dynamics (CFD) software - binaries
  The basic capabilities of Code_Saturne enable the handling of either
  incompressible or expandable flows with or without heat transfer and
@@ -69,7 +71,9 @@ Description: General purpose Computational Fluid Dynamics (CFD) software - binar
 Package: code-saturne-data
 Priority: optional
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, python
+Replaces: python-mei
+Conflicts: python-mei
 Recommends: code-saturne
 Description: General purpose Computational Fluid Dynamics (CFD) software - data
  The basic capabilities of Code_Saturne enable the handling of either
@@ -116,7 +120,7 @@ Description: General purpose Computational Fluid Dynamics (CFD) software - inclu
 Package: code-saturne-doc
 Priority: optional
 Section: doc
-Architecture: any
+Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: General purpose Computational Fluid Dynamics (CFD) software - Documentation
  The basic capabilities of Code_Saturne enable the handling of either
diff --git a/rules b/rules
index 07314c5..33610c8 100755
--- a/rules
+++ b/rules
@@ -3,7 +3,6 @@
 
 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/ --with-mpi CFLAGS="-I/usr/lib/openmpi/include/"
 DEB_MAKE_BUILD_TARGET    := all pdf
@@ -11,9 +10,9 @@ DEB_MAKE_INSTALL_TARGET  := install install-pdf DESTDIR=`pwd`/debian/tmp
 DEB_COMPRESS_EXCLUDE := .pdf
 
 binary-install/code-saturne-bin::
-	chrpath -d debian/code-saturne-bin/usr/bin/cs_solver
+	chrpath -d debian/tmp/usr/lib/code-saturne/code_saturne/cs_solver
 
 binary-install/code-saturne-data::
-	chmod +x debian/code-saturne-data/usr/share/ncs/SaturneGUI \
-		debian/code-saturne-data/usr/share/ncs/runcase
+	chmod +x debian/code-saturne-data/usr/share/code_saturne/SaturneGUI \
+		debian/code-saturne-data/usr/share/code_saturne/runcase*
 	dh_python2 -pcode-saturne-data

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