r36888 - in /packages/code-aster/astk/trunk/debian: changelog control

[trophime-guest at users.alioth.debian.org]

Author: trophime-guest
Date: Mon Sep 13 08:13:14 2010
New Revision: 36888

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36888
Log:
Add astk-server to  Replaces/conflicts

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

Modified: packages/code-aster/astk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/changelog?rev=36888&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/changelog (original)
+++ packages/code-aster/astk/trunk/debian/changelog Mon Sep 13 08:13:14 2010
@@ -2,9 +2,11 @@
 
   * Add directory $ASTER_ROOT/outils
   * Add links to gmsh, grace, eficasQt to $ASTER_ROOT/outils
-  * debian/control : add gmsh, grace, eficas to BuildDepends 
+  * debian/control : 
+     Add gmsh, grace, eficas to BuildDepends
+     Add astk-server to  Replaces/conflicts Closes: #596660
 
- -- Christophe Trophime <christophe.trophime at grenoble.cnrs.fr>  Tue, 31 Aug 2010 11:46:19 +0200
+ -- Christophe Trophime <christophe.trophime at grenoble.cnrs.fr>  Mon, 13 Sep 2010 10:00:19 +0200
 
 astk (1.8.1-2) unstable; urgency=low
 

Modified: packages/code-aster/astk/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/control?rev=36888&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/control (original)
+++ packages/code-aster/astk/trunk/debian/control Mon Sep 13 08:13:14 2010
@@ -16,8 +16,8 @@
 Section: science
 Depends: tk8.5 | wish, tcl8.5 | tclsh, debconf (>= 1.5.30), ${misc:Depends}
 Recommends: code-aster-run
-Replaces: astk
-Conflicts: astk
+Replaces: astk, astk-server
+Conflicts: astk, astk-server
 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
@@ -31,8 +31,8 @@
 Architecture: all
 Section: science
 Depends: ${python:Depends}, python-numpy, debconf (>= 1.5.30), ${misc:Depends}
-Replaces: astk-server
-Conflicts: astk-server
+Replaces: astk, astk-server
+Conflicts: astk, 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