diff --git a/.gitattributes b/.gitattributes index 006f8bd9ffc..2ca35b84b7b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -812,6 +812,7 @@ Maintenance/deb/sid/debian/misc/adjust-demo-examples-makefiles.sed -text Maintenance/deb/sid/debian/misc/cgal_create_makefile.1 -text Maintenance/deb/sid/debian/patches/00list -text Maintenance/deb/sid/debian/rules -text +Maintenance/deb/sid/debian/watch -text Maintenance/public_release/announcement/CGAL-3.2 -text Maintenance/release_building/BUGFIX_NUMBER -text Maintenance/release_building/MAJOR_NUMBER -text diff --git a/Maintenance/deb/TODO b/Maintenance/deb/TODO index c3ea4cab330..afd0028a874 100644 --- a/Maintenance/deb/TODO +++ b/Maintenance/deb/TODO @@ -2,11 +2,8 @@ TODO ==== next revision: -- check if linda override for #369977 is still needed [done] -- use binNMU-safe version dependencies: s/=/>=/ fuer all -> any [done] -- incorporate changes for non-free buildd network: - http://lists.debian.org/debian-devel-announce/2006/11/msg00012.html [done] - update list of authors in debian/copyright CGAL 3.3: - SONAME issue +- -D_REENTRANT diff --git a/Maintenance/deb/sid/debian/changelog b/Maintenance/deb/sid/debian/changelog index e3599f1b6a7..31592550ed6 100644 --- a/Maintenance/deb/sid/debian/changelog +++ b/Maintenance/deb/sid/debian/changelog @@ -1,11 +1,14 @@ -cgal (3.2.99.210-1) unstable; urgency=low +cgal (3.2.1-2) unstable; urgency=low - * New upstream release. - * Make package binNMU-safe. - * Handle new shared library libCGALQt. + * Fix FTBFS on hppa (and probably also on other architectures) related + to FPU rounding modes (Closes: #404464). + * debian/control: Add tag XS-Autobuild. + * debian/copyright: Add note about autobuilding. + * debian/control: Make package binNMU-safe. * Remove linda override for bug #369977 (no longer needed). + * Add watch file. - -- Joachim Reichel Sun, 14 Jan 2007 21:41:37 +0100 + -- Joachim Reichel Fri, 26 Jan 2007 19:16:36 +0100 cgal (3.2.1-1) unstable; urgency=low diff --git a/Maintenance/deb/sid/debian/libcgal1.shlibs b/Maintenance/deb/sid/debian/libcgal1.shlibs index 2580fca1f3e..c7e4e8b788d 100644 --- a/Maintenance/deb/sid/debian/libcgal1.shlibs +++ b/Maintenance/deb/sid/debian/libcgal1.shlibs @@ -1,2 +1 @@ libCGAL 1 libcgal1 -libCGALQt 1 libcgal1 diff --git a/Maintenance/deb/sid/debian/patches/00list b/Maintenance/deb/sid/debian/patches/00list index 3a987ce29a4..846eccca5b9 100644 --- a/Maintenance/deb/sid/debian/patches/00list +++ b/Maintenance/deb/sid/debian/patches/00list @@ -1,2 +1,3 @@ build-library.dpatch cgal-create-makefile.dpatch +fix-ftbfs-fpu-rounding-modes.dpatch diff --git a/Maintenance/deb/sid/debian/patches/build-library.dpatch b/Maintenance/deb/sid/debian/patches/build-library.dpatch index e7256323b47..ffbc32e72f0 100755 --- a/Maintenance/deb/sid/debian/patches/build-library.dpatch +++ b/Maintenance/deb/sid/debian/patches/build-library.dpatch @@ -5,21 +5,21 @@ ## DP: No description. @DPATCH@ -diff -urNad cgal-3.2.99.210~/install_cgal cgal-3.2.99.210/install_cgal ---- cgal-3.2.99.210~/install_cgal 2007-01-14 22:20:07.000000000 +0100 -+++ cgal-3.2.99.210/install_cgal 2007-01-14 22:20:08.000000000 +0100 -@@ -4189,7 +4189,7 @@ +diff -urNad cgal/install_cgal cgal/install_cgal +--- cgal/install_cgal 2006-04-17 22:33:03.000000000 +0200 ++++ cgal/install_cgal 2006-04-17 22:33:06.000000000 +0200 +@@ -4156,7 +4156,7 @@ MAKE_OPTION="${MAKE_OPTION} CXXFLAGS=\$(CGAL_SHARED_LIB_CXXFLAGS) shared_lib";; esac - if make ${MAKE_OPTION} >"${COMPILE_LOGFILE}" 2>&1; then + if make ${MAKE_OPTION} | tee "${COMPILE_LOGFILE}" 2>&1; then log_print "Compilation of $1 $2 ${_libname} succeeded." - log_print "vvvvvvvvvvvv build log for $1 $2 shown below vvvvvvvvvvvv" - eval ${_cat} \"${COMPILE_LOGFILE}\" ${INSTALL_LOGFILE_REDIRECTION} -diff -urNad cgal-3.2.99.210~/src/CGAL/makefile cgal-3.2.99.210/src/CGAL/makefile ---- cgal-3.2.99.210~/src/CGAL/makefile 2007-01-14 22:20:07.000000000 +0100 -+++ cgal-3.2.99.210/src/CGAL/makefile 2007-01-14 22:20:08.000000000 +0100 + ${_printf} "%s\n" " done." + ANY_LIB_COMPILED='y' +diff -urNad cgal/src/CGAL/makefile cgal/src/CGAL/makefile +--- cgal/src/CGAL/makefile 2006-04-17 22:33:03.000000000 +0200 ++++ cgal/src/CGAL/makefile 2006-04-17 22:33:28.000000000 +0200 @@ -74,11 +74,14 @@ # target entries #---------------------------------------------------------------------# @@ -37,35 +37,18 @@ diff -urNad cgal-3.2.99.210~/src/CGAL/makefile cgal-3.2.99.210/src/CGAL/makefile rm $(CGAL_OBJECTS) static_lib: static_lib_no_install -@@ -101,5 +104,5 @@ - .SUFFIXES: .cpp $(SUFFIXES) +@@ -99,5 +102,5 @@ + #---------------------------------------------------------------------# .cpp$(OBJ_EXT): - $(CGAL_CXX) $(CXXFLAGS) -c $< + $(CGAL_CXX) $(CXXFLAGS) -D_REENTRANT -c $< -diff -urNad cgal-3.2.99.210~/src/CGALQt/makefile cgal-3.2.99.210/src/CGALQt/makefile ---- cgal-3.2.99.210~/src/CGALQt/makefile 2007-01-14 22:20:07.000000000 +0100 -+++ cgal-3.2.99.210/src/CGALQt/makefile 2007-01-14 22:21:31.000000000 +0100 -@@ -64,11 +64,14 @@ - # target entries - #---------------------------------------------------------------------# - -+SOVERSION=1.0.1 -+SOMAJOR=1 -+ - shared_lib: $(CGAL_OBJECTS) -- $(CGAL_SHARED_LIB_CREATE)$(CGAL_QT_SHARED_LIB) -Wl,-soname,$(CGAL_QT_SHARED_LIB) \ -+ $(CGAL_SHARED_LIB_CREATE)$(CGAL_QT_SHARED_LIB).$(SOVERSION) -Wl,-soname,$(CGAL_QT_SHARED_LIB).${SOMAJOR} \ - `ls *$(OBJ_EXT) | awk '{for (i=1; i<=NF;++i){printf "$(CGAL_OBJ_PREFIX)";print $$i}}'`\ - $(CGAL_SHARED_LIB_LDFLAGS) $(OPENGL_LIBS) -- mv $(CGAL_QT_SHARED_LIB) '$(CGAL_LIB_DESTINATION)' -+ mv $(CGAL_QT_SHARED_LIB).$(SOVERSION) '$(CGAL_LIB_DESTINATION)' - rm $(CGAL_OBJECTS) - - static_lib: lib -@@ -129,5 +132,5 @@ - .SUFFIXES: .cpp $(SUFFIXES) +diff -urNad cgal/src/CGALQt/makefile cgal/src/CGALQt/makefile +--- cgal/src/CGALQt/makefile 2006-04-17 21:00:25.000000000 +0200 ++++ cgal/src/CGALQt/makefile 2006-04-17 22:33:53.000000000 +0200 +@@ -125,5 +125,5 @@ + $(CGAL_CXX) $(CXXFLAGS) -c Qt_widget_OpenGL.cpp .cpp$(OBJ_EXT): - $(CGAL_CXX) $(CXXFLAGS) -c $< diff --git a/Maintenance/deb/sid/debian/patches/fix-ftbfs-fpu-rounding-modes.dpatch b/Maintenance/deb/sid/debian/patches/fix-ftbfs-fpu-rounding-modes.dpatch new file mode 100755 index 00000000000..945a2e7217e --- /dev/null +++ b/Maintenance/deb/sid/debian/patches/fix-ftbfs-fpu-rounding-modes.dpatch @@ -0,0 +1,20 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## fix-ftbfs-fpu-rounding-modes.dpatch by Joachim Reichel +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad cgal-3.2.1~/include/CGAL/FPU.h cgal-3.2.1/include/CGAL/FPU.h +--- cgal-3.2.1~/include/CGAL/FPU.h 2006-07-13 21:01:20.000000000 +0200 ++++ cgal-3.2.1/include/CGAL/FPU.h 2007-01-26 19:21:35.000000000 +0100 +@@ -34,8 +34,7 @@ + extern "C" { + # include + } +-#elif defined __linux__ && !defined __PGI && !defined __ia64__ \ +- && !defined __x86_64__ ++#elif defined __powerpc__ + # include + #elif defined __SUNPRO_CC || (defined __KCC && defined __sun) + # include diff --git a/Maintenance/deb/sid/debian/rules b/Maintenance/deb/sid/debian/rules index ba71bf59d79..c9f07984ab2 100755 --- a/Maintenance/deb/sid/debian/rules +++ b/Maintenance/deb/sid/debian/rules @@ -33,7 +33,7 @@ clean: clean-patched unpatch clean-patched: patch dh_testdir dh_testroot - rm -f build-stamp + rm -f build-stamp configure-stamp cd src/CGAL && OBJ_EXT=.o $(MAKE) clean cd src/CGALQt && OBJ_EXT=.o $(MAKE) clean -rm -f compile.log install.{log,completed} @@ -71,11 +71,9 @@ install: build rm debian/tmp/usr/include/OpenNL/LICENSE.OPENNL cp -a lib/*/libCGAL.{so.$(SOVERSION),a} debian/tmp/usr/lib - cp -a lib/*/libCGALQt.{so.$(SOVERSION),a} debian/tmp/usr/lib + cp -a lib/*/libCGALQt.a debian/tmp/usr/lib cd debian/tmp/usr/lib && ln -s libCGAL.so.$(SOVERSION) libCGAL.so.$(SOMAJOR) cd debian/tmp/usr/lib && ln -s libCGAL.so.$(SOVERSION) libCGAL.so - cd debian/tmp/usr/lib && ln -s libCGALQt.so.$(SOVERSION) libCGALQt.so.$(SOMAJOR) - cd debian/tmp/usr/lib && ln -s libCGALQt.so.$(SOVERSION) libCGALQt.so cat make/makefile_* | sed -f debian/misc/adjust-default-makefile.sed >debian/tmp/usr/share/cgal/makefile diff --git a/Maintenance/deb/sid/debian/watch b/Maintenance/deb/sid/debian/watch new file mode 100644 index 00000000000..fbe001d4ae7 --- /dev/null +++ b/Maintenance/deb/sid/debian/watch @@ -0,0 +1,2 @@ +version=3 +ftp://ftp.mpi-sb.mpg.de/pub/outgoing/CGAL/CGAL-([0-9\.]*).tar.gz 3.2.1