[SCM] OCE packaging branch, master, updated. d0ee855ff97317e7d93adf25514ac0122f9f222f

[Denis Barbier]

The following commit has been merged in the master branch:
commit d0ee855ff97317e7d93adf25514ac0122f9f222f
Author: Denis Barbier <bouzim at gmail.com>
Date:   Sat Nov 5 23:28:48 2011 +0100

    Remove Conflicts on shared library packages
    
    There are in fact no file conflicts with those packages, only -dev
    packages cause trouble.

diff --git a/debian/control b/debian/control
index 4727eb8..ade5e92 100644
--- a/debian/control
+++ b/debian/control
@@ -16,8 +16,6 @@ Package: liboce-foundation1
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: libopencascade-foundation-6.5.0
-Conflicts: libopencascade-foundation-6.5.0
 Description: OpenCASCADE CAE platform shared library
  OpenCASCADE is a suite for 3D surface and solid modeling, visualization, data
  exchange and rapid application development.  It is an excellent platform for
@@ -39,8 +37,6 @@ Package: liboce-modeling1
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: libopencascade-modeling-6.5.0
-Conflicts: libopencascade-modeling-6.5.0
 Description: OpenCASCADE CAE platform shared library
  OpenCASCADE is a suite for 3D surface and solid modeling, visualization, data
  exchange and rapid application development.  It is an excellent platform for
@@ -62,8 +58,6 @@ Package: liboce-visualization1
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: libopencascade-visualization-6.5.0
-Conflicts: libopencascade-visualization-6.5.0
 Description: OpenCASCADE CAE platform shared library
  OpenCASCADE is a suite for 3D surface and solid modeling, visualization, data
  exchange and rapid application development.  It is an excellent platform for
@@ -82,8 +76,6 @@ Package: liboce-ocaf-lite1
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: libopencascade-ocaf-lite-6.5.0
-Conflicts: libopencascade-ocaf-lite-6.5.0
 Description: OpenCASCADE CAE platform shared library
  OpenCASCADE is a suite for 3D surface and solid modeling, visualization, data
  exchange and rapid application development.  It is an excellent platform for
@@ -104,8 +96,6 @@ Package: liboce-ocaf1
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: libopencascade-ocaf-6.5.0
-Conflicts: libopencascade-ocaf-6.5.0
 Description: OpenCASCADE CAE platform shared library
  OpenCASCADE is a suite for 3D surface and solid modeling, visualization, data
  exchange and rapid application development.  It is an excellent platform for

-- 
OCE packaging