[SCM] FreeCAD packaging branch, master, updated. debian/0.10.3247.dfsg-2-10-g83e9150

[Adam C Powell IV]

The following commit has been merged in the master branch:
commit 4ce6ae2d798baaea43df8ff62462dd9aba5892b5
Author: Adam C Powell IV <hazelsct at debian.org>
Date:   Sun Apr 10 23:36:26 2011 -0400

    Merge Denis' OpenCASCADE 6.5.0 compatibility patch

diff --git a/debian/changelog b/debian/changelog
index 93aeb83..653319b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
 freecad (0.11.3729.dfsg-1) UNRELEASED; urgency=low
 
   * New upstream (closes: #622213).
+  * Merge OpenCASCADE 6.5.0 compatibility patch (closes: #617545).
   * Does not install .la files (closes: #621298).
 
- -- "Adam C. Powell, IV" <hazelsct at debian.org>  Sun, 10 Apr 2011 23:22:58 -0400
+ -- "Adam C. Powell, IV" <hazelsct at debian.org>  Sun, 10 Apr 2011 23:35:53 -0400
 
 freecad (0.10.3247.dfsg-2) unstable; urgency=low
 
diff --git a/debian/patches/freecad-occ650.patch b/debian/patches/freecad-occ650.patch
new file mode 100644
index 0000000..8451c15
--- /dev/null
+++ b/debian/patches/freecad-occ650.patch
@@ -0,0 +1,27 @@
+Index: freecad/src/Mod/Part/App/PrimitiveFeature.cpp
+===================================================================
+--- freecad.orig/src/Mod/Part/App/PrimitiveFeature.cpp
++++ freecad/src/Mod/Part/App/PrimitiveFeature.cpp
+@@ -141,9 +141,6 @@
+     case BRepBuilderAPI_ParametersOutOfRange:
+         error = "parameters out of range";
+         break;
+-    case BRepBuilderAPI_SurfaceNotC2:
+-        error = "surface not C2";
+-        break;
+     default:
+         error = "unknown error";
+         break;
+Index: freecad/src/Mod/Part/App/TopoShape.cpp
+===================================================================
+--- freecad.orig/src/Mod/Part/App/TopoShape.cpp
++++ freecad/src/Mod/Part/App/TopoShape.cpp
+@@ -139,8 +139,6 @@
+         return "Curve projection failed";
+     case BRepBuilderAPI_ParametersOutOfRange:
+         return "Parameters out of range";
+-    case BRepBuilderAPI_SurfaceNotC2:
+-        return "Surface not C2-continous";
+     default:
+         return "Unknown creation error";
+     }
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..fbd705f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+freecad-occ650.patch

-- 
FreeCAD packaging