Hi, On 03/03/2013 10:57 PM, Adam D. Barratt wrote: > On Sun, 2013-03-03 at 19:41 +0100, Joachim Reichel wrote: >> could you please let me know whether an upload to t-p-u with the patch >> in bug 700891 is acceptable in this stage of the freeze? > >>From a quick look it appears it could be suitable if the upload occurred > soon (although a debdiff of the proposed package would still be > preferred beforehand).
please find attached the debdiff between 4.0-4 and 4.0-5. Ok to upload? > According to the version tracking information on the bug, it's still > unfixed in unstable. If that's correct, please fix the bug in unstable > first; if not, please correct the version information. Sure, just uploaded 4.0.2-2 with the same fix to unstable. Joachim
diff -Nru cgal-4.0/debian/changelog cgal-4.0/debian/changelog --- cgal-4.0/debian/changelog 2012-06-12 23:53:24.000000000 +0200 +++ cgal-4.0/debian/changelog 2013-03-05 19:21:58.000000000 +0100 @@ -1,3 +1,10 @@ +cgal (4.0-5) testing-proposed-updates; urgency=low + + * Extend patch gcc-4.7 to fix a syntax error in template code which is + not instantiated during the package build itself (Closes: #700891). + + -- Joachim Reichel <[email protected]> Tue, 05 Mar 2013 19:15:45 +0100 + cgal (4.0-4) unstable; urgency=low * Add Suggests: libeigen3-dev (>= 3.1.0~beta1-1), libmpfi-dev to diff -Nru cgal-4.0/debian/patches/gcc-4.7 cgal-4.0/debian/patches/gcc-4.7 --- cgal-4.0/debian/patches/gcc-4.7 2012-05-20 22:51:27.000000000 +0200 +++ cgal-4.0/debian/patches/gcc-4.7 2013-03-05 19:20:49.000000000 +0100 @@ -1,5 +1,5 @@ -Author: Jimmy Jazz -Description: Fixes required for compatibility with g++ 4.7 (see #673554). +Author: Jimmy Jazz, Vincent Barrielle +Description: Fixes required for compatibility with g++ 4.7 (see #673554, #700891). --- a/include/CGAL/Mesh_2/Do_not_refine_edges.h +++ b/include/CGAL/Mesh_2/Do_not_refine_edges.h @@ -80,7 +80,7 @@ @@ -11,3 +11,14 @@ { return CONFLICT_AND_ELEMENT_SHOULD_BE_DROPPED; } +--- a/include/CGAL/Alpha_shape_2.h ++++ b/include/CGAL/Alpha_shape_2.h +@@ -591,7 +591,7 @@ + // Classifies a point `p' with respect to `A'. + Locate_type type; + int i; +- Face_handle pFace = locate(p, type, i); ++ Face_handle pFace = this->locate(p, type, i); + switch (type) + { + case VERTEX : return classify(pFace->vertex(i), alpha);
