[SCM] FreeCAD packaging branch, master, updated. 3cf2e8755b6874bc8020eca04ec96a16eccc6462

[Teemu Ikonen]

The following commit has been merged in the master branch:
commit 9ed9f26c5432fb6e5012a4c30e07bd8eb42fb813
Author: Teemu Ikonen <tpikonen at gmail.com>
Date:   Sat Jul 18 22:13:24 2009 +0200

    control: Remove Conflicts field

diff --git a/debian/control b/debian/control
index 8b09b05..91dc98f 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,6 @@ Package: freecad
 Architecture: any
 Section: science
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
-Conflicts: freecad (<= 0.6.472-1)
 Suggests: gnochm | kchmviewer | kchmviewer-nokde | xchm, python-opencv
 Description: An extensible Open Source CAx program (alpha)
  FreeCAD is an Open Source CAx RAD based on OpenCasCade, Qt and Python.

-- 
FreeCAD packaging