r46697 - in /packages/fenics/dolfin/trunk/debian: changelog control

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

Author: johannr-guest
Date: Wed Jun  4 14:43:50 2014
New Revision: 46697

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46697
Log:
Add libdolfin1.3-dev to Conflicts and Replaces.

Modified:
    packages/fenics/dolfin/trunk/debian/changelog
    packages/fenics/dolfin/trunk/debian/control

Modified: packages/fenics/dolfin/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/changelog?rev=46697&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/changelog	(original)
+++ packages/fenics/dolfin/trunk/debian/changelog	Wed Jun  4 14:43:50 2014
@@ -11,6 +11,8 @@
     - Replace swig2.0 with swig in Build-Depends.
     - Remove ufc and python-ufc from Build-Depends and from Depends for
       binary package libdolfin1.4-dev and python-dolfin.
+    - Add libdolfin1.3-dev in Conflicts and Replaces for binary package
+      libdolfin1.4-dev.
   * Move debian/libdolfin1.3.install -> debian/libdolfin1.4.install
     and debian/libdolfin1.3-dev.install -> debian/libdolfin1.4-dev.install.
   * debian/rules:

Modified: packages/fenics/dolfin/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/control?rev=46697&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/control	(original)
+++ packages/fenics/dolfin/trunk/debian/control	Wed Jun  4 14:43:50 2014
@@ -68,8 +68,8 @@
  libqt4-dev,
  libeigen3-dev,
  ${misc:Depends}
-Conflicts: libdolfin1.2-dev, libdolfin1.1-dev, libdolfin1.0-dev, libdolfin0-dev
-Replaces: libdolfin1.2-dev, libdolfin1.1-dev, libdolfin1.0-dev, libdolfin0-dev
+Conflicts: libdolfin1.3-dev, libdolfin1.2-dev, libdolfin1.1-dev, libdolfin1.0-dev, libdolfin0-dev
+Replaces: libdolfin1.3-dev, libdolfin1.2-dev, libdolfin1.1-dev, libdolfin1.0-dev, libdolfin0-dev
 Description: Shared links and header files for DOLFIN
  DOLFIN is the Python and C++ interface of the FEniCS project for the
  automated solution of differential equations, providing a consistent