[code-saturne] 28/70: First update with the version 2.1.0

[Gilles Filippini]

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

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

commit 51db1b44c3159e61ef345578a604544b5f997eac
Author: Sylvestre Ledru <sylvestre at debian.org>
Date:   Tue Nov 1 17:11:58 2011 +0000

    First update with the version 2.1.0
---
 debian/changelog                |  6 ++++++
 debian/control                  | 11 +++++------
 debian/orig-tar.sh              |  2 +-
 debian/patches/pypathissue.diff | 13 -------------
 debian/watch                    |  2 +-
 5 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8eca4b6..29aefe1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+code-saturne (2.1.0-1) unstable; urgency=low
+
+  * New upstream release. Merge all dependencies into a single package.
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Tue, 01 Nov 2011 17:43:32 +0100
+
 code-saturne (2.0.2-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 06390bb..126365b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,9 @@ 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 (>= 1.1.4),
- libfvm-dev (>= 0.15.2-2), libmei-dev (>= 1.0.1), python-qt4, pyqt4-dev-tools, 
+Build-Depends: debhelper (>= 7), autotools-dev, cdbs, python-qt4,
+ pyqt4-dev-tools, fig2ps, syrthes, gfortran, autoconf,
  texlive-latex-recommended, texlive-fonts-recommended, texlive-latex-extra, 
- fig2ps, syrthes, ecs (>= 2.0.1), gfortran, autoconf,
 # 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,
@@ -19,7 +18,7 @@ Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/code-saturne/
 Package: code-saturne
 Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ecs, 
+Depends: ${shlibs:Depends}, ${misc:Depends},
  code-saturne-bin (= ${binary:Version}),
  code-saturne-data (= ${source:Version}),
  code-saturne-include (= ${binary:Version}), python-qt4
@@ -45,8 +44,8 @@ Description: General purpose Computational Fluid Dynamics (CFD) software
 Package: code-saturne-bin
 Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, python, python-mei,
- libbft-dev, libfvm-dev, libmei-dev, libxml2-dev, libblas-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, python,
+ libxml2-dev, libblas-dev
 Recommends: code-saturne
 Description: General purpose Computational Fluid Dynamics (CFD) software - binaries
  The basic capabilities of Code_Saturne enable the handling of either
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index bfc2065..348e39e 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -1,7 +1,7 @@
 #!/bin/sh -e
 
 # called by uscan with '--upstream-version' <version> <file>
-DIR=ncs-$2
+DIR=code_saturne-$2
 DIRTARGET=code-saturne-$2
 TAR=../code-saturne_$2.orig.tar.bz2
 
diff --git a/debian/patches/pypathissue.diff b/debian/patches/pypathissue.diff
deleted file mode 100644
index 2a108c1..0000000
--- a/debian/patches/pypathissue.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-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/debian/watch b/debian/watch
index 7ec66ee..e5ec95f 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
 http://research.edf.com/research-and-the-scientific-community/softwares/code-saturne/download-code-saturne-80059.html \
-.*/ncs-(\d)(\d)(\d)\.zip debian debian/orig-tar.sh
+.*/code_saturne-(\d)(\d)(\d)\.zip debian debian/orig-tar.sh

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