I've made the following NMU:
diff -u nurbs++-3.0.11/debian/rules nurbs++-3.0.11/debian/rules --- nurbs++-3.0.11/debian/rules +++ nurbs++-3.0.11/debian/rules @@ -50,7 +50,7 @@ STRIP := strip endif -debian_patches = 010-gcc4 +debian_patches = 010-gcc4 030-gcc41 build: patched-stamp config.status stamp-build diff -u nurbs++-3.0.11/debian/changelog nurbs++-3.0.11/debian/changelog --- nurbs++-3.0.11/debian/changelog +++ nurbs++-3.0.11/debian/changelog @@ -1,3 +1,11 @@ +nurbs++ (3.0.11-6.1) unstable; urgency=medium + + * NMU as part of the GCC 4.1 transition. + * 030-gcc41.dpatch: Apply patch from Ben Hutchings to fix namespace + problem. (Closes: #356436) + + -- Martin Michlmayr <[EMAIL PROTECTED]> Sat, 27 May 2006 13:36:24 +0200 + nurbs++ (3.0.11-6) unstable; urgency=medium * Split out -doc package from -dev. (Closes: #233401) only in patch2: unchanged: --- nurbs++-3.0.11.orig/debian/patches/030-gcc41.dpatch +++ nurbs++-3.0.11/debian/patches/030-gcc41.dpatch @@ -0,0 +1,57 @@ +#! /bin/sh -e + +if [ $# -ne 1 ]; then + echo >&2 "$0: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch -f -p0 < $0;; + -unpatch) patch -f -R -p0 < $0;; + *) + echo >&2 "$0: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 +--- nurbs/d_surface.cpp 2002-05-16 16:44:49.000000000 +0000 ++++ nurbs/d_surface.cpp 2006-03-12 03:00:53.000000000 +0000 +@@ -25,9 +25,6 @@ + template class InterPoint<double,2> ; + template class InterPoint<double,3> ; + +- template class BasicList<InterPoint<double,2> > ; +- template class BasicList<InterPoint<double,3> > ; +- + template class ParaSurface<double,2> ; + template class ParaSurface<double,3> ; + +@@ -37,3 +34,8 @@ + #endif + + } ++ ++#ifdef NO_IMPLICIT_TEMPLATES ++template class BasicList<PLib::InterPoint<double,2> > ; ++template class BasicList<PLib::InterPoint<double,3> > ; ++#endif +--- nurbs/f_surface.cpp 2002-05-16 16:44:49.000000000 +0000 ++++ nurbs/f_surface.cpp 2006-03-12 02:56:53.000000000 +0000 +@@ -25,9 +25,6 @@ + template class InterPoint<float,2> ; + template class InterPoint<float,3> ; + +- template class BasicList<InterPoint<float,2> > ; +- template class BasicList<InterPoint<float,3> > ; +- + template class ParaSurface<float,2> ; + template class ParaSurface<float,3> ; + +@@ -38,3 +35,8 @@ + #endif + + } ++ ++#ifdef NO_IMPLICIT_TEMPLATES ++template class BasicList<PLib::InterPoint<float,2> > ; ++template class BasicList<PLib::InterPoint<float,3> > ; ++#endif + -- Martin Michlmayr http://www.cyrius.com/ -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
