[code-saturne] 54/70: Merge fix from jessie at 46989

[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 1aa7d0828820e2e9523d9bf1be03875602c9a384
Author: Gilles Filippini <pini at debian.org>
Date:   Sat Jan 17 17:15:19 2015 +0000

    Merge fix from jessie at 46989
---
 debian/changelog | 8 ++++++++
 debian/control   | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4f52008..d17d334 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+code-saturne (3.3.3-1~exp3) experimental; urgency=medium
+
+  * Merge fix from unstable (3.3.2-4):
+    debian/control: add Breaks and Replaces stanzas to allow smooth
+    upgrade with the previous fix.
+
+ -- Gilles Filippini <pini at debian.org>  Sat, 17 Jan 2015 18:11:35 +0100
+
 code-saturne (3.3.3-1~exp2) experimental; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index a3ac505..384a6f5 100644
--- a/debian/control
+++ b/debian/control
@@ -99,6 +99,8 @@ Priority: optional
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libcgns-dev, libmedc-dev,
  libhdf5-dev, zlib1g-dev, mpi-default-dev, libxml2-dev
+Replaces: code-saturne-data (<< 3.3.2-3)
+Breaks: code-saturne-data (<< 3.3.2-3)
 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

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