r36853 - /packages/code-aster/astk/trunk/debian/control

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Mon Aug 30 09:29:06 2010
New Revision: 36853

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36853
Log:
Fix replaces/conflicts

Modified:
    packages/code-aster/astk/trunk/debian/control

Modified: packages/code-aster/astk/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/control?rev=36853&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/control (original)
+++ packages/code-aster/astk/trunk/debian/control Mon Aug 30 09:29:06 2010
@@ -15,7 +15,8 @@
 Section: science
 Depends: tk8.5 | wish, tcl8.5 | tclsh, debconf (>= 1.5.30), ${misc:Depends}
 Recommends: code-aster-run
-Replaces: astk-server
+Replaces: astk
+Conflicts: astk
 Suggests: eficas, gmsh, grace, nedit, ddd
 Description: Graphical user interface for Code_Aster - client
  Code_Aster is the finite element PDE solver used by the French
@@ -30,6 +31,7 @@
 Section: science
 Depends: ${python:Depends}, python-numpy, debconf (>= 1.5.30), ${misc:Depends}
 Replaces: astk-server
+Conflicts: astk-server
 Suggests: emacs, gdb, ddd
 Description: Graphical user interface for Code_Aster - server
  Code_Aster is the finite element PDE solver used by the French