r46991 - in /packages/code-saturne/trunk/debian: changelog control

[pini at users.alioth.debian.org]

Author: pini
Date: Sat Jan 17 17:15:19 2015
New Revision: 46991

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46991
Log:
Merge fix from jessie at 46989

Modified:
    packages/code-saturne/trunk/debian/changelog
    packages/code-saturne/trunk/debian/control

Modified: packages/code-saturne/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/code-saturne/trunk/debian/changelog?rev=46991&op=diff
==============================================================================
--- packages/code-saturne/trunk/debian/changelog	(original)
+++ packages/code-saturne/trunk/debian/changelog	Sat Jan 17 17:15:19 2015
@@ -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.

Modified: packages/code-saturne/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/code-saturne/trunk/debian/control?rev=46991&op=diff
==============================================================================
--- packages/code-saturne/trunk/debian/control	(original)
+++ packages/code-saturne/trunk/debian/control	Sat Jan 17 17:15:19 2015
@@ -99,6 +99,8 @@
 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