From 149a81024ef0d13374d015bcb54f7091734fb5b0 Mon Sep 17 00:00:00 2001 From: Joachim Reichel Date: Sun, 1 Apr 2007 21:52:14 +0000 Subject: [PATCH] update Debian stuff for 3.3-I-284 --- Maintenance/deb/TODO | 1 - Maintenance/deb/sarge/debian/changelog | 4 +- Maintenance/deb/sarge/debian/copyright | 235 +++++++++++------- .../sarge/debian/patches/build-library.dpatch | 40 ++- Maintenance/deb/sarge/debian/rules | 3 +- Maintenance/deb/sid/debian/changelog | 4 +- Maintenance/deb/sid/debian/copyright | 235 +++++++++++------- .../sid/debian/patches/build-library.dpatch | 40 ++- Maintenance/deb/sid/debian/rules | 3 +- 9 files changed, 354 insertions(+), 211 deletions(-) diff --git a/Maintenance/deb/TODO b/Maintenance/deb/TODO index 77af14cb58a..d48d5f583d2 100644 --- a/Maintenance/deb/TODO +++ b/Maintenance/deb/TODO @@ -2,5 +2,4 @@ TODO ==== - update list of authors in debian/copyright -- update license text in debian/copyright - adjust date in manpage diff --git a/Maintenance/deb/sarge/debian/changelog b/Maintenance/deb/sarge/debian/changelog index e5bf4123d42..4b5957b65b3 100644 --- a/Maintenance/deb/sarge/debian/changelog +++ b/Maintenance/deb/sarge/debian/changelog @@ -1,8 +1,8 @@ -cgal (3.2.99.277-0sarge1) stable; urgency=low +cgal (3.3~I-284-0sarge1) stable; urgency=low * New upstream release - -- Joachim Reichel Sun, 25 Mar 2007 12:58:38 +0200 + -- Joachim Reichel Sun, 1 Apr 2007 22:40:08 +0200 cgal (3.2.1-3) unstable; urgency=low diff --git a/Maintenance/deb/sarge/debian/copyright b/Maintenance/deb/sarge/debian/copyright index 8e6224db3b6..06ee66c2bb5 100644 --- a/Maintenance/deb/sarge/debian/copyright +++ b/Maintenance/deb/sarge/debian/copyright @@ -15,79 +15,94 @@ package and to redistribute it in the non-free archive. Authors ======= -Editorial Committee: - -Andreas Fabri (release manager), GeometryFactory -Efi Fogel, Tel Aviv University -Bernd Gärtner, 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 -Remco Veltkamp, Utrecht University -Ron Wein, Tel Aviv University -Mariette Yvinec, INRIA Sophia Antipolis - -Current Developers: - -Pierre Alliez, INRIA Sophia Antipolis -Eric Berberich, Max-Planck-Institut für Informatik -Fernando Cacciola, Scisoft/GeometryFactory -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 -Idit Haran, Tel Aviv University -Michael Hemmer, Mainz University -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 -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 -Baruch Zukerman, Tel Aviv University - -Former Developers: - -Matthias Bäsken +Pierre Alliez +Eric Berberich +Olivier Billet +Jean-Daniel Boissonnat +Carine Bonetto Hervé Brönnimann +Matthias Bäsken +Fernando Cacciola +Frédéric Cazals +Raphaëlle Chaine Tran Kai Frank Da +Christophe Delage Olivier Devillers Katrin Dobrindt +Arno Eigenwillig Eti Ezra +Andreas Fabri +Frédéric Fichel Kaspar Fischer Eyal Flato Julia Flötotto +Efi Fogel Wolfgang Freiseisen Geert-Jan Giezeman +Marc Glisse +Miguel Granados Philippe Guigue +Bernd Gärtner +Peter Hachenberger Iddo Hanniel Sariel Har-Peled +Idit Haran +Julien Hazebrouck +Michael Hemmer +Thomas Herrmann Susan Hert Shai Hirsch +Michael Hoffmann +Marcel Janer +Athanasios Kakargias +Menelaos Karavelas Lutz Kettner -Eran Leiserowitz +Nico Kruithof +Eran Leiserowitz +Sebastian Limbach +Kapelushnik Lior Eugene Lipovetsky +Sébastien Loriot +Bruno Lévy +Pedro Machado +Bastien Manuel +Abdelkrim Mebarki +Naceur Meskini +Andreas Meyer +Michal Meyerovitch Oren Nechushtan Gabriele Neyer +Ralf Osbild Steve Oudot Eli Packer Dmitrii Pasechnik +Sylvain Pion +Marc Pouget Sigal Raab François Rebufat +Joachim Reichel +David Rey +Laurent Rineau +Daniel Russel Niv Sabath +Laurent Saboret Stefan Schirra Sven Schönherr Michael Seel +Ophir Setter +Le-Jeng Shiue Hans Tangelder +Monique Teillaud +Constantinos Tsirogiannis Radu Ursu Carl Van Geem +Remco Veltkamp +Ron Wein Wieger Wesselink +Camille Wormser +Mariette Yvinec +Afra Zomorodian +Baruch Zukerman Tali Zvi @@ -120,25 +135,28 @@ Copyright (from upstream file LICENSE) The CGAL software consists of several parts, each of which is licensed under an open source license. It is also possible to obtain commercial licenses from GeometryFactory (www.geometryfactory.com) for all or parts of CGAL. - + The source code of the CGAL library can be found in the directories - "src/CGAL", "src/CGALQt" and "include/CGAL". It is specified in each file of - the CGAL library which license applies to it. This is either the GNU Lesser - General Public License (as published by the Free Software Foundation; - version 2.1 of the License) or the Q Public License (version 1.0). The texts - of both licenses can be found in the files - /usr/share/common-licenses/LGPL-2.1 and LICENSE.QPL (see below). - + "src/CGAL", "src/CGALQt" and "include/CGAL" (with the exception of + "include/CGAL/CORE", "include/CGAL/OpenNL" and "include/CGAL/PDB"). + It is specified in each file of the CGAL library which license applies to + it. This is either the GNU Lesser General Public License (as published by + the Free Software Foundation; version 2.1 of the License) or the Q Public + License (version 1.0), *depending on each file*. The texts of both licenses + can be found in the files LICENSE.LGPL and LICENSE.QPL. + Distributed along with CGAL (for the users' convenience), but not part of CGAL, are the following third-party libraries, available under their own licenses: - - CORE, in the directories "include/CORE" and "src/Core", is licensed under - the QPL (see LICENSE.QPL below). - - OpenNL, in the directory "include/OpenNL", is licensed under the LGPL 2.1 - (see /usr/share/common-licenses/LGPL-2.1). - - ImageIO, in the directory "examples/Surface_mesher/ImageIO", is licensed - under the LGPL 2.1 (see /usr/share/common-licenses/LGPL-2.1). + - CORE, in the directories "include/CGAL/CORE" and "src/CGALCore", is + licensed under the QPL (see LICENSE.QPL). + - ImageIO, in the directory "src/CGALimageIO", is licensed under the LGPL + (see LICENSE.LGPL). + - PDB, in the directory "include/CGAL/PDB" and "src/CGALPDB" is licensed + under the LGPL (see LICENSE.LGPL). + - OpenNL, in the directory "include/CGAL/OpenNL", is licensed under the LGPL + (see LICENSE.LGPL). All other files that do not have an explicit copyright notice (e.g., all examples and some demos) are licensed under a very permissive license. The @@ -160,15 +178,15 @@ file to file. INRIA Sophia-Antipolis (France), Martin-Luther-University Halle-Wittenberg (Germany), Max-Planck-Institute Saarbruecken (Germany), RISC Linz (Austria), and Tel-Aviv University (Israel). All rights reserved. - + This file is part of CGAL (www.cgal.org); you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; version 2.1 of the License. See the file LICENSE.LGPL distributed with CGAL. - + Licensees holding a valid commercial license may use this file in accordance with the commercial license agreement provided with the software. - + This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. @@ -183,14 +201,14 @@ file to file. Copyright (c) 1997-2000 ETH Zurich (Switzerland). All rights reserved. - + This file is part of CGAL (www.cgal.org); you may redistribute it under the terms of the Q Public License version 1.0. See the file LICENSE.QPL distributed with CGAL. - + Licensees holding a valid commercial license may use this file in accordance with the commercial license agreement provided with the software. - + This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. @@ -229,48 +247,24 @@ distributed with CGAL: -OpenNL -====== - -The following copyright statement applies to the OpenNL library in -include/OpenNL. - - author: Bruno Levy, INRIA, project ALICE - website: http://www.loria.fr/~levy/software - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License version 2.1 as published by the Free Software Foundation - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - - - CORE ==== -The following copyright statement applies to the CORE library in src/CORE -and include/CORE. +The following copyright statement applies to the CORE library in +src/CGALCore and include/CGAL/CORE. Core Library Version 1.7, August 2004 Copyright (c) 1995-2004 Exact Computation Project All rights reserved. - + This file is part of CORE (http://cs.nyu.edu/exact/core/); you may redistribute it under the terms of the Q Public License version 1.0. See the file LICENSE.QPL distributed with CORE. - + Licensees holding a valid commercial license may use this file in accordance with the commercial license agreement provided with the software. - + This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. @@ -280,24 +274,77 @@ ImageIO ======= The following copyright statement applies to the ImageIO library in -examples/Surface_mesher/ImageIO. +src/CGALimageIO. Copyright (c) 2005, 2006 ASCLEPIOS Project, INRIA Sophia-Antipolis (France) All rights reserved. - + The files in this directory are part of the ImageIO Library. You can redistribute them and/or modify them under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; version 2.1 of the License. See the file /usr/share/common-licenses/LGPL-2.1. - + Licensees holding a valid commercial license may use this file in accordance with the commercial license agreement provided with the software. - + These files are provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +PDB +=== + +The following copyright statement applies to the PDB library in +include/CGAL/PDB and src/CGALPDB. + + Copyright 2004 + Stanford University + + This file is part of the DSR PDB Library. + + The DSR PDB Library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or (at your + option) any later version. + + The DSR PDB Library is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with the DSR PDB Library; see the file /usr/share/common-licenses/LGPL-2.1. + If not, write to the Free Software Foundation, Inc., 51 Franklin Street, + Fifth Floor, Boston, MA 02110-1301, USA. + + + +OpenNL +====== + +The following copyright statement applies to the OpenNL library in +include/CGAL/OpenNL. + + author: Bruno Levy, INRIA, project ALICE + website: http://www.loria.fr/~levy/software + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License version 2.1 as published by the Free Software Foundation + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this library; see the file /usr/share/common-licenses/LGPL-2.1. + If not, write to the Free Software Foundation, Inc., 51 Franklin St, + Fifth Floor, Boston, MA 02110-1301, USA + + + LICENSE.QPL =========== diff --git a/Maintenance/deb/sarge/debian/patches/build-library.dpatch b/Maintenance/deb/sarge/debian/patches/build-library.dpatch index 3018c7763c5..61a8c4b9fef 100755 --- a/Maintenance/deb/sarge/debian/patches/build-library.dpatch +++ b/Maintenance/deb/sarge/debian/patches/build-library.dpatch @@ -6,8 +6,17 @@ @DPATCH@ diff -urNad cgal~/install_cgal cgal/install_cgal ---- cgal~/install_cgal 2007-03-25 13:01:29.000000000 +0200 -+++ cgal/install_cgal 2007-03-25 13:01:53.000000000 +0200 +--- cgal~/install_cgal 2007-04-01 23:17:22.000000000 +0200 ++++ cgal/install_cgal 2007-04-01 23:18:21.000000000 +0200 +@@ -836,7 +836,7 @@ + CGAL_SHARED_LIB_SONAME="" + CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME)" + CGAL_SHARED_LIBNAME_WITH_SOMAJOR="\$(CGAL_SHARED_LIBNAME)" +- RUNTIME_LINKER_FLAG='' ++# RUNTIME_LINKER_FLAG='' + PRINT_STACKTRACE_PROGRAM="gdb" + WINDOWS_COMPILER="" + CYGWIN_COMPILER="" @@ -934,7 +934,7 @@ #### settings for sgi mipspro compiler on irix5 CGAL_SHARED_LIB_CXXFLAGS= @@ -79,7 +88,7 @@ diff -urNad cgal~/install_cgal cgal/install_cgal 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 @@ +@@ -1009,12 +1009,12 @@ # -mp is required for correct enough floating point operations # necessary for interval arithmetic. ADDITIONAL_CXXFLAGS="-mp" @@ -87,9 +96,6 @@ diff -urNad cgal~/install_cgal cgal/install_cgal +# 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' @@ -97,6 +103,24 @@ diff -urNad cgal~/install_cgal cgal/install_cgal # PGCC has long name problems with "-g". DEBUG_OPT="" ;; +@@ -1024,7 +1024,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)" +@@ -4284,7 +4284,7 @@ + ${_rm} -f "${COMPILE_LOGFILE}" + fi + ${_rm} -f *"${OBJ_EXT}" +- MAKE_OPTION="-k CGAL_MAKEFILE=$CGAL_MAKEFILE" ++ MAKE_OPTION="-k -j 1 CGAL_MAKEFILE=$CGAL_MAKEFILE" + + case "$2" in + static) @@ -4307,7 +4307,7 @@ _buildlog_marker="log for $1 $2 shown" @@ -107,8 +131,8 @@ diff -urNad cgal~/install_cgal cgal/install_cgal log_print "vvvvvvvvvvvv build ${_buildlog_marker} below vvvvvvvvvvvv" eval ${_cat} \"${COMPILE_LOGFILE}\" ${INSTALL_LOGFILE_REDIRECTION} diff -urNad cgal~/src/CGAL/common.mk cgal/src/CGAL/common.mk ---- cgal~/src/CGAL/common.mk 2007-03-25 13:01:29.000000000 +0200 -+++ cgal/src/CGAL/common.mk 2007-03-25 13:01:29.000000000 +0200 +--- cgal~/src/CGAL/common.mk 2007-04-01 23:17:22.000000000 +0200 ++++ cgal/src/CGAL/common.mk 2007-04-01 23:17:22.000000000 +0200 @@ -104,17 +104,19 @@ clean_temp_files:: diff --git a/Maintenance/deb/sarge/debian/rules b/Maintenance/deb/sarge/debian/rules index 729f4b01a04..67cbea41002 100755 --- a/Maintenance/deb/sarge/debian/rules +++ b/Maintenance/deb/sarge/debian/rules @@ -19,7 +19,8 @@ build: build-stamp build-stamp: patch-stamp dh_testdir dh_clean -k - QTDIR=/usr/share/qt3 ./install_cgal -ni --CXX $(CXX) --prefix $(CURDIR)/debian/tmp/usr \ + QTDIR=/usr/share/qt3 ./install_cgal -ni --CXX $(CXX) \ + --prefix $(CURDIR)/debian/tmp/usr \ --without-autofind --with-ZLIB --with-BOOST --with-BOOST_PROGRAM_OPTIONS \ --with-GMP --with-GMPXX --with-MPFR \ --with-X11 --with-OPENGL --with-QT3MT \ diff --git a/Maintenance/deb/sid/debian/changelog b/Maintenance/deb/sid/debian/changelog index e97d9803732..fbd32b9eb8f 100644 --- a/Maintenance/deb/sid/debian/changelog +++ b/Maintenance/deb/sid/debian/changelog @@ -1,8 +1,8 @@ -cgal (3.3~I-277-1) unstable; urgency=low +cgal (3.3~I-284-1) unstable; urgency=low * New upstream release - -- Joachim Reichel Sun, 25 Mar 2007 12:58:38 +0200 + -- Joachim Reichel Sun, 1 Apr 2007 22:40:08 +0200 cgal (3.2.1-3) unstable; urgency=low diff --git a/Maintenance/deb/sid/debian/copyright b/Maintenance/deb/sid/debian/copyright index 8e6224db3b6..06ee66c2bb5 100644 --- a/Maintenance/deb/sid/debian/copyright +++ b/Maintenance/deb/sid/debian/copyright @@ -15,79 +15,94 @@ package and to redistribute it in the non-free archive. Authors ======= -Editorial Committee: - -Andreas Fabri (release manager), GeometryFactory -Efi Fogel, Tel Aviv University -Bernd Gärtner, 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 -Remco Veltkamp, Utrecht University -Ron Wein, Tel Aviv University -Mariette Yvinec, INRIA Sophia Antipolis - -Current Developers: - -Pierre Alliez, INRIA Sophia Antipolis -Eric Berberich, Max-Planck-Institut für Informatik -Fernando Cacciola, Scisoft/GeometryFactory -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 -Idit Haran, Tel Aviv University -Michael Hemmer, Mainz University -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 -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 -Baruch Zukerman, Tel Aviv University - -Former Developers: - -Matthias Bäsken +Pierre Alliez +Eric Berberich +Olivier Billet +Jean-Daniel Boissonnat +Carine Bonetto Hervé Brönnimann +Matthias Bäsken +Fernando Cacciola +Frédéric Cazals +Raphaëlle Chaine Tran Kai Frank Da +Christophe Delage Olivier Devillers Katrin Dobrindt +Arno Eigenwillig Eti Ezra +Andreas Fabri +Frédéric Fichel Kaspar Fischer Eyal Flato Julia Flötotto +Efi Fogel Wolfgang Freiseisen Geert-Jan Giezeman +Marc Glisse +Miguel Granados Philippe Guigue +Bernd Gärtner +Peter Hachenberger Iddo Hanniel Sariel Har-Peled +Idit Haran +Julien Hazebrouck +Michael Hemmer +Thomas Herrmann Susan Hert Shai Hirsch +Michael Hoffmann +Marcel Janer +Athanasios Kakargias +Menelaos Karavelas Lutz Kettner -Eran Leiserowitz +Nico Kruithof +Eran Leiserowitz +Sebastian Limbach +Kapelushnik Lior Eugene Lipovetsky +Sébastien Loriot +Bruno Lévy +Pedro Machado +Bastien Manuel +Abdelkrim Mebarki +Naceur Meskini +Andreas Meyer +Michal Meyerovitch Oren Nechushtan Gabriele Neyer +Ralf Osbild Steve Oudot Eli Packer Dmitrii Pasechnik +Sylvain Pion +Marc Pouget Sigal Raab François Rebufat +Joachim Reichel +David Rey +Laurent Rineau +Daniel Russel Niv Sabath +Laurent Saboret Stefan Schirra Sven Schönherr Michael Seel +Ophir Setter +Le-Jeng Shiue Hans Tangelder +Monique Teillaud +Constantinos Tsirogiannis Radu Ursu Carl Van Geem +Remco Veltkamp +Ron Wein Wieger Wesselink +Camille Wormser +Mariette Yvinec +Afra Zomorodian +Baruch Zukerman Tali Zvi @@ -120,25 +135,28 @@ Copyright (from upstream file LICENSE) The CGAL software consists of several parts, each of which is licensed under an open source license. It is also possible to obtain commercial licenses from GeometryFactory (www.geometryfactory.com) for all or parts of CGAL. - + The source code of the CGAL library can be found in the directories - "src/CGAL", "src/CGALQt" and "include/CGAL". It is specified in each file of - the CGAL library which license applies to it. This is either the GNU Lesser - General Public License (as published by the Free Software Foundation; - version 2.1 of the License) or the Q Public License (version 1.0). The texts - of both licenses can be found in the files - /usr/share/common-licenses/LGPL-2.1 and LICENSE.QPL (see below). - + "src/CGAL", "src/CGALQt" and "include/CGAL" (with the exception of + "include/CGAL/CORE", "include/CGAL/OpenNL" and "include/CGAL/PDB"). + It is specified in each file of the CGAL library which license applies to + it. This is either the GNU Lesser General Public License (as published by + the Free Software Foundation; version 2.1 of the License) or the Q Public + License (version 1.0), *depending on each file*. The texts of both licenses + can be found in the files LICENSE.LGPL and LICENSE.QPL. + Distributed along with CGAL (for the users' convenience), but not part of CGAL, are the following third-party libraries, available under their own licenses: - - CORE, in the directories "include/CORE" and "src/Core", is licensed under - the QPL (see LICENSE.QPL below). - - OpenNL, in the directory "include/OpenNL", is licensed under the LGPL 2.1 - (see /usr/share/common-licenses/LGPL-2.1). - - ImageIO, in the directory "examples/Surface_mesher/ImageIO", is licensed - under the LGPL 2.1 (see /usr/share/common-licenses/LGPL-2.1). + - CORE, in the directories "include/CGAL/CORE" and "src/CGALCore", is + licensed under the QPL (see LICENSE.QPL). + - ImageIO, in the directory "src/CGALimageIO", is licensed under the LGPL + (see LICENSE.LGPL). + - PDB, in the directory "include/CGAL/PDB" and "src/CGALPDB" is licensed + under the LGPL (see LICENSE.LGPL). + - OpenNL, in the directory "include/CGAL/OpenNL", is licensed under the LGPL + (see LICENSE.LGPL). All other files that do not have an explicit copyright notice (e.g., all examples and some demos) are licensed under a very permissive license. The @@ -160,15 +178,15 @@ file to file. INRIA Sophia-Antipolis (France), Martin-Luther-University Halle-Wittenberg (Germany), Max-Planck-Institute Saarbruecken (Germany), RISC Linz (Austria), and Tel-Aviv University (Israel). All rights reserved. - + This file is part of CGAL (www.cgal.org); you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; version 2.1 of the License. See the file LICENSE.LGPL distributed with CGAL. - + Licensees holding a valid commercial license may use this file in accordance with the commercial license agreement provided with the software. - + This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. @@ -183,14 +201,14 @@ file to file. Copyright (c) 1997-2000 ETH Zurich (Switzerland). All rights reserved. - + This file is part of CGAL (www.cgal.org); you may redistribute it under the terms of the Q Public License version 1.0. See the file LICENSE.QPL distributed with CGAL. - + Licensees holding a valid commercial license may use this file in accordance with the commercial license agreement provided with the software. - + This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. @@ -229,48 +247,24 @@ distributed with CGAL: -OpenNL -====== - -The following copyright statement applies to the OpenNL library in -include/OpenNL. - - author: Bruno Levy, INRIA, project ALICE - website: http://www.loria.fr/~levy/software - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License version 2.1 as published by the Free Software Foundation - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - - - CORE ==== -The following copyright statement applies to the CORE library in src/CORE -and include/CORE. +The following copyright statement applies to the CORE library in +src/CGALCore and include/CGAL/CORE. Core Library Version 1.7, August 2004 Copyright (c) 1995-2004 Exact Computation Project All rights reserved. - + This file is part of CORE (http://cs.nyu.edu/exact/core/); you may redistribute it under the terms of the Q Public License version 1.0. See the file LICENSE.QPL distributed with CORE. - + Licensees holding a valid commercial license may use this file in accordance with the commercial license agreement provided with the software. - + This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. @@ -280,24 +274,77 @@ ImageIO ======= The following copyright statement applies to the ImageIO library in -examples/Surface_mesher/ImageIO. +src/CGALimageIO. Copyright (c) 2005, 2006 ASCLEPIOS Project, INRIA Sophia-Antipolis (France) All rights reserved. - + The files in this directory are part of the ImageIO Library. You can redistribute them and/or modify them under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; version 2.1 of the License. See the file /usr/share/common-licenses/LGPL-2.1. - + Licensees holding a valid commercial license may use this file in accordance with the commercial license agreement provided with the software. - + These files are provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +PDB +=== + +The following copyright statement applies to the PDB library in +include/CGAL/PDB and src/CGALPDB. + + Copyright 2004 + Stanford University + + This file is part of the DSR PDB Library. + + The DSR PDB Library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or (at your + option) any later version. + + The DSR PDB Library is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with the DSR PDB Library; see the file /usr/share/common-licenses/LGPL-2.1. + If not, write to the Free Software Foundation, Inc., 51 Franklin Street, + Fifth Floor, Boston, MA 02110-1301, USA. + + + +OpenNL +====== + +The following copyright statement applies to the OpenNL library in +include/CGAL/OpenNL. + + author: Bruno Levy, INRIA, project ALICE + website: http://www.loria.fr/~levy/software + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License version 2.1 as published by the Free Software Foundation + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this library; see the file /usr/share/common-licenses/LGPL-2.1. + If not, write to the Free Software Foundation, Inc., 51 Franklin St, + Fifth Floor, Boston, MA 02110-1301, USA + + + LICENSE.QPL =========== diff --git a/Maintenance/deb/sid/debian/patches/build-library.dpatch b/Maintenance/deb/sid/debian/patches/build-library.dpatch index 3018c7763c5..61a8c4b9fef 100755 --- a/Maintenance/deb/sid/debian/patches/build-library.dpatch +++ b/Maintenance/deb/sid/debian/patches/build-library.dpatch @@ -6,8 +6,17 @@ @DPATCH@ diff -urNad cgal~/install_cgal cgal/install_cgal ---- cgal~/install_cgal 2007-03-25 13:01:29.000000000 +0200 -+++ cgal/install_cgal 2007-03-25 13:01:53.000000000 +0200 +--- cgal~/install_cgal 2007-04-01 23:17:22.000000000 +0200 ++++ cgal/install_cgal 2007-04-01 23:18:21.000000000 +0200 +@@ -836,7 +836,7 @@ + CGAL_SHARED_LIB_SONAME="" + CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME)" + CGAL_SHARED_LIBNAME_WITH_SOMAJOR="\$(CGAL_SHARED_LIBNAME)" +- RUNTIME_LINKER_FLAG='' ++# RUNTIME_LINKER_FLAG='' + PRINT_STACKTRACE_PROGRAM="gdb" + WINDOWS_COMPILER="" + CYGWIN_COMPILER="" @@ -934,7 +934,7 @@ #### settings for sgi mipspro compiler on irix5 CGAL_SHARED_LIB_CXXFLAGS= @@ -79,7 +88,7 @@ diff -urNad cgal~/install_cgal cgal/install_cgal 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 @@ +@@ -1009,12 +1009,12 @@ # -mp is required for correct enough floating point operations # necessary for interval arithmetic. ADDITIONAL_CXXFLAGS="-mp" @@ -87,9 +96,6 @@ diff -urNad cgal~/install_cgal cgal/install_cgal +# 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' @@ -97,6 +103,24 @@ diff -urNad cgal~/install_cgal cgal/install_cgal # PGCC has long name problems with "-g". DEBUG_OPT="" ;; +@@ -1024,7 +1024,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)" +@@ -4284,7 +4284,7 @@ + ${_rm} -f "${COMPILE_LOGFILE}" + fi + ${_rm} -f *"${OBJ_EXT}" +- MAKE_OPTION="-k CGAL_MAKEFILE=$CGAL_MAKEFILE" ++ MAKE_OPTION="-k -j 1 CGAL_MAKEFILE=$CGAL_MAKEFILE" + + case "$2" in + static) @@ -4307,7 +4307,7 @@ _buildlog_marker="log for $1 $2 shown" @@ -107,8 +131,8 @@ diff -urNad cgal~/install_cgal cgal/install_cgal log_print "vvvvvvvvvvvv build ${_buildlog_marker} below vvvvvvvvvvvv" eval ${_cat} \"${COMPILE_LOGFILE}\" ${INSTALL_LOGFILE_REDIRECTION} diff -urNad cgal~/src/CGAL/common.mk cgal/src/CGAL/common.mk ---- cgal~/src/CGAL/common.mk 2007-03-25 13:01:29.000000000 +0200 -+++ cgal/src/CGAL/common.mk 2007-03-25 13:01:29.000000000 +0200 +--- cgal~/src/CGAL/common.mk 2007-04-01 23:17:22.000000000 +0200 ++++ cgal/src/CGAL/common.mk 2007-04-01 23:17:22.000000000 +0200 @@ -104,17 +104,19 @@ clean_temp_files:: diff --git a/Maintenance/deb/sid/debian/rules b/Maintenance/deb/sid/debian/rules index 729f4b01a04..67cbea41002 100755 --- a/Maintenance/deb/sid/debian/rules +++ b/Maintenance/deb/sid/debian/rules @@ -19,7 +19,8 @@ build: build-stamp build-stamp: patch-stamp dh_testdir dh_clean -k - QTDIR=/usr/share/qt3 ./install_cgal -ni --CXX $(CXX) --prefix $(CURDIR)/debian/tmp/usr \ + QTDIR=/usr/share/qt3 ./install_cgal -ni --CXX $(CXX) \ + --prefix $(CURDIR)/debian/tmp/usr \ --without-autofind --with-ZLIB --with-BOOST --with-BOOST_PROGRAM_OPTIONS \ --with-GMP --with-GMPXX --with-MPFR \ --with-X11 --with-OPENGL --with-QT3MT \