update Debian stuff for 3.3-I-277

.gitattributes

@@ -829,13 +829,14 @@ Maintenance/deb/sarge/debian/compat -text
 Maintenance/deb/sarge/debian/control -text
 Maintenance/deb/sarge/debian/libcgal-demo.install -text
 Maintenance/deb/sarge/debian/libcgal-dev.install -text
-Maintenance/deb/sarge/debian/libcgal1.install -text
+Maintenance/deb/sarge/debian/libcgal2.install -text
-Maintenance/deb/sarge/debian/libcgal1.shlibs -text
+Maintenance/deb/sarge/debian/libcgal2.shlibs -text
 Maintenance/deb/sarge/debian/misc/adjust-default-makefile.sed -text
 Maintenance/deb/sarge/debian/misc/adjust-demo-examples-makefiles.sed -text
 Maintenance/deb/sarge/debian/misc/cgal_create_makefile.1 -text
 Maintenance/deb/sarge/debian/patches/00list -text
 Maintenance/deb/sarge/debian/rules -text
+Maintenance/deb/sarge/debian/watch -text
 Maintenance/deb/sid/debian/README.Debian -text
 Maintenance/deb/sid/debian/changelog -text
 Maintenance/deb/sid/debian/compat -text

Maintenance/deb/README

@@ -5,6 +5,9 @@ backport for sarge:
 - debian/control:
   * adjust Standards-Version: to 3.6.1
   * adjust debhelper dependency from >= 5 to >= 4
+  * adjust lapack3-dev dependency to lapack-dev
+  * adjust atlas3-base-dev dependency to atlas2-base-dev
+  * replace binary: by Source-
 - debian/compat:
   * adjust debhelper compatibility level from 5 to 4
 - debian/changelog:

Maintenance/deb/sarge/debian/changelog

@@ -1,12 +1,38 @@
-cgal (3.2.1-0sarge1) stable; urgency=low
+cgal (3.2.99.277-0sarge1) stable; urgency=low
+
+  * New upstream release
+
+ -- Joachim Reichel <joachim.reichel@gmx.de>  Sun, 25 Mar 2007 12:58:38 +0200
+
+cgal (3.2.1-3) unstable; urgency=low
+
+  * debian/rules: Remove bashisms.
+
+ -- Joachim Reichel <joachim.reichel@gmx.de>  Thu,  8 Feb 2007 19:37:09 +0100
+
+cgal (3.2.1-2) unstable; urgency=low
+
+  * 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 <joachim.reichel@gmx.de>  Fri, 26 Jan 2007 19:16:36 +0100
+
+cgal (3.2.1-1) unstable; urgency=low
 
   * New upstream release.
+  * Add linda override for bug #369977.
   * Remove patch bugfix-demo-examples-makefiles.dpatch (no longer needed).
 
  -- Joachim Reichel <joachim.reichel@gmx.de>  Fri, 14 Jul 2006 21:20:16 +0200
 
-cgal (3.2-0sarge1) stable; urgency=low
+cgal (3.2-1) unstable; urgency=low
 
   * New upstream release.
+  * First upload to Debian archive. (Closes: #251885)
 
  -- Joachim Reichel <joachim.reichel@gmx.de>  Mon, 29 May 2006 20:24:27 +0200

Maintenance/deb/sarge/debian/control

@@ -2,10 +2,11 @@ Source: cgal
 Section: non-free/libs
 Priority: optional
 Maintainer: Joachim Reichel <joachim.reichel@gmx.de>
-Build-Depends: debhelper (>= 4), dpatch, libgmp3-dev, libmpfr-dev, libcore++-dev, libqt3-mt-dev, libqt3-compat-headers, libboost-dev, libboost-graph-dev, libboost-program-options-dev, zlib1g-dev
+Build-Depends: debhelper (>= 4), dpatch, libboost-dev, libboost-graph-dev, libboost-program-options-dev, libgmp3-dev, libmpfr-dev, libqt3-mt-dev, libqt3-compat-headers, lapack-dev, atlas2-base-dev, zlib1g-dev
 Standards-Version: 3.6.1
+XS-Autobuild: yes
 
-Package: libcgal1
+Package: libcgal2
 Section: non-free/libs
 Architecture: any
 Depends: ${shlibs:Depends}
@@ -31,10 +32,9 @@ Description: C++ library for computational geometry
 Package: libcgal-dev
 Section: non-free/libdevel
 Architecture: any
-Depends: libcgal1 (= ${Source-Version}), libgmp3-dev, libmpfr-dev,
+Depends: libcgal2 (= ${Source-Version}), libboost-dev, libboost-graph-dev,
- libcore++-dev, libqt3-mt-dev, libqt3-compat-headers,
+ libboost-program-options-dev,libgmp3-dev, libmpfr-dev, libqt3-mt-dev,
- libboost-dev, libboost-graph-dev, libboost-program-options-dev,
+ libqt3-compat-headers, lapack3-dev, atlas3-base-dev, zlib1g-dev
- zlib1g-dev
 Description: C++ library for computational geometry (development files)
  CGAL (Computational Geometry Algorithms Library) makes the most important
  of the solutions and methods developed in computational geometry available
@@ -46,7 +46,7 @@ Description: C++ library for computational geometry (development files)
 Package: libcgal-demo
 Section: non-free/devel
 Architecture: all
-Depends: libcgal-dev (= ${Source-Version}), libcgal1 (= ${Source-Version})
+Depends: libcgal-dev (>= ${Source-Version}), libcgal2 (>= ${Source-Version})
 Suggests: geomview
 Description: C++ library for computational geometry (demos)
  CGAL (Computational Geometry Algorithms Library) makes the most important

Maintenance/deb/sarge/debian/copyright

@@ -3,10 +3,13 @@ Thu, 29 Apr 2004 18:43:18 +0200.
 
 It was downloaded from http://www.cgal.org/download/index.html.
 
-The Debian packaging is (c) 2004, 2005, 2006 Joachim Reichel
+The Debian packaging is (c) 2004, 2005, 2006, 2007 Joachim Reichel
 <joachim.reichel@gmx.de> and is licensed under the BSD license,
 which can be found in /usr/share/common-licenses/BSD.
 
+The license of this package is not DFSG-free, but it permits to autobuild the
+package and to redistribute it in the non-free archive.
+
 
 
 Authors
@@ -16,8 +19,8 @@ Editorial Committee:
 
 Andreas Fabri (release manager), GeometryFactory
 Efi Fogel, Tel Aviv University
-Bernd Gärtner, ETH Zürich
+Bernd Gärtner, ETH Zürich
-Michael Hoffmann, ETH Zürich
+Michael Hoffmann, ETH Zürich
 Menelaos Karavelas, University of Crete and FO.R.T.H.
 Sylvain Pion (chair), INRIA Sophia Antipolis
 Monique Teillaud, INRIA Sophia Antipolis
@@ -28,38 +31,38 @@ Mariette Yvinec, INRIA Sophia Antipolis
 Current Developers:
 
 Pierre Alliez, INRIA Sophia Antipolis
-Eric Berberich, Max-Planck-Institut für Informatik
+Eric Berberich, Max-Planck-Institut für Informatik
 Fernando Cacciola, Scisoft/GeometryFactory
-Raphaëlle Chaine, Université Claude Bernard de Lyon
+Raphaëlle Chaine, Université Claude Bernard de Lyon
 Christophe Delage, INRIA Sophia Antipolis
 Michal Gourgy, Tel Aviv University
-Peter Hachenberger, Max-Planck-Institut für Informatik
+Peter Hachenberger, Max-Planck-Institut für Informatik
 Idit Haran, Tel Aviv University
 Michael Hemmer, Mainz University
-Thomas Herrmann, ETH Zürich
+Thomas Herrmann, ETH Zürich
 Nico Kruithof, University of Groningen
 Abdelkrim Mebarki, INRIA Sophia Antipolis
 Naceur Meskini, INRIA Sophia Antipolis
-Andreas Meyer, Max-Planck-Institut für Inform
+Andreas Meyer, Max-Planck-Institut für Inform
 Marc Pouget, INRIA Sophia Antipolis
 Laurent Rineau, ENS Paris
 Daniel Russel, INRIA Sophia Antipolis
 Laurent Saboret, INRIA Sophia Antipolis
 Le-Jeng Shiue, University of Florida
-Astrid Sturm, Freie Universität Berlin
+Astrid Sturm, Freie Universität Berlin
 Baruch Zukerman, Tel Aviv University
 
 Former Developers:
 
-Matthias Bäsken
+Matthias Bäsken
-Hervé Brönnimann
+Hervé Brönnimann
 Tran Kai Frank Da
 Olivier Devillers
 Katrin Dobrindt
 Eti Ezra
 Kaspar Fischer
 Eyal Flato
-Julia Flötotto
+Julia Flötotto
 Wolfgang Freiseisen
 Geert-Jan Giezeman
 Philippe Guigue
@@ -76,10 +79,10 @@ Steve Oudot
 Eli Packer
 Dmitrii Pasechnik
 Sigal Raab
-François Rebufat
+François Rebufat
 Niv Sabath
 Stefan Schirra
-Sven Schönherr
+Sven Schönherr
 Michael Seel
 Hans Tangelder
 Radu Ursu
@@ -196,7 +199,7 @@ file to file.
 Copright statement for files under the FREE_USE license
 =======================================================
 
-   Copyright (c) 1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006
+   Copyright (c) 1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007
    Utrecht University (The Netherlands),
    ETH Zurich (Switzerland), Freie Universitaet Berlin (Germany),
    INRIA Sophia-Antipolis (France), Martin-Luther-University Halle-Wittenberg

Maintenance/deb/sarge/debian/libcgal-demo.install

@@ -1,2 +1,2 @@
-usr/share/doc/cgal/demo.tar.gz       usr/share/doc/libcgal1
+usr/share/doc/cgal/demo.tar.gz       usr/share/doc/libcgal2
-usr/share/doc/cgal/examples.tar.gz   usr/share/doc/libcgal1
+usr/share/doc/cgal/examples.tar.gz   usr/share/doc/libcgal2

Maintenance/deb/sarge/debian/libcgal-dev.install

@@ -3,4 +3,4 @@ usr/include/*
 usr/lib/lib*.a
 usr/lib/lib*.so
 usr/share/cgal/*
-usr/share/doc/cgal/[A-Z]*   usr/share/doc/libcgal1
+usr/share/doc/cgal/[A-Z]*   usr/share/doc/libcgal2

Maintenance/deb/sarge/debian/libcgal1.install

@@ -1,2 +0,0 @@
-usr/lib/lib*.so.*              usr/lib
-usr/share/doc/cgal/changelog   usr/share/doc/libcgal1

Maintenance/deb/sarge/debian/libcgal1.shlibs

@@ -1 +0,0 @@
-libCGAL 1 libcgal1

Maintenance/deb/sarge/debian/libcgal2.install

@@ -0,0 +1,2 @@
+usr/lib/lib*.so.*              usr/lib
+usr/share/doc/cgal/changelog   usr/share/doc/libcgal2

Maintenance/deb/sarge/debian/libcgal2.shlibs

@@ -0,0 +1,5 @@
+libCGAL 2 libcgal2
+libCGALQt 2 libcgal2
+libCGALimageIO 2 libcgal2
+libCGALPDB 2 libcgal2
+libCGALcore++ 2 libcgal2

Maintenance/deb/sarge/debian/misc/adjust-default-makefile.sed

@@ -4,5 +4,4 @@ s,^CGAL_LIB_DIR.*$,CGAL_LIB_DIR = /usr/lib,
 /-I$(CGAL_INCL_CONF_DIR)/d
 /-I$(CGAL_INCL_DIR)/d
 /-L$(CGAL_LIB_DIR)\/$(CGAL_OS_COMPILER)/d
-/-Wl\,-R$(CGAL_LIB_DIR)\/$(CGAL_OS_COMPILER)/d
 s,CGAL_LIB_DESTINATION = '$(CGAL_LIB_DIR)/$(CGAL_OS_COMPILER)',CGAL_LIB_DESTINATION = '$(CGAL_LIB_DIR)',

Maintenance/deb/sarge/debian/misc/cgal_create_makefile.1

@@ -1,9 +1,9 @@
-.TH CGAL_CREATE_MAKEFILE "1" "May 2006" "CGAL 3.2" "User Commands"
+.TH CGAL_CREATE_MAKEFILE "1" "May 2006" "CGAL 3.3" "User Commands"
 .SH NAME
 cgal_create_makefile \- create makefiles for applications using CGAL
 .SH SYNOPSIS
 .B cgal_create_makefile
-.BR -d | -t | -g | -q | -w
+.BR -d | -t | -q
 .RI [ filename ]
 .SH DESCRIPTION
 The script
@@ -29,11 +29,9 @@ Create a (default) makefile as described above.
 .B -t
 Create a makefile that is suited for the testsuite used by the CGAL developers.
 .TP
-.BR -g | -q | -w
+.BR -q
-These options are obsolete and are supported for backwards compatibility. The
+Create a makefile with Qt support (including calls for the Qt's meta object
-generated makefiles are almost identical to the makefile that is created by
+compiler moc.
-using 
-.BR -d .
 .TP
 .I filename
 The output is written to
@@ -59,12 +57,12 @@ is used.
 contains the default compiler and linker flags
 .SH AUTHOR
 The CGAL software was written by a large number of authors
-(see /usr/share/doc/libcgal1/copyright for a list).
+(see /usr/share/doc/libcgal2/copyright for a list).
 
 This manual page was written by Joachim Reichel <joachim.reichel@gmx.de> for
 the Debian GNU/Linux system (but may be used by others).
 .SH "REPORTING BUGS"
-Report bugs to <cgal-discuss-l@postino.mpi-sb.mpg.de> (see http://www.cgal.org/
+Report bugs to <cgal-discuss@lists-sop.inria.fr> (see http://www.cgal.org/
 for further instructions).
 .SH "SEE ALSO"
 The full documentation for CGAL is available at http://www.cgal.org/ in PDF and

Maintenance/deb/sarge/debian/patches/build-library.dpatch

@@ -1,56 +1,132 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## library-soname.dpatch by Joachim Reichel <joachim.reichel@gmx.de>
+## build-library.dpatch by Joachim Reichel <joachim.reichel@gmx.de>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: No description.
 
 @DPATCH@
-diff -urNad cgal/install_cgal cgal/install_cgal
+diff -urNad cgal~/install_cgal cgal/install_cgal
---- cgal/install_cgal	2006-04-17 22:33:03.000000000 +0200
+--- cgal~/install_cgal	2007-03-25 13:01:29.000000000 +0200
-+++ cgal/install_cgal	2006-04-17 22:33:06.000000000 +0200
++++ cgal/install_cgal	2007-03-25 13:01:53.000000000 +0200
-@@ -4156,7 +4156,7 @@
+@@ -934,7 +934,7 @@
- 	    MAKE_OPTION="${MAKE_OPTION} CXXFLAGS=\$(CGAL_SHARED_LIB_CXXFLAGS) shared_lib";;
+ 	    #### settings for sgi mipspro compiler on irix5
-     esac
+ 	    CGAL_SHARED_LIB_CXXFLAGS=
+ 	    CGAL_SHARED_LIB_LDFLAGS="-lm"
+-	    RUNTIME_LINKER_FLAG="-rpath "
++#	    RUNTIME_LINKER_FLAG="-rpath "
+ 	    PRINT_STACKTRACE_PROGRAM="dbx"
+ 	    ;;
+ 	*IRIX*6.*CC*7.3*)
+@@ -943,14 +943,14 @@
+ 	    ADDITIONAL_LDFLAGS="-LANG:std"
+ 	    CGAL_STATIC_LIB_CREATE="\$(CGAL_CXX) -ar -o''"
+ 	    CGAL_SHARED_LIB_CXXFLAGS=
+-	    RUNTIME_LINKER_FLAG="-rpath "
++#	    RUNTIME_LINKER_FLAG="-rpath "
+ 	    PRINT_STACKTRACE_PROGRAM="dbx"
+ 	    ;;
+ 	*IRIX*6.*CC*)
+ 	    #### settings for sgi mipspro compiler on irix6
+ 	    CGAL_STATIC_LIB_CREATE="\$(CGAL_CXX) -ar -o''"
+ 	    CGAL_SHARED_LIB_CXXFLAGS=
+-	    RUNTIME_LINKER_FLAG="-rpath "
++#	    RUNTIME_LINKER_FLAG="-rpath "
+ 	    PRINT_STACKTRACE_PROGRAM="dbx"
+ 	    ;;
+ 	*IRIX*g++*)
+@@ -958,7 +958,7 @@
+ 	    ADDITIONAL_CXXFLAGS="-Wall"
+ 	    LONG_NAME_PROBLEM_LDFLAGS="-U -s"
+ 	    CGAL_SHARED_LIB_LDFLAGS="-lm"
+-	    RUNTIME_LINKER_FLAG="-Xlinker -rpath -Xlinker "
++#	    RUNTIME_LINKER_FLAG="-Xlinker -rpath -Xlinker "
+ 	    CGAL_SHARED_LIB_SONAME="-Wl,-soname,\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
+ 	    CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME).\$(SOVERSION)"
+ 	    CGAL_SHARED_LIBNAME_WITH_SOMAJOR="\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
+@@ -969,7 +969,7 @@
+ 	    CGAL_STATIC_LIB_CREATE="\$(CGAL_CXX) -xar -o ''"
+ 	    CGAL_SHARED_LIB_CXXFLAGS="-PIC"
+ 	    CGAL_SHARED_LIB_CREATE="\$(CGAL_CXX) -G"
+-	    RUNTIME_LINKER_FLAG="-R "
++#	    RUNTIME_LINKER_FLAG="-R "
+ 	    PRINT_STACKTRACE_PROGRAM="dbx"
+ 	    CGAL_SHARED_LIB_SONAME="-Qoption ld -h\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
+ 	    CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME).\$(SOVERSION)"
+@@ -982,7 +982,7 @@
+ 	    LONG_NAME_PROBLEM_CXXFLAGS="-g"
+ 	    LONG_NAME_PROBLEM_LDFLAGS="-z nodefs -s"
+ 	    CGAL_SHARED_LIB_CREATE="\$(CGAL_CXX) -G"
+-	    RUNTIME_LINKER_FLAG="-R "
++#	    RUNTIME_LINKER_FLAG="-R "
+ 	    CGAL_SHARED_LIB_SONAME="-h \$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
+ 	    CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME).\$(SOVERSION)"
+ 	    CGAL_SHARED_LIBNAME_WITH_SOMAJOR="\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
+@@ -991,7 +991,7 @@
+ 	    #### settings for g++ on alpha-linux (special FPU handling)
+ 	    #### LONG_NAME_PROBLEM is cured by disabling debugging
+ 	    ADDITIONAL_CXXFLAGS="-Wall -mieee -mfp-rounding-mode=d"
+-	    RUNTIME_LINKER_FLAG='-Wl,-R'
++#	    RUNTIME_LINKER_FLAG='-Wl,-R'
+ 	    CGAL_SHARED_LIB_SONAME="-Wl,-soname,\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
+ 	    CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME).\$(SOVERSION)"
+ 	    CGAL_SHARED_LIBNAME_WITH_SOMAJOR="\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
+@@ -999,7 +999,7 @@
+ 	*Linux*g++*)
+ 	    #### settings for g++ on linux
+ 	    ADDITIONAL_CXXFLAGS="-Wall"
+-	    RUNTIME_LINKER_FLAG='-Wl,-R'
++#	    RUNTIME_LINKER_FLAG='-Wl,-R'
+ 	    CGAL_SHARED_LIB_SONAME="-Wl,-soname,\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
+ 	    CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME).\$(SOVERSION)"
+ 	    CGAL_SHARED_LIBNAME_WITH_SOMAJOR="\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
+@@ -1009,7 +1009,7 @@
+ 	    # -mp is required for correct enough floating point operations
+ 	    # necessary for interval arithmetic.
+ 	    ADDITIONAL_CXXFLAGS="-mp"
+-	    RUNTIME_LINKER_FLAG='-Wl,-R'
++#	    RUNTIME_LINKER_FLAG='-Wl,-R'
+ 	    PRINT_STACKTRACE_PROGRAM="idb"
+ 	    ;;
+ 	*Linux*sunCC*)
+@@ -1060,7 +1060,7 @@
+ 	    ;;
+ 	*Linux*pgCC*|*Linux*pgcpp*)
+ 	    #### settings for Portland Group Compiler on linux
+-	    RUNTIME_LINKER_FLAG='-Wl,-R'
++#	    RUNTIME_LINKER_FLAG='-Wl,-R'
+ 	    # PGCC has long name problems with "-g".
+ 	    DEBUG_OPT=""
+ 	    ;;
+@@ -4307,7 +4307,7 @@
+     _buildlog_marker="log for $1 $2 shown"
  
--    if make ${MAKE_OPTION} >"${COMPILE_LOGFILE}" 2>&1; then
+     ${_printf} "%s %s\n" "${MAKE}" "${MAKE_OPTION}" > "${COMPILE_LOGFILE}"
-+    if make ${MAKE_OPTION} | tee "${COMPILE_LOGFILE}" 2>&1; then
+-    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."
- 	${_printf} "%s\n" " done."
+ 	log_print "vvvvvvvvvvvv build ${_buildlog_marker} below vvvvvvvvvvvv"
- 	ANY_LIB_COMPILED='y'
+ 	eval ${_cat} \"${COMPILE_LOGFILE}\" ${INSTALL_LOGFILE_REDIRECTION}
-diff -urNad cgal/src/CGAL/makefile cgal/src/CGAL/makefile
+diff -urNad cgal~/src/CGAL/common.mk cgal/src/CGAL/common.mk
---- cgal/src/CGAL/makefile	2006-04-17 22:33:03.000000000 +0200
+--- cgal~/src/CGAL/common.mk	2007-03-25 13:01:29.000000000 +0200
-+++ cgal/src/CGAL/makefile	2006-04-17 22:33:28.000000000 +0200
++++ cgal/src/CGAL/common.mk	2007-03-25 13:01:29.000000000 +0200
-@@ -74,11 +74,14 @@
+@@ -104,17 +104,19 @@
- #                    target entries
+ 
+ clean_temp_files::
+ 	rm -f $(OBJECTS)
++	rm -f *.o
+ 
+ clean:: clean_temp_files
+ 	rm -f $(CGAL_STATIC_LIBNAME)
+ 	rm -f $(CGAL_SHARED_LIBNAME) $(LIBRARIES_EXTRA_NAMES)
++	rm -f lib*
+ 
+ #---------------------------------------------------------------------#
+ #                    suffix rules
  #---------------------------------------------------------------------#
  
-+SOVERSION=1.0.1
+ %$(OBJ_EXT): %.cpp
-+SOMAJOR=1
+-	$(CGAL_CXX)  $(CXXFLAGS) $(ADDITIONAL_CXXFLAGS) -c $<
-+
++	$(CGAL_CXX)  $(CXXFLAGS) $(ADDITIONAL_CXXFLAGS) -D_REENTRANT -c $<
- shared_lib: $(CGAL_OBJECTS)
--	$(CGAL_SHARED_LIB_CREATE)$(CGAL_SHARED_LIB) \
-+	$(CGAL_SHARED_LIB_CREATE)$(CGAL_SHARED_LIB).$(SOVERSION) -Wl,-soname,$(CGAL_SHARED_LIB).${SOMAJOR} \
- 	`ls *$(OBJ_EXT) | awk '{for (i=1; i<=NF;++i){printf "$(CGAL_OBJ_PREFIX)";print $$i}}'`\
- 		$(CGAL_SHARED_LIB_LDFLAGS)
--	mv $(CGAL_SHARED_LIB) '$(CGAL_LIB_DESTINATION)'
-+	mv $(CGAL_SHARED_LIB).$(SOVERSION) '$(CGAL_LIB_DESTINATION)'
- 	rm $(CGAL_OBJECTS)
- 
- static_lib: static_lib_no_install
-@@ -99,5 +102,5 @@
- #---------------------------------------------------------------------#
- 
- .cpp$(OBJ_EXT):
--	$(CGAL_CXX)  $(CXXFLAGS)  -c $<
-+	$(CGAL_CXX)  $(CXXFLAGS) -D_REENTRANT -c $<
- 
-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 $<
-+	$(CGAL_CXX)  $(CXXFLAGS) -D_REENTRANT -c $<
  
+ FLEX ?=flex
+ BISON ?=bison

Maintenance/deb/sarge/debian/patches/cgal-create-makefile.dpatch

@@ -5,10 +5,10 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad cgal-3.1.99.464~/scripts/cgal_create_makefile cgal-3.1.99.464/scripts/cgal_create_makefile
+diff -urNad cgal~/scripts/cgal_create_makefile cgal/scripts/cgal_create_makefile
---- cgal-3.1.99.464~/scripts/cgal_create_makefile	2006-05-18 20:18:11.000000000 +0200
+--- cgal~/scripts/cgal_create_makefile	2007-03-17 21:01:14.000000000 +0100
-+++ cgal-3.1.99.464/scripts/cgal_create_makefile	2006-05-18 20:21:48.000000000 +0200
++++ cgal/scripts/cgal_create_makefile	2007-03-17 21:47:52.000000000 +0100
-@@ -118,6 +118,9 @@
+@@ -84,6 +84,9 @@
    echo    "# Choose the right include file from the <cgalroot>/make directory."
    echo
    echo    "# CGAL_MAKEFILE = ENTER_YOUR_INCLUDE_MAKEFILE_HERE"
@@ -18,7 +18,7 @@ diff -urNad cgal-3.1.99.464~/scripts/cgal_create_makefile cgal-3.1.99.464/script
    echo    "include \$(CGAL_MAKEFILE)"
  
    # print compiler flags
-@@ -128,7 +129,7 @@
+@@ -94,7 +97,7 @@
    if [ -d include ] ; then
      echo  "           -Iinclude \\"
    fi

Maintenance/deb/sarge/debian/rules

@@ -15,65 +15,50 @@ ifndef CXX
 	CXX = g++
 endif
 
-SOVERSION=1.0.1
-SOMAJOR=1
-
 build: build-stamp
 build-stamp: patch-stamp
 	dh_testdir
-	if test -d include/CORE; then mv include/CORE include/CORE.orig; fi
+	dh_clean -k
-	if test -d src/Core; then mv src/Core src/Core.orig; fi
+	QTDIR=/usr/share/qt3 ./install_cgal -ni --CXX $(CXX) --prefix $(CURDIR)/debian/tmp/usr \
-	-rm -f make/makefile_*
+	  --without-autofind --with-ZLIB --with-BOOST --with-BOOST_PROGRAM_OPTIONS \
-	QTDIR=/usr/share/qt3 ./install_cgal -ni --CXX $(CXX) --without-autofind \
+	  --with-GMP --with-GMPXX --with-MPFR \
-	  --with-ZLIB --with-BOOST --with-BOOSTPROGRAMOPTIONS --with-X11 \
+	  --with-X11 --with-OPENGL --with-QT3MT \
-	  --with-GMP --with-GMPXX --with-MPFR --with-CORE --with-QT3MT
+	  --with-BLASGCCATLAS --with-LAPACK
+	$(MAKE) -C $(CURDIR)/debian/tests rounding_modes
+	-LD_LIBRARY_PATH=$(CURDIR)/debian/tmp/usr/lib $(CURDIR)/debian/tests/rounding_modes
+	-$(MAKE) -C $(CURDIR)/debian/tests clean
 	touch build-stamp
 
 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
+	-for DIR in src/*; do $(MAKE) -C $$DIR clean; done
-	cd src/CGALQt && OBJ_EXT=.o $(MAKE) clean
+	-rm -f compile.log install.log install.completed
-	-rm -f compile.log install.{log,completed}
+	-rm -f config/support/tmp_test*
-	-rm -f config/testfiles/{a.out,*.o,tmp_test}
+	-rm -f config/testfiles/a.out
 	-for DIR in include/CGAL/config/*; do \
-	   if test x$$DIR != xinclude/CGAL/config/msvc7; then \
+	   if test x$$DIR != xinclude/CGAL/config/msvc; then \
 	     rm -fr $$DIR; \
 	   fi; \
 	 done
-	-rm -f config/testfiles/redirect_tmpfile
-	-rm -f config/testfiles/redirect_tmpfile.C
 	-rm -f make/makefile_*
 	-rm -fr lib/???????*
 	-rm -fr config/install
 	if test -d examples.orig; then rm -r examples && mv examples.orig examples; fi
 	if test -d demo.orig; then rm -r demo && mv demo.orig demo; fi
-	if test -d include/CORE.orig; then mv include/CORE.orig include/CORE; fi
-	if test -d src/Core.orig; then mv src/Core.orig src/Core; fi
 	dh_clean
 
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+#	dh_clean -k
 	dh_installdirs
 
-	mkdir -p debian/tmp/{usr/bin,usr/include,usr/lib,usr/share/cgal,usr/share/doc/cgal}
+	mkdir -p debian/tmp/usr/share/doc/cgal
 
-	cp -a scripts/cgal_create_makefile debian/tmp/usr/bin
+	rm debian/tmp/usr/bin/cgal_make_macosx_app
-
-	cp -a include/{CGAL,OpenNL} debian/tmp/usr/include
-	rm -r debian/tmp/usr/include/CGAL/config/msvc7
-	mv debian/tmp/usr/include/CGAL/config/*/CGAL/compiler_config.h debian/tmp/usr/include/CGAL
-	rm -r debian/tmp/usr/include/CGAL/config
-	rm debian/tmp/usr/include/OpenNL/LICENSE.OPENNL
-
-	cp -a lib/*/libCGAL.{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
 
 	cat make/makefile_* | sed -f debian/misc/adjust-default-makefile.sed >debian/tmp/usr/share/cgal/makefile
 
@@ -96,11 +81,11 @@ install: build
 
 	dh_install --sourcedir=debian/tmp --list-missing
 
-	ln -s libcgal1 debian/libcgal-demo/usr/share/doc/libcgal-demo
+	ln -s libcgal2 debian/libcgal-demo/usr/share/doc/libcgal-demo
-	ln -s libcgal1 debian/libcgal-dev/usr/share/doc/libcgal-dev
+	ln -s libcgal2 debian/libcgal-dev/usr/share/doc/libcgal-dev
 
-	install -d debian/libcgal1/DEBIAN
+	install -d debian/libcgal2/DEBIAN
-	install -m644 debian/libcgal1.shlibs debian/libcgal1/DEBIAN/shlibs
+	install -m644 debian/libcgal2.shlibs debian/libcgal2/DEBIAN/shlibs
 
 binary-indep: build install
 	dh_testdir -i
@@ -116,8 +101,8 @@ binary-indep: build install
 binary-arch: build install
 	dh_testdir -a
 	dh_testroot -a
-	dh_installdocs -plibcgal1 debian/copyright
+	dh_installdocs -plibcgal2 debian/copyright
-	dh_installchangelogs -plibcgal1
+	dh_installchangelogs -plibcgal2
 	dh_installman -plibcgal-dev debian/misc/cgal_create_makefile.1
 	dh_link -a
 	dh_strip -a
@@ -125,7 +110,7 @@ binary-arch: build install
 	dh_fixperms -a
 	dh_makeshlibs -a
 	dh_installdeb -a
-	dh_shlibdeps -a -ldebian/libcgal1/usr/lib
+	dh_shlibdeps -a -ldebian/libcgal2/usr/lib
 	dh_gencontrol -a
 	dh_md5sums -a
 	dh_builddeb -a

Maintenance/deb/sarge/debian/tests/makefile

@@ -0,0 +1,9 @@
+include ../tmp/usr/share/cgal/makefile
+
+rounding_modes: rounding_modes.o
+	$(CGAL_CXX) -o rounding_modes rounding_modes.o $(CGAL_LDFLAGS) $(CGAL_LIBPATH)
+
+.cpp.o:
+	$(CGAL_CXX) $(CGAL_CXXFLAGS) -c $< -o $@
+clean:
+	rm -f *.o rounding_modes

Maintenance/deb/sarge/debian/tests/rounding_modes.cpp

@@ -0,0 +1,113 @@
+// This tests the rounding mode functions.
+
+#include <CGAL/basic.h>
+#include <CGAL/Interval_nt.h>
+#include <iostream>
+
+typedef CGAL::Interval_nt_advanced NT_adv;
+typedef CGAL::Interval_nt<>        NT;
+
+void print_res (bool res)
+{ std::cout << (res ? "ok" : "ERROR") << std::endl; }
+
+// The results of 1-epsilon and -1+epsilon are enough
+// to detect exactly the current rounding mode.
+//                          1-MIN_DOUBLE
+//                        +------+-------+
+//                        |  1   | 1-ulp |
+//               +--------+------+-------+
+// -1+MIN_DOUBLE | -1     | near |  -inf |
+//               | -1+ulp | +inf |  zero |
+//               +--------+------+-------+
+
+// I use a global variable here to avoid constant propagation.
+double IA_min_double;
+
+CGAL::FPU_CW_t
+FPU_empiric_test()
+{
+    IA_min_double = CGAL_IA_MIN_DOUBLE;
+    double y = 1.0, z = -1.0;
+    double ye, ze;
+    ye = y - IA_min_double;
+    ze = z + IA_min_double;
+    if (y == ye && z == ze) return CGAL_FE_TONEAREST;
+    if (y == ye) return CGAL_FE_UPWARD;
+    if (z == ze) return CGAL_FE_DOWNWARD;
+    return CGAL_FE_TOWARDZERO;
+}
+
+// This variable is global in order to stop constant propagation.
+double m = 0.5;
+
+CGAL::FPU_CW_t FPU_empiric_test_mul ()
+{
+    int i;
+    for (i=0; i<10; i++) {m*=m; /* std::cout <<c << std::endl; */ }
+    double a = m*m;
+    double b = (-m)*m;
+    std::cout << "m = " << m << "\n m*m = " << a << "\n (-m)*m = " << b;
+    std::cout << std::endl;
+// Note: it's not supposed to work here like that.
+    if ((a == 0.0) && (b == 0.0)) return CGAL_FE_TONEAREST;
+    if (a > 0.0) return CGAL_FE_UPWARD;
+    if (b < 0.0) return CGAL_FE_DOWNWARD;
+    return CGAL_FE_TOWARDZERO;
+}
+
+void print_rounding_name (CGAL::FPU_CW_t r)
+{
+  switch (r) {
+  case CGAL_FE_TONEAREST:  std::cout << "NEAR\n"; break;
+  case CGAL_FE_DOWNWARD:   std::cout << "DOWN\n"; break;
+  case CGAL_FE_UPWARD:     std::cout << "UP\n"; break;
+  case CGAL_FE_TOWARDZERO: std::cout << "ZERO\n"; break;
+  default:                 std::cout << "unknown !\n";
+  }
+}
+
+int main()
+{
+   bool flag = true;
+
+   flag = flag && (FPU_empiric_test() == CGAL_FE_TONEAREST);
+   std::cout << "default: ";
+   print_res(flag);
+
+   // Should be a no-op.
+   CGAL::FPU_set_cw(CGAL::FPU_get_cw());
+   flag = flag && (FPU_empiric_test() == CGAL_FE_TONEAREST);
+   std::cout << "get/set: ";
+   print_res(flag);
+   if (!flag) print_rounding_name(FPU_empiric_test());
+
+   // Rounding to zero.
+   CGAL::FPU_set_cw(CGAL_FE_TOWARDZERO);
+   flag = flag && (FPU_empiric_test() == CGAL_FE_TOWARDZERO);
+   std::cout << "zero   : ";
+   print_res(flag);
+   if (!flag) print_rounding_name(FPU_empiric_test());
+
+   // Rounding to infinity.
+   CGAL::FPU_set_cw(CGAL_FE_UPWARD);
+   flag = flag && (FPU_empiric_test() == CGAL_FE_UPWARD);
+   std::cout << "+inf   : ";
+   print_res(flag);
+   if (!flag) print_rounding_name(FPU_empiric_test());
+
+   // Rounding to minus infinity.
+   CGAL::FPU_set_cw(CGAL_FE_DOWNWARD);
+   flag = flag && (FPU_empiric_test() == CGAL_FE_DOWNWARD);
+   std::cout << "-inf   : ";
+   print_res(flag);
+   if (!flag) print_rounding_name(FPU_empiric_test());
+
+   // Rounding to nearest.
+   CGAL::FPU_set_cw(CGAL_FE_TONEAREST);
+   flag = flag && (FPU_empiric_test() == CGAL_FE_TONEAREST);
+   std::cout << "near   : ";
+   print_res(flag);
+   if (!flag) print_rounding_name(FPU_empiric_test());
+
+   return (int) !flag;
+}

Maintenance/deb/sarge/debian/watch

@@ -0,0 +1,2 @@
+version=3
+ftp://ftp.mpi-sb.mpg.de/pub/outgoing/CGAL/CGAL-([0-9\.]*).tar.gz 3.3