update Debian stuff for 3.3-I-284

This commit is contained in:
Joachim Reichel 2007-04-01 21:52:14 +00:00
parent d77bcac271
commit 149a81024e
9 changed files with 354 additions and 211 deletions

View File

@ -2,5 +2,4 @@ TODO
==== ====
- update list of authors in debian/copyright - update list of authors in debian/copyright
- update license text in debian/copyright
- adjust date in manpage - adjust date in manpage

View File

@ -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 * New upstream release
-- Joachim Reichel <joachim.reichel@gmx.de> Sun, 25 Mar 2007 12:58:38 +0200 -- Joachim Reichel <joachim.reichel@gmx.de> Sun, 1 Apr 2007 22:40:08 +0200
cgal (3.2.1-3) unstable; urgency=low cgal (3.2.1-3) unstable; urgency=low

View File

@ -15,79 +15,94 @@ package and to redistribute it in the non-free archive.
Authors Authors
======= =======
Editorial Committee: Pierre Alliez
Eric Berberich
Andreas Fabri (release manager), GeometryFactory Olivier Billet
Efi Fogel, Tel Aviv University Jean-Daniel Boissonnat
Bernd Gärtner, ETH Zürich Carine Bonetto
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
Hervé Brönnimann Hervé Brönnimann
Matthias Bäsken
Fernando Cacciola
Frédéric Cazals
Raphaëlle Chaine
Tran Kai Frank Da Tran Kai Frank Da
Christophe Delage
Olivier Devillers Olivier Devillers
Katrin Dobrindt Katrin Dobrindt
Arno Eigenwillig
Eti Ezra Eti Ezra
Andreas Fabri
Frédéric Fichel
Kaspar Fischer Kaspar Fischer
Eyal Flato Eyal Flato
Julia Flötotto Julia Flötotto
Efi Fogel
Wolfgang Freiseisen Wolfgang Freiseisen
Geert-Jan Giezeman Geert-Jan Giezeman
Marc Glisse
Miguel Granados
Philippe Guigue Philippe Guigue
Bernd Gärtner
Peter Hachenberger
Iddo Hanniel Iddo Hanniel
Sariel Har-Peled Sariel Har-Peled
Idit Haran
Julien Hazebrouck
Michael Hemmer
Thomas Herrmann
Susan Hert Susan Hert
Shai Hirsch Shai Hirsch
Michael Hoffmann
Marcel Janer
Athanasios Kakargias
Menelaos Karavelas
Lutz Kettner Lutz Kettner
Nico Kruithof
Eran Leiserowitz Eran Leiserowitz
Sebastian Limbach
Kapelushnik Lior
Eugene Lipovetsky Eugene Lipovetsky
Sébastien Loriot
Bruno Lévy
Pedro Machado
Bastien Manuel
Abdelkrim Mebarki
Naceur Meskini
Andreas Meyer
Michal Meyerovitch
Oren Nechushtan Oren Nechushtan
Gabriele Neyer Gabriele Neyer
Ralf Osbild
Steve Oudot Steve Oudot
Eli Packer Eli Packer
Dmitrii Pasechnik Dmitrii Pasechnik
Sylvain Pion
Marc Pouget
Sigal Raab Sigal Raab
François Rebufat François Rebufat
Joachim Reichel
David Rey
Laurent Rineau
Daniel Russel
Niv Sabath Niv Sabath
Laurent Saboret
Stefan Schirra Stefan Schirra
Sven Schönherr Sven Schönherr
Michael Seel Michael Seel
Ophir Setter
Le-Jeng Shiue
Hans Tangelder Hans Tangelder
Monique Teillaud
Constantinos Tsirogiannis
Radu Ursu Radu Ursu
Carl Van Geem Carl Van Geem
Remco Veltkamp
Ron Wein
Wieger Wesselink Wieger Wesselink
Camille Wormser
Mariette Yvinec
Afra Zomorodian
Baruch Zukerman
Tali Zvi Tali Zvi
@ -122,23 +137,26 @@ Copyright (from upstream file LICENSE)
from GeometryFactory (www.geometryfactory.com) for all or parts of CGAL. from GeometryFactory (www.geometryfactory.com) for all or parts of CGAL.
The source code of the CGAL library can be found in the directories 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 "src/CGAL", "src/CGALQt" and "include/CGAL" (with the exception of
the CGAL library which license applies to it. This is either the GNU Lesser "include/CGAL/CORE", "include/CGAL/OpenNL" and "include/CGAL/PDB").
General Public License (as published by the Free Software Foundation; It is specified in each file of the CGAL library which license applies to
version 2.1 of the License) or the Q Public License (version 1.0). The texts it. This is either the GNU Lesser General Public License (as published by
of both licenses can be found in the files the Free Software Foundation; version 2.1 of the License) or the Q Public
/usr/share/common-licenses/LGPL-2.1 and LICENSE.QPL (see below). 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 Distributed along with CGAL (for the users' convenience), but not part of
CGAL, are the following third-party libraries, available under their own CGAL, are the following third-party libraries, available under their own
licenses: licenses:
- CORE, in the directories "include/CORE" and "src/Core", is licensed under - CORE, in the directories "include/CGAL/CORE" and "src/CGALCore", is
the QPL (see LICENSE.QPL below). licensed under the QPL (see LICENSE.QPL).
- OpenNL, in the directory "include/OpenNL", is licensed under the LGPL 2.1 - ImageIO, in the directory "src/CGALimageIO", is licensed under the LGPL
(see /usr/share/common-licenses/LGPL-2.1). (see LICENSE.LGPL).
- ImageIO, in the directory "examples/Surface_mesher/ImageIO", is licensed - PDB, in the directory "include/CGAL/PDB" and "src/CGALPDB" is licensed
under the LGPL 2.1 (see /usr/share/common-licenses/LGPL-2.1). 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 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 examples and some demos) are licensed under a very permissive license. The
@ -229,35 +247,11 @@ 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 CORE
==== ====
The following copyright statement applies to the CORE library in src/CORE The following copyright statement applies to the CORE library in
and include/CORE. src/CGALCore and include/CGAL/CORE.
Core Library Version 1.7, August 2004 Core Library Version 1.7, August 2004
Copyright (c) 1995-2004 Exact Computation Project Copyright (c) 1995-2004 Exact Computation Project
@ -280,7 +274,7 @@ ImageIO
======= =======
The following copyright statement applies to the ImageIO library in 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) Copyright (c) 2005, 2006 ASCLEPIOS Project, INRIA Sophia-Antipolis (France)
All rights reserved. All rights reserved.
@ -298,6 +292,59 @@ examples/Surface_mesher/ImageIO.
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 LICENSE.QPL
=========== ===========

View File

@ -6,8 +6,17 @@
@DPATCH@ @DPATCH@
diff -urNad cgal~/install_cgal cgal/install_cgal diff -urNad cgal~/install_cgal cgal/install_cgal
--- cgal~/install_cgal 2007-03-25 13:01:29.000000000 +0200 --- cgal~/install_cgal 2007-04-01 23:17:22.000000000 +0200
+++ cgal/install_cgal 2007-03-25 13:01:53.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 @@ @@ -934,7 +934,7 @@
#### settings for sgi mipspro compiler on irix5 #### settings for sgi mipspro compiler on irix5
CGAL_SHARED_LIB_CXXFLAGS= 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_LIB_SONAME="-Wl,-soname,\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME).\$(SOVERSION)" CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME).\$(SOVERSION)"
CGAL_SHARED_LIBNAME_WITH_SOMAJOR="\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)" 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 # -mp is required for correct enough floating point operations
# necessary for interval arithmetic. # necessary for interval arithmetic.
ADDITIONAL_CXXFLAGS="-mp" ADDITIONAL_CXXFLAGS="-mp"
@ -87,9 +96,6 @@ diff -urNad cgal~/install_cgal cgal/install_cgal
+# RUNTIME_LINKER_FLAG='-Wl,-R' +# RUNTIME_LINKER_FLAG='-Wl,-R'
PRINT_STACKTRACE_PROGRAM="idb" PRINT_STACKTRACE_PROGRAM="idb"
;; ;;
*Linux*sunCC*)
@@ -1060,7 +1060,7 @@
;;
*Linux*pgCC*|*Linux*pgcpp*) *Linux*pgCC*|*Linux*pgcpp*)
#### settings for Portland Group Compiler on linux #### settings for Portland Group Compiler on linux
- RUNTIME_LINKER_FLAG='-Wl,-R' - RUNTIME_LINKER_FLAG='-Wl,-R'
@ -97,6 +103,24 @@ diff -urNad cgal~/install_cgal cgal/install_cgal
# PGCC has long name problems with "-g". # PGCC has long name problems with "-g".
DEBUG_OPT="" 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 @@ @@ -4307,7 +4307,7 @@
_buildlog_marker="log for $1 $2 shown" _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" log_print "vvvvvvvvvvvv build ${_buildlog_marker} below vvvvvvvvvvvv"
eval ${_cat} \"${COMPILE_LOGFILE}\" ${INSTALL_LOGFILE_REDIRECTION} eval ${_cat} \"${COMPILE_LOGFILE}\" ${INSTALL_LOGFILE_REDIRECTION}
diff -urNad cgal~/src/CGAL/common.mk cgal/src/CGAL/common.mk 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-04-01 23:17:22.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
@@ -104,17 +104,19 @@ @@ -104,17 +104,19 @@
clean_temp_files:: clean_temp_files::

View File

@ -19,7 +19,8 @@ build: build-stamp
build-stamp: patch-stamp build-stamp: patch-stamp
dh_testdir dh_testdir
dh_clean -k 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 \ --without-autofind --with-ZLIB --with-BOOST --with-BOOST_PROGRAM_OPTIONS \
--with-GMP --with-GMPXX --with-MPFR \ --with-GMP --with-GMPXX --with-MPFR \
--with-X11 --with-OPENGL --with-QT3MT \ --with-X11 --with-OPENGL --with-QT3MT \

View File

@ -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 * New upstream release
-- Joachim Reichel <joachim.reichel@gmx.de> Sun, 25 Mar 2007 12:58:38 +0200 -- Joachim Reichel <joachim.reichel@gmx.de> Sun, 1 Apr 2007 22:40:08 +0200
cgal (3.2.1-3) unstable; urgency=low cgal (3.2.1-3) unstable; urgency=low

View File

@ -15,79 +15,94 @@ package and to redistribute it in the non-free archive.
Authors Authors
======= =======
Editorial Committee: Pierre Alliez
Eric Berberich
Andreas Fabri (release manager), GeometryFactory Olivier Billet
Efi Fogel, Tel Aviv University Jean-Daniel Boissonnat
Bernd Gärtner, ETH Zürich Carine Bonetto
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
Hervé Brönnimann Hervé Brönnimann
Matthias Bäsken
Fernando Cacciola
Frédéric Cazals
Raphaëlle Chaine
Tran Kai Frank Da Tran Kai Frank Da
Christophe Delage
Olivier Devillers Olivier Devillers
Katrin Dobrindt Katrin Dobrindt
Arno Eigenwillig
Eti Ezra Eti Ezra
Andreas Fabri
Frédéric Fichel
Kaspar Fischer Kaspar Fischer
Eyal Flato Eyal Flato
Julia Flötotto Julia Flötotto
Efi Fogel
Wolfgang Freiseisen Wolfgang Freiseisen
Geert-Jan Giezeman Geert-Jan Giezeman
Marc Glisse
Miguel Granados
Philippe Guigue Philippe Guigue
Bernd Gärtner
Peter Hachenberger
Iddo Hanniel Iddo Hanniel
Sariel Har-Peled Sariel Har-Peled
Idit Haran
Julien Hazebrouck
Michael Hemmer
Thomas Herrmann
Susan Hert Susan Hert
Shai Hirsch Shai Hirsch
Michael Hoffmann
Marcel Janer
Athanasios Kakargias
Menelaos Karavelas
Lutz Kettner Lutz Kettner
Nico Kruithof
Eran Leiserowitz Eran Leiserowitz
Sebastian Limbach
Kapelushnik Lior
Eugene Lipovetsky Eugene Lipovetsky
Sébastien Loriot
Bruno Lévy
Pedro Machado
Bastien Manuel
Abdelkrim Mebarki
Naceur Meskini
Andreas Meyer
Michal Meyerovitch
Oren Nechushtan Oren Nechushtan
Gabriele Neyer Gabriele Neyer
Ralf Osbild
Steve Oudot Steve Oudot
Eli Packer Eli Packer
Dmitrii Pasechnik Dmitrii Pasechnik
Sylvain Pion
Marc Pouget
Sigal Raab Sigal Raab
François Rebufat François Rebufat
Joachim Reichel
David Rey
Laurent Rineau
Daniel Russel
Niv Sabath Niv Sabath
Laurent Saboret
Stefan Schirra Stefan Schirra
Sven Schönherr Sven Schönherr
Michael Seel Michael Seel
Ophir Setter
Le-Jeng Shiue
Hans Tangelder Hans Tangelder
Monique Teillaud
Constantinos Tsirogiannis
Radu Ursu Radu Ursu
Carl Van Geem Carl Van Geem
Remco Veltkamp
Ron Wein
Wieger Wesselink Wieger Wesselink
Camille Wormser
Mariette Yvinec
Afra Zomorodian
Baruch Zukerman
Tali Zvi Tali Zvi
@ -122,23 +137,26 @@ Copyright (from upstream file LICENSE)
from GeometryFactory (www.geometryfactory.com) for all or parts of CGAL. from GeometryFactory (www.geometryfactory.com) for all or parts of CGAL.
The source code of the CGAL library can be found in the directories 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 "src/CGAL", "src/CGALQt" and "include/CGAL" (with the exception of
the CGAL library which license applies to it. This is either the GNU Lesser "include/CGAL/CORE", "include/CGAL/OpenNL" and "include/CGAL/PDB").
General Public License (as published by the Free Software Foundation; It is specified in each file of the CGAL library which license applies to
version 2.1 of the License) or the Q Public License (version 1.0). The texts it. This is either the GNU Lesser General Public License (as published by
of both licenses can be found in the files the Free Software Foundation; version 2.1 of the License) or the Q Public
/usr/share/common-licenses/LGPL-2.1 and LICENSE.QPL (see below). 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 Distributed along with CGAL (for the users' convenience), but not part of
CGAL, are the following third-party libraries, available under their own CGAL, are the following third-party libraries, available under their own
licenses: licenses:
- CORE, in the directories "include/CORE" and "src/Core", is licensed under - CORE, in the directories "include/CGAL/CORE" and "src/CGALCore", is
the QPL (see LICENSE.QPL below). licensed under the QPL (see LICENSE.QPL).
- OpenNL, in the directory "include/OpenNL", is licensed under the LGPL 2.1 - ImageIO, in the directory "src/CGALimageIO", is licensed under the LGPL
(see /usr/share/common-licenses/LGPL-2.1). (see LICENSE.LGPL).
- ImageIO, in the directory "examples/Surface_mesher/ImageIO", is licensed - PDB, in the directory "include/CGAL/PDB" and "src/CGALPDB" is licensed
under the LGPL 2.1 (see /usr/share/common-licenses/LGPL-2.1). 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 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 examples and some demos) are licensed under a very permissive license. The
@ -229,35 +247,11 @@ 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 CORE
==== ====
The following copyright statement applies to the CORE library in src/CORE The following copyright statement applies to the CORE library in
and include/CORE. src/CGALCore and include/CGAL/CORE.
Core Library Version 1.7, August 2004 Core Library Version 1.7, August 2004
Copyright (c) 1995-2004 Exact Computation Project Copyright (c) 1995-2004 Exact Computation Project
@ -280,7 +274,7 @@ ImageIO
======= =======
The following copyright statement applies to the ImageIO library in 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) Copyright (c) 2005, 2006 ASCLEPIOS Project, INRIA Sophia-Antipolis (France)
All rights reserved. All rights reserved.
@ -298,6 +292,59 @@ examples/Surface_mesher/ImageIO.
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 LICENSE.QPL
=========== ===========

View File

@ -6,8 +6,17 @@
@DPATCH@ @DPATCH@
diff -urNad cgal~/install_cgal cgal/install_cgal diff -urNad cgal~/install_cgal cgal/install_cgal
--- cgal~/install_cgal 2007-03-25 13:01:29.000000000 +0200 --- cgal~/install_cgal 2007-04-01 23:17:22.000000000 +0200
+++ cgal/install_cgal 2007-03-25 13:01:53.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 @@ @@ -934,7 +934,7 @@
#### settings for sgi mipspro compiler on irix5 #### settings for sgi mipspro compiler on irix5
CGAL_SHARED_LIB_CXXFLAGS= 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_LIB_SONAME="-Wl,-soname,\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME).\$(SOVERSION)" CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME).\$(SOVERSION)"
CGAL_SHARED_LIBNAME_WITH_SOMAJOR="\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)" 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 # -mp is required for correct enough floating point operations
# necessary for interval arithmetic. # necessary for interval arithmetic.
ADDITIONAL_CXXFLAGS="-mp" ADDITIONAL_CXXFLAGS="-mp"
@ -87,9 +96,6 @@ diff -urNad cgal~/install_cgal cgal/install_cgal
+# RUNTIME_LINKER_FLAG='-Wl,-R' +# RUNTIME_LINKER_FLAG='-Wl,-R'
PRINT_STACKTRACE_PROGRAM="idb" PRINT_STACKTRACE_PROGRAM="idb"
;; ;;
*Linux*sunCC*)
@@ -1060,7 +1060,7 @@
;;
*Linux*pgCC*|*Linux*pgcpp*) *Linux*pgCC*|*Linux*pgcpp*)
#### settings for Portland Group Compiler on linux #### settings for Portland Group Compiler on linux
- RUNTIME_LINKER_FLAG='-Wl,-R' - RUNTIME_LINKER_FLAG='-Wl,-R'
@ -97,6 +103,24 @@ diff -urNad cgal~/install_cgal cgal/install_cgal
# PGCC has long name problems with "-g". # PGCC has long name problems with "-g".
DEBUG_OPT="" 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 @@ @@ -4307,7 +4307,7 @@
_buildlog_marker="log for $1 $2 shown" _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" log_print "vvvvvvvvvvvv build ${_buildlog_marker} below vvvvvvvvvvvv"
eval ${_cat} \"${COMPILE_LOGFILE}\" ${INSTALL_LOGFILE_REDIRECTION} eval ${_cat} \"${COMPILE_LOGFILE}\" ${INSTALL_LOGFILE_REDIRECTION}
diff -urNad cgal~/src/CGAL/common.mk cgal/src/CGAL/common.mk 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-04-01 23:17:22.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
@@ -104,17 +104,19 @@ @@ -104,17 +104,19 @@
clean_temp_files:: clean_temp_files::

View File

@ -19,7 +19,8 @@ build: build-stamp
build-stamp: patch-stamp build-stamp: patch-stamp
dh_testdir dh_testdir
dh_clean -k 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 \ --without-autofind --with-ZLIB --with-BOOST --with-BOOST_PROGRAM_OPTIONS \
--with-GMP --with-GMPXX --with-MPFR \ --with-GMP --with-GMPXX --with-MPFR \
--with-X11 --with-OPENGL --with-QT3MT \ --with-X11 --with-OPENGL --with-QT3MT \