diff -Nru netgen-4.9.13.dfsg/debian/changelog netgen-4.9.13.dfsg/debian/changelog
--- netgen-4.9.13.dfsg/debian/changelog	2011-11-14 00:44:09.000000000 +0000
+++ netgen-4.9.13.dfsg/debian/changelog	2012-06-21 10:18:48.000000000 +0000
@@ -1,3 +1,17 @@
+netgen (4.9.13.dfsg-4ubuntu1) quantal; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Build-depend on libjpeg-dev rather than libjpeg62-dev.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Thu, 21 Jun 2012 11:18:46 +0100
+
+netgen (4.9.13.dfsg-4) unstable; urgency=low
+
+  [ Denis Barbier ]
+  * Switch from OpenCASCADE to OCE (closes: #659132).
+
+ -- "Adam C. Powell, IV" <hazelsct@debian.org>  Tue, 06 Mar 2012 11:17:32 -0500
+
 netgen (4.9.13.dfsg-3ubuntu1) precise; urgency=low
 
   * Build-depend on libjpeg-dev rather than libjpeg62-dev.
diff -Nru netgen-4.9.13.dfsg/debian/control netgen-4.9.13.dfsg/debian/control
--- netgen-4.9.13.dfsg/debian/control	2011-11-14 00:43:29.000000000 +0000
+++ netgen-4.9.13.dfsg/debian/control	2012-06-21 10:18:24.000000000 +0000
@@ -8,9 +8,9 @@
 Build-Depends: quilt, cdbs, debhelper (>= 7), autotools-dev, automake, libtool,
  g++ (>= 4.0), tcl8.5-dev, tk8.5-dev, tix-dev (>= 8.4.3-2),
  docbook-to-man, libxmu-dev, libglu1-mesa-dev,
- libgl1-mesa-dev|nvidia-glx-dev, libopencascade-foundation-dev,
- libopencascade-modeling-dev (>= 6.5.0.dfsg-1), libopencascade-visualization-dev,
- libopencascade-ocaf-dev, libopencascade-ocaf-lite-dev, libtogl-dev (>= 1.7),
+ libgl1-mesa-dev|nvidia-glx-dev, liboce-foundation-dev,
+ liboce-modeling-dev, liboce-visualization-dev,
+ liboce-ocaf-dev, liboce-ocaf-lite-dev, libtogl-dev (>= 1.7),
  libswscale-dev, libavformat-dev, libavcodec-dev, libjpeg-dev, libbz2-dev
 Standards-Version: 3.9.1
 Vcs-Git: git://git.debian.org/git/debian-science/packages/netgen.git
diff -Nru netgen-4.9.13.dfsg/debian/patches/configure-occ.patch netgen-4.9.13.dfsg/debian/patches/configure-occ.patch
--- netgen-4.9.13.dfsg/debian/patches/configure-occ.patch	2010-10-22 02:54:57.000000000 +0000
+++ netgen-4.9.13.dfsg/debian/patches/configure-occ.patch	2012-03-06 16:16:26.000000000 +0000
@@ -9,7 +9,7 @@
  if test a$occon = atrue ; then
  
 -	AC_SUBST([OCCFLAGS], ["-DOCCGEOMETRY -I$occdir/inc"])
-+	AC_SUBST([OCCFLAGS], ["-DOCCGEOMETRY -I$occdir/include/opencascade"])
++	AC_SUBST([OCCFLAGS], ["-DOCCGEOMETRY -I$occdir/include/oce"])
  	AC_SUBST([OCCLIBS], ["-L$occdir/lib -lTKernel -lTKGeomBase -lTKMath -lTKG2d -lTKG3d -lTKXSBase -lTKOffset -lTKFillet -lTKShHealing -lTKMesh -lTKMeshVS -lTKTopAlgo -lTKGeomAlgo -lTKBool -lTKPrim -lTKBO -lTKIGES -lTKBRep -lTKSTEPBase -lTKSTEP -lTKSTL -lTKSTEPAttr -lTKSTEP209 -lTKXDESTEP -lTKXDEIGES -lTKXCAF -lTKLCAF -lFWOSPlugin"])
  
  #  -lTKDCAF
diff -Nru netgen-4.9.13.dfsg/debian/patches/occ-6.5.0.patch netgen-4.9.13.dfsg/debian/patches/occ-6.5.0.patch
--- netgen-4.9.13.dfsg/debian/patches/occ-6.5.0.patch	2011-04-01 21:13:37.000000000 +0000
+++ netgen-4.9.13.dfsg/debian/patches/occ-6.5.0.patch	2012-03-06 16:16:26.000000000 +0000
@@ -1,3 +1,16 @@
+Index: netgen/libsrc/occ/Partition_Inter3d.cxx
+===================================================================
+--- netgen.orig/libsrc/occ/Partition_Inter3d.cxx	2012-03-03 20:29:19.823206572 +0100
++++ netgen/libsrc/occ/Partition_Inter3d.cxx	2012-03-03 20:29:35.227282960 +0100
+@@ -243,7 +243,7 @@
+       Standard_Integer i, nbExt = anExtPS.NbExt();
+       Extrema_POnSurf aPOnSurf;
+       for (i = 1; i <= nbExt; ++i )
+-        if (anExtPS.Value( i ) <= TolE) {
++        if (anExtPS.SquareDistance( i ) <= TolE) {
+           aPOnSurf = anExtPS.Point( i );
+           break;
+         }
 Index: netgen/libsrc/occ/Partition_Loop2d.cxx
 ===================================================================
 --- netgen.orig/libsrc/occ/Partition_Loop2d.cxx
@@ -27,3 +40,16 @@
  
    Standard_Real U, f, l;
    BRep_Tool::Range (DegEdge, f, l);
+Index: netgen/libsrc/occ/Partition_Spliter.cxx
+===================================================================
+--- netgen.orig/libsrc/occ/Partition_Spliter.cxx	2012-03-03 20:29:19.827206593 +0100
++++ netgen/libsrc/occ/Partition_Spliter.cxx	2012-03-03 20:29:35.231282976 +0100
+@@ -1169,7 +1169,7 @@
+           for (; j<=nbj && ok; ++j) {
+             if (Extrema.IsMin(j)) {
+ 	      hasMin = Standard_True;
+-              ok = Extrema.Value(j) <= tol;
++              ok = Extrema.SquareDistance(j) <= tol;
+ 	    }
+           }
+         }