[code-saturne] 01/04: Moved at the right place since they all merged

[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-4
in repository code-saturne.

commit 61c4791fca5e062abcf4faf5a8c08f1a73bc57cb
Merge: a99ef7e e2d66ff
Author: Sylvestre Ledru <sylvestre at debian.org>
Date:   Sun Dec 11 18:25:49 2011 +0000

    Moved at the right place since they all merged

 changelog                           | 94 ++++++++++++++++++++++++++++++++++++-
 code-saturne-bin.install            |  4 +-
 code-saturne-bin.lintian-overrides  | 11 +++++
 code-saturne-bin.manpages           |  8 +---
 code-saturne-data.install           |  6 ++-
 code-saturne-data.lintian-overrides |  1 +
 code-saturne-doc.install            |  2 +-
 control                             | 37 +++++++++------
 docs                                |  1 -
 orig-tar.sh                         | 21 +++++++++
 patches/have_mpi.diff               | 18 -------
 rules                               | 20 ++++----
 source/format                       |  1 +
 watch                               |  4 +-
 14 files changed, 171 insertions(+), 57 deletions(-)

diff --cc changelog
index b6c2c36,24be48a..b21f4c5
--- a/changelog
+++ b/changelog
@@@ -1,8 -1,92 +1,98 @@@
- code-saturne (2.0.0.beta2-3) UNRELEASED; urgency=low
++code-saturne (2.1.0-3) unstable; urgency=low
 +
++  * Install a missing file
++
++ -- Sylvestre Ledru <sylvestre at debian.org>  Thu, 24 Nov 2011 00:00:08 +0100
++
+ 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.
+   * Fix some minor lintian warnings.
+ 
+  -- 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
+   * Standards-Version updated to version 3.9.2
+   * Python byte-compile files are now compiled (Closes: #566040)
+ 
+  -- Sylvestre Ledru <sylvestre at debian.org>  Tue, 26 Jul 2011 22:50:52 +0200
+ 
+ code-saturne (2.0.1-4) unstable; urgency=low
+ 
+   * python-mei, libbft-dev, libfvm-dev, libmei-dev, libxml2-dev, libblas-dev
+     added as dependencies of code-saturne-bin
+   * code-saturne-doc added as recommends of code-saturne
+ 
+  -- Sylvestre Ledru <sylvestre at debian.org>  Mon, 07 Mar 2011 21:47:26 +0100
+ 
+ code-saturne (2.0.1-3) unstable; urgency=low
+ 
+   * syrthes changed its path
+ 
+  -- Sylvestre Ledru <sylvestre at debian.org>  Sun, 20 Feb 2011 23:09:54 +0100
+ 
+ code-saturne (2.0.1-2) unstable; urgency=low
+ 
+   * Forgot chrpath as build dependency
+ 
+  -- Sylvestre Ledru <sylvestre at debian.org>  Sat, 19 Feb 2011 14:47:03 +0100
+ 
+ code-saturne (2.0.1-1) unstable; urgency=low
+ 
+   * New upstream release
+   * Switch to dpkg-source 3.0 (quilt) format
+   * watch file updated
+   * Repack script updated
+ 
+  -- Sylvestre Ledru <sylvestre at debian.org>  Tue, 08 Feb 2011 18:17:01 +0100
+ 
+ code-saturne (2.0.0.rc1-5) unstable; urgency=low
+ 
+   * Change dependency from hdf5-serial to hdf5-mpi (Closes: #591154)
+   * Standards-Version updated to version 3.9.1
+ 
+  -- Sylvestre Ledru <sylvestre at debian.org>  Sat, 09 Oct 2010 00:45:37 +0200
+ 
+ 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 --cc code-saturne-bin.install
index 484119f,9b09863..209fb64
--- a/code-saturne-bin.install
+++ b/code-saturne-bin.install
@@@ -1,4 -1,2 +1,4 @@@
  debian/tmp/usr/lib/*.so*
- debian/tmp/usr/bin/cs_solver
- debian/tmp/usr/bin/cs
+ debian/tmp/usr/lib/code_saturne/cs_*
++debian/tmp/usr/bin/
 +

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