--- cgal-3.4.orig/debian/compat +++ cgal-3.4/debian/compat @@ -0,0 +1 @@ +7 --- cgal-3.4.orig/debian/control +++ cgal-3.4/debian/control @@ -0,0 +1,62 @@ +Source: cgal +Section: non-free/libs +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Joachim Reichel +Build-Depends: debhelper (>= 7), dpatch, cmake, libboost1.37-dev, + libboost-thread1.37-dev, libboost-graph1.37-dev, libboost-program-options1.37-dev, + libgmp3-dev, libmpfr-dev, libqt3-mt-dev, libqt4-dev, libqt4-opengl-dev, + zlib1g-dev +Standards-Version: 3.8.1 +Homepage: http://www.cgal.org/ +XS-Autobuild: yes + +Package: libcgal3 +Section: non-free/libs +Architecture: any +Depends: ${shlibs:Depends} +Description: C++ library for computational geometry + CGAL (Computational Geometry Algorithms Library) makes the most important + of the solutions and methods developed in computational geometry available + to users in industry and academia in a C++ library. The goal is to provide + easy access to useful, reliable geometric algorithms. + . + The CGAL library contains: + - the Kernel with geometric primitives such as points, vectors, lines, + predicates for testing things such as relative positions of points, and + operations such as intersections and distance calculation. + - the Basic Library which is a collection of standard data structures and + geometric algorithms, such as convex hull in 2D/3D, (Delaunay) + triangulation in 2D/3D, planar map, polyhedron, smallest enclosing circle, + and multidimensional query structures. + - the Support Library which offers interfaces to other packages, e.g., for + visualisation, and I/O, and other support facilities. + +Package: libcgal-dev +Section: non-free/libdevel +Architecture: any +Depends: libcgal3 (= ${binary:Version}), libboost1.37-dev, + libboost-thread1.37-dev, libboost-graph1.37-dev, libboost-program-options1.37-dev, + libgmp3-dev, libmpfr-dev, libqt3-mt-dev, libqt4-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 + to users in industry and academia in a C++ library. The goal is to provide + easy access to useful, reliable geometric algorithms. + . + This package contains the header files and static libraries. + +Package: libcgal-demo +Section: non-free/devel +Architecture: all +Depends: libcgal-dev (>= ${binary:Version}), libcgal3 (>= ${binary:Version}) +Suggests: liblapack-dev [!alpha !arm !armeb !armel !hurd-i386 !m68k !powerpc], + libatlas-base-dev [!alpha !arm !armeb !armel !hurd-i386 !lpia !m68k !powerpc] | libatlas.so.3gf [!alpha !arm !armeb !armel !hurd-i386 !lpia !m68k !powerpc], + gfortran, geomview, libqglviewer-qt4-dev +Description: C++ library for computational geometry (demos) + CGAL (Computational Geometry Algorithms Library) makes the most important + of the solutions and methods developed in computational geometry available + to users in industry and academia in a C++ library. The goal is to provide + easy access to useful, reliable geometric algorithms. + . + This package contains the demos and examples. --- cgal-3.4.orig/debian/changelog +++ cgal-3.4/debian/changelog @@ -0,0 +1,151 @@ +cgal (3.4-4ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: (LP: #374440) + - debian/control, libcgal-demo: Do not suggest on libatlas-base-dev and + libatlas.so.3gf on lpia since they are not available. + * debian/control: depend on boost1.37 (boost1.38 not built on karmic) + + -- Savvas Radevic Sat, 02 May 2009 06:00:45 +0100 + +cgal (3.4-4) unstable; urgency=low + + * Add patch fix-demos-examples-configuration.dpatch. + * Add patch add-cmake-2.6.3-support.dpatch. + * Add patch fix-demo-polyheron-3.dpatch. + * Fix support for nocheck in DEB_BUILD_OPTIONS (was broken in 3.4-3). + + -- Joachim Reichel Fri, 01 May 2009 17:31:00 +0200 + +cgal (3.4-3) unstable; urgency=low + + * Update boost dependencies to 1.38. + * Remove watch file (new upstream location uses unpredictable paths). + * Update Standards-Version to 3.8.1 (add support for nocheck in + DEB_BUILD_OPTIONS). + * Change Suggests: dependency of libcgal-demo from libqglviewer-dev + to libqglviewer-qt4-dev (all demos using libQGLViewer use Qt4). + * Add workaround for #522659 to README.Debian. + + -- Joachim Reichel Sat, 18 Apr 2009 11:46:19 +0200 + +cgal (3.4-2) unstable; urgency=low + + * Add "-mieee -mfp-rounding-mode=d" to CGAL_CXX_FLAGS on alpha (got lost + during the transition to cmake). + + -- Joachim Reichel Sun, 15 Feb 2009 15:06:31 +0100 + +cgal (3.4-1) unstable; urgency=low + + * New upstream release. + * Adapt debian/rules to the new cmake-based build system. + * Downgrade LAPACK- and BLAS-related Build-Depends: to Suggests: for + libcgal-demo, since it is now possible to configure demos and examples + independently of the library. + + -- Joachim Reichel Thu, 22 Jan 2009 18:39:44 +0100 + +cgal (3.3.1-4ubuntu1) jaunty; urgency=low + + [ Savvas Radevic ] + * debian/control: Transition from boost (1.34) to boost1.35 (LP: #331911) + + [ Scott Kitterman ] + * Do not build-dep on libatlas-base-dev and libatlas.so.3gf on lpia since + they are not available + * Add rule to unset LAPACK for lpia + + -- Scott Kitterman Tue, 24 Feb 2009 15:23:01 -0500 + +cgal (3.3.1-4) unstable; urgency=low + + * Remove fortran-transition.dpatch, update build-library.dpatch: + Do not link with -lg2c in configuration tests (Closes: #475721). + * Update cgal_create_makefile.dpatch to remove bashisms (Closes: #486045). + * Update debian/tests/rounding_modes2.cpp to stop constant propagation. + * Update Standards-Version to 3.8.0 (explain in debian/copyright why package + is in non-free). + + -- Joachim Reichel Sun, 15 Jun 2008 22:11:14 +0200 + +cgal (3.3.1-3) unstable; urgency=low + + * Add patch fortran-transition.dpatch (Closes: #470359), thanks to Kumar + Appaiah for the patch. + * debian/rules: s/lapack3-dev/liblapack-dev/, + s/atlas3-base-dev/libatlas-base-dev/, s/libatlas-3.so/libatlas.so.3gf/ . + * Fix manpage w.r.t. makefile vs. cgal.mk (Closes: #466430). + * Add second test for FPU rounding modes. + + -- Joachim Reichel Wed, 19 Mar 2008 20:27:34 +0100 + +cgal (3.3.1-2) unstable; urgency=low + + * debian/control: Really really drop support for atlas and lapack on arm + and m68k, fix atlas and lapack support on other architectures. + * debian/control: Extend exclusions for arm to variants armeb and armel + (Closes: #460141). + * debian/control: Remove virtual dependency liblapack-3.so which is + provided by atlas3-base-dev (which does *not* provide + /usr/lib/liblapack.so, just /usr/lib/atlas/liblapack.so). + * debian/control: Replace virtual dependency libblas-3.so by + libatlas-3.so. + * Add patch qt-compatibility-headers.dpatch (Closes: #464251). + * debian/control: Add Homepage: field, adjust Description: accordingly. + * Update Standards-Version to 3.7.3 (no changes needed). + + -- Joachim Reichel Wed, 06 Feb 2008 18:37:52 +0100 + +cgal (3.3.1-1) unstable; urgency=low + + * New upstream release. + * Remove patch bugfix-fpu-rounding-mode-alpha.dpatch (included by + upstream). + * Fail build if FPU rounding mode test fails. + * Really drop support for atlas and lapack on arm and m68k. + * Fix cgal_create_makefile w.r.t. makefile vs. cgal.mk. + + -- Joachim Reichel Mon, 3 Sep 2007 18:57:36 +0200 + +cgal (3.3-2) unstable; urgency=low + + * Add patch bugfix-fpu-rounding-mode-alpha.dpatch (Closes: #431230). + * debian/control: Add versioned depends on libboost-program-options-dev, + drop build-dependency on libboost-graph-dev. + * Drop support for atlas on arm and m68k. + + -- Joachim Reichel Mon, 16 Jul 2007 15:32:35 +0200 + +cgal (3.3-1) unstable; urgency=low + + * New upstream release. + + -- Joachim Reichel Sun, 3 Jun 2007 09:36:36 +0200 + +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 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 Fri, 14 Jul 2006 21:20:16 +0200 + +cgal (3.2-1) unstable; urgency=low + + * New upstream release. + * First upload to Debian archive. (Closes: #251885) + + -- Joachim Reichel Mon, 29 May 2006 20:24:27 +0200 + --- cgal-3.4.orig/debian/libcgal-demo.install +++ cgal-3.4/debian/libcgal-demo.install @@ -0,0 +1,2 @@ +usr/share/doc/cgal/demo.tar.gz usr/share/doc/libcgal3 +usr/share/doc/cgal/examples.tar.gz usr/share/doc/libcgal3 --- cgal-3.4.orig/debian/libcgal3.install +++ cgal-3.4/debian/libcgal3.install @@ -0,0 +1,2 @@ +usr/lib/lib*.so.* usr/lib +usr/share/doc/cgal/changelog usr/share/doc/libcgal3 --- cgal-3.4.orig/debian/README.Debian +++ cgal-3.4/debian/README.Debian @@ -0,0 +1,48 @@ +README.Debian +------------- + +The homepage of CGAL (http://www.cgal.org/) offers more information about CGAL. +In particular, a mailing list and the documentation for the library (in PDF and +HTML) are available. The authors ask you to give some feedback about your usage +of CGAL in a short questionnaire (in the download section). + + +Documentation +------------- + +Note that the CGAL documentation cannot be packaged for Debian due to unclear +license conditions. The complete documentation in PDF and HTML is available at +http://www.cgal.org/. + + +Demos and examples +------------------ + +Tarballs with demos and examples can be found in /usr/share/doc/libcgal-demo. +Extract the tarballs somewhere and call "cmake ." to configure the +demos/examples. Call "make" to build them, either in the top-level directory +to build all demos/examples (which takes some time and needs quite some disk +space), or in the subdirectory of the desired demo/exmaple. The cmake option +-DCMAKE_VERBOSE_MAKEFILE=ON is useful to generate verbose makefiles that show +each executed command. + + +Demos using libQGLViewer +------------------------ + +Due to #522659 the build system does not detect libQGLViewer, even if +libqglviewer-qt4-dev is installed. You can work around this problem by +creating an include directory with the expected name "QGLViewer", e.g., + + mkdir -p /some/dir + ln -s /usr/include/qglviewer-qt4 /some/dir/QGLViewer + +Then pass the options + + -DQGLVIEWER_INCLUDE_DIR=/some/dir \ + -DQGLVIEWER_LIBRARY_RELEASE=/usr/lib/libqglviewer-qt4.so \ + -DQGLVIEWER_LIBRARY_DEBUG=/usr/lib/libqglviewer-qt4.so + +to cmake. + + -- Joachim Reichel Sat, 18 Apr 2009 11:46:19 +0200 --- cgal-3.4.orig/debian/libcgal3.shlibs +++ cgal-3.4/debian/libcgal3.shlibs @@ -0,0 +1,6 @@ +libCGAL 3 libcgal3 +libCGAL_Core 3 libcgal3 +libCGAL_ImageIO 3 libcgal3 +libCGAL_PDB 3 libcgal3 +libCGAL_Qt3 3 libcgal3 +libCGAL_Qt4 3 libcgal3 --- cgal-3.4.orig/debian/rules +++ cgal-3.4/debian/rules @@ -0,0 +1,128 @@ +#!/usr/bin/make -f + +.NOTPARALLEL: + +# Uncomment this to turn on verbose mode. +# export DH_VERBOSE=1 + +ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) + CXXFLAGS += -g +endif + +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +ifeq ($(DEB_BUILD_ARCH),alpha) +IEEE_FPU_OPTION = -mieee -mfp-rounding-mode=d +endif + +configure-stamp: patch-stamp + dh_testdir + mkdir -p static + cd static && cmake .. \ + -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=TRUE -DCGAL_CXX_FLAGS="-D_REENTRANT $(IEEE_FPU_OPTION)" \ + -DBUILD_SHARED_LIBS=FALSE -DWITH_demo=OFF -DWITH_examples=OFF + mkdir -p shared + cd shared && cmake .. \ + -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=TRUE -DCGAL_CXX_FLAGS="-D_REENTRANT $(IEEE_FPU_OPTION)" \ + -DBUILD_SHARED_LIBS=TRUE -DWITH_demo=OFF -DWITH_examples=OFF + touch configure-stamp + +build: build-stamp +build-stamp: configure-stamp + dh_testdir + dh_prep + $(MAKE) -C static + $(MAKE) -C shared +ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) + $(MAKE) -C debian/tests IEEE_FPU_OPTION="$(IEEE_FPU_OPTION)" rounding_modes1 + LD_LIBRARY_PATH=shared/lib debian/tests/rounding_modes1 + $(MAKE) -C debian/tests IEEE_FPU_OPTION="$(IEEE_FPU_OPTION)" rounding_modes2 + LD_LIBRARY_PATH=shared/lib debian/tests/rounding_modes2 +endif + touch build-stamp + +clean: clean-patched unpatch +clean-patched: patch + dh_testdir + dh_testroot + $(MAKE) -C debian/tests clean + rm -fr shared static + rm -f build-stamp configure-stamp + dh_clean + +install: build + dh_testdir + dh_testroot +# dh_prep + dh_installdirs + + $(MAKE) -C static DESTDIR=$(CURDIR)/debian/tmp install + $(MAKE) -C shared DESTDIR=$(CURDIR)/debian/tmp install + +# $(MAKE) -C shared DESTDIR=$(CURDIR)/debian/tmp install_FindCGAL + mkdir -p debian/tmp/usr/share/cmake-2.6/Modules + cp cmake/modules/FindCGAL.cmake debian/tmp/usr/share/cmake-2.6/Modules + + mv debian/tmp/usr/share/doc/CGAL-`cat VERSION` debian/tmp/usr/share/doc/cgal + mv debian/tmp/usr/share/doc/cgal/CHANGES debian/tmp/usr/share/doc/cgal/changelog + rm debian/tmp/usr/share/doc/cgal/LICENSE* + rm debian/tmp/usr/share/doc/cgal/AUTHORS + + tar cf - examples | gzip --best >debian/tmp/usr/share/doc/cgal/examples.tar.gz + tar cf - demo | gzip --best >debian/tmp/usr/share/doc/cgal/demo.tar.gz + + rm debian/tmp/usr/bin/cgal_make_macosx_app + + dh_install --sourcedir=debian/tmp --list-missing + + ln -s libcgal3 debian/libcgal-demo/usr/share/doc/libcgal-demo + mkdir -p debian/libcgal-dev/usr/share/doc + ln -s libcgal3 debian/libcgal-dev/usr/share/doc/libcgal-dev + + #install -d debian/libcgal3/DEBIAN + #install -m644 debian/libcgal3.shlibs debian/libcgal3/DEBIAN/shlibs + +binary-indep: build install + dh_testdir -i + dh_testroot -i + dh_link -i + dh_compress -i + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +binary-arch: build install + dh_testdir -a + dh_testroot -a + dh_installdocs -plibcgal3 debian/copyright + dh_installchangelogs -plibcgal3 + dh_installman -plibcgal-dev auxiliary/cgal_create_cmake_script.1 + dh_link -a + dh_strip -a + dh_compress -a + dh_fixperms -a + dh_makeshlibs -a + dh_installdeb -a + dh_shlibdeps -a -ldebian/libcgal3/usr/lib + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +binary: binary-indep binary-arch + +patch: patch-stamp +patch-stamp: + dpatch apply-all + touch patch-stamp + +unpatch: + dpatch deapply-all + rm -fr patch-stamp debian/patched + +.PHONY: build clean binary-indep binary-arch binary install configure patch unpatch --- cgal-3.4.orig/debian/copyright +++ cgal-3.4/debian/copyright @@ -0,0 +1,460 @@ +This package was debianized by Joachim Reichel on +Thu, 29 Apr 2004 18:43:18 +0200. + +It was downloaded from http://www.cgal.org/download/index.html. + +The Debian packaging is Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009 +Joachim Reichel and is licensed under the BSD license, +which can be found in /usr/share/common-licenses/BSD. + +The package is not in main, but in non-free since parts of it are licensed +under the QPL. This license is not DFSG-free, but it permits to autobuild +the package and to redistribute it in the non-free archive. + + + +Authors +======= + +Pierre Alliez +Matthias Bäsken +Eric Berberich +Olivier Billet +Jean-Daniel Boissonnat +Carine Bonetto +Hervé Brönnimann +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 +Bernd Gärtner +Geert-Jan Giezeman +Marc Glisse +Shlomo Golubev +Miguel Granados +Philippe Guigue +Ankit Gupta +Peter Hachenberger +Iddo Hanniel +Idit Haran +Sariel Har-Peled +Julien Hazebrouck +Michael Hemmer +Thomas Herrmann +Susan Hert +Shai Hirsch +Michael Hoffmann +Dominik Huelse +Marcel Janer +Athanasios Kakargias +Menelaos Karavelas +Lutz Kettner +Nico Kruithof +Eran Leiserowitz +Bruno Lévy +Sebastian Limbach +Kapelushnik Lior +Eugene Lipovetsky +Sébastien Loriot +Pedro Machado +Bastien Manuel +Abdelkrim Mebarki +Kurt Mehlhorn +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 +Jane Tournois +Constantinos Tsirogiannis +Radu Ursu +Carl Van Geem +Remco Veltkamp +Ron Wein +Wieger Wesselink +Camille Wormser +Mariette Yvinec +Afra Zomorodian +Baruch Zukerman +Tali Zvi + + + +Copyright holders +================= + +Utrecht University (The Netherlands) +ETH Zurich (Switzerland) +Freie Universitaet Berlin (Germany) +INRIA Sophia-Antipolis (France) +Martin-Luther-University Halle-Wittenberg (Germany) +Max-Planck-Institute Saarbruecken (Germany) +RISC Linz (Austria) +Tel-Aviv University (Israel) + +Stanford University (USA) +Foundation for Research and Technology-Hellas (Greece) + +GeometryFactory + +Fernando Luis Cacciola Carballal +Le-Jeng Shiue + + + +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", "src/CGALQt4" 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/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 + exact license text can be found in the file LICENSE.FREE_USE. + + More information on the CGAL license can be found at + http://www.cgal.org/license.html + + + +Copyright statements for LGPL'd files +===================================== + +The following copyright statement is taken from include/CGAL/config.h. The +year numbers and the set of copyright holders (see list above) varies from +file to file. + + Copyright (c) 1997-2004 Utrecht University (The Netherlands), + ETH Zurich (Switzerland), Freie Universitaet Berlin (Germany), + 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. + + + +Copyright statement for QPL'd files +=================================== + +The following copyright statement is taken from include/CGAL/Width_3.h. The +year numbers and the set of copyright holders (see list above) varies from +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. + + + +Copright statement for files under the FREE_USE license +======================================================= + + 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 + (Germany), Max-Planck-Institute Saarbruecken (Germany), RISC Linz (Austria), + and Tel-Aviv University (Israel). All rights reserved. + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + + +The following copyright statements apply to third-party libraries +distributed with CGAL: + + + +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. + + + +ImageIO +======= + +The following copyright statement applies to the ImageIO library in +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 +=========== + + THE Q PUBLIC LICENSE + version 1.0 + + Copyright (C) 1999-2000 Troll Tech AS, Norway. + Everyone is permitted to copy and + distribute this license document. + +The intent of this license is to establish freedom to share and change the +software regulated by this license under the open source model. + +This license applies to any software containing a notice placed by the +copyright holder saying that it may be distributed under the terms of +the Q Public License version 1.0. Such software is herein referred to as +the Software. This license covers modification and distribution of the +Software, use of third-party application programs based on the Software, +and development of free software which uses the Software. + + Granted Rights + +1. You are granted the non-exclusive rights set forth in this license + provided you agree to and comply with any and all conditions in this + license. Whole or partial distribution of the Software, or software + items that link with the Software, in any form signifies acceptance of + this license. + +2. You may copy and distribute the Software in unmodified form provided + that the entire package, including - but not restricted to - copyright, + trademark notices and disclaimers, as released by the initial developer + of the Software, is distributed. + +3. You may make modifications to the Software and distribute your + modifications, in a form that is separate from the Software, such as + patches. The following restrictions apply to modifications: + + a. Modifications must not alter or remove any copyright notices in + the Software. + + b. When modifications to the Software are released under this + license, a non-exclusive royalty-free right is granted to the + initial developer of the Software to distribute your modification + in future versions of the Software provided such versions remain + available under these terms in addition to any other license(s) of + the initial developer. + +4. You may distribute machine-executable forms of the Software or + machine-executable forms of modified versions of the Software, provided + that you meet these restrictions: + + a. You must include this license document in the distribution. + + b. You must ensure that all recipients of the machine-executable forms + are also able to receive the complete machine-readable source code + to the distributed Software, including all modifications, without + any charge beyond the costs of data transfer, and place prominent + notices in the distribution explaining this. + + c. You must ensure that all modifications included in the + machine-executable forms are available under the terms of this + license. + +5. You may use the original or modified versions of the Software to + compile, link and run application programs legally developed by you + or by others. + +6. You may develop application programs, reusable components and other + software items that link with the original or modified versions of the + Software. These items, when distributed, are subject to the following + requirements: + + a. You must ensure that all recipients of machine-executable forms of + these items are also able to receive and use the complete + machine-readable source code to the items without any charge + beyond the costs of data transfer. + + b. You must explicitly license all recipients of your items to use + and re-distribute original and modified versions of the items in + both machine-executable and source code forms. The recipients must + be able to do so without any charges whatsoever, and they must be + able to re-distribute to anyone they choose. + + + c. If the items are not available to the general public, and the + initial developer of the Software requests a copy of the items, + then you must supply one. + + Limitations of Liability + +In no event shall the initial developers or copyright holders be liable +for any damages whatsoever, including - but not restricted to - lost +revenue or profits or other direct, indirect, special, incidental or +consequential damages, even if they have been advised of the possibility +of such damages, except to the extent invariable law, if any, provides +otherwise. + + No Warranty + +The Software and this license document are provided AS IS with NO WARRANTY +OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS +FOR A PARTICULAR PURPOSE. + Choice of Law + +This license is governed by the Laws of Norway. Disputes shall be settled +by Oslo City Court. --- cgal-3.4.orig/debian/libcgal-dev.install +++ cgal-3.4/debian/libcgal-dev.install @@ -0,0 +1,6 @@ +usr/bin/* +usr/include/* +usr/lib/lib*.a +usr/lib/lib*.so +usr/lib/CGAL/* +usr/share/cmake-2.6/Modules/* --- cgal-3.4.orig/debian/tests/Makefile +++ cgal-3.4/debian/tests/Makefile @@ -0,0 +1,14 @@ +rounding_modes1: rounding_modes1.o + g++ $^ -o $@ + +rounding_modes2: rounding_modes2.o + g++ $^ -o $@ -lCGAL -L../../shared/lib + +rounding_modes1.o: rounding_modes1.cpp + g++ -c $< -o $@ -frounding-math $(IEEE_FPU_OPTION) + +rounding_modes2.o: rounding_modes2.cpp + g++ -c $< -o $@ -frounding-math $(IEEE_FPU_OPTION) -I../../include -I../../shared/include + +clean: + rm -f *.o rounding_modes1 rounding_modes2 --- cgal-3.4.orig/debian/tests/rounding_modes2.cpp +++ cgal-3.4/debian/tests/rounding_modes2.cpp @@ -0,0 +1,95 @@ +// This tests the rounding mode functions. + +#include +#include +#include + +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_STOP_CPROP(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; +} + +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; +} --- cgal-3.4.orig/debian/tests/rounding_modes1.cpp +++ cgal-3.4/debian/tests/rounding_modes1.cpp @@ -0,0 +1,69 @@ +#include +#include +#include + +int modes[4] = { FE_TOWARDZERO, FE_UPWARD, FE_DOWNWARD, FE_TONEAREST }; + +std::string str (int mode) +{ + switch (mode) + { + case FE_TOWARDZERO: return "FE_TOWARDZERO"; + case FE_UPWARD: return "FE_UPWARD"; + case FE_DOWNWARD: return "FE_DOWNWARD"; + case FE_TONEAREST: return "FE_TONEAREST"; + default: throw __LINE__; + } +} + +// global variable to stop constant propagation +double eps; + +int fetestround () +{ + eps = std::numeric_limits::denorm_min(); + + double x = -1.0; + double y = 1.0; + double x_plus_eps = x + eps; + double y_minus_eps = y - eps; + + if ((x == x_plus_eps) && (y == y_minus_eps)) + return FE_TONEAREST; + if (y == y_minus_eps) + return FE_UPWARD; + if (x == x_plus_eps) + return FE_DOWNWARD; + return FE_TOWARDZERO; +} + +int main (int argc, char* argv[]) +{ + int errors = 0; + + int mode_get = fegetround(); + std::cout << "fegetround() = " << str(mode_get) << " " << std::endl; + + for (int i=0; i<4; i++) + { + int mode_set = modes[i]; + fesetround (mode_set); + std::cout << "fesetround (" << str(mode_set) << ")" << std::endl; + + int mode_get = fegetround(); + std::cout << "fegetround() = " << str(mode_get) << " "; + bool ok_get = mode_get == mode_set; + if (!ok_get) + errors++; + std::cout << (ok_get ? "(ok)" : "(error)") << std::endl; + + int mode_test = fetestround(); + std::cout << "fetestround() = " << str(mode_test) << " "; + bool ok_test = mode_test == mode_set; + if (!ok_test) + errors++; + std::cout << (ok_test ? "(ok)" : "(error)") << std::endl; + } + + return errors; +} --- cgal-3.4.orig/debian/patches/fix-demo-polyheron-3.dpatch +++ cgal-3.4/debian/patches/fix-demo-polyheron-3.dpatch @@ -0,0 +1,94 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## fix-demo-polyheron-3.dpatch by Joachim Reichel +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix build problems if LAPACK is missing. +## DP: svn 47808, 47817 + +@DPATCH@ +diff -urNad cgal-3.4~/demo/Polyhedron/CMakeLists.txt cgal-3.4/demo/Polyhedron/CMakeLists.txt +--- cgal-3.4~/demo/Polyhedron/CMakeLists.txt 2008-12-19 14:49:52.000000000 +0100 ++++ cgal-3.4/demo/Polyhedron/CMakeLists.txt 2009-04-28 23:57:32.000000000 +0200 +@@ -41,13 +41,23 @@ + find_package(QGLViewer ) + endif(QT4_FOUND) + +-# Find TAUCS (optionnal) ++# Find LAPACK (optional), for curvatures estimation ++find_package(LAPACK) ++ ++# Find TAUCS (optionnal), for parametrization + find_package(TAUCS) + + if(CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND) + + include_directories ( ${QGLVIEWER_INCLUDE_DIR} ) + ++ if(LAPACK_FOUND) ++ include( ${LAPACK_USE_FILE} ) ++ add_definitions(-DCGAL_LAPACK_ENABLED) ++ else(LAPACK_FOUND) ++ message(STATUS "warning: LAPACK is not found. curvatures estimation will not be available.") ++ endif(LAPACK_FOUND) ++ + if(TAUCS_FOUND) + include( ${TAUCS_USE_FILE} ) + add_definitions(-DCGAL_TAUCS_ENABLED) +@@ -119,11 +129,6 @@ + + add_to_cached_list( CGAL_EXECUTABLE_TARGETS Polyhedron_3 ) + +- if(TAUCS_FOUND) +- # Link with TAUCS +- target_link_libraries(Polyhedron_3 ${TAUCS_LIBRARIES}) +- endif(TAUCS_FOUND) +- + else (CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND) + + set(POLYHEDRON_MISSING_DEPS "") +diff -urNad cgal-3.4~/demo/Polyhedron/MainWindow_curvature_estimation.cpp cgal-3.4/demo/Polyhedron/MainWindow_curvature_estimation.cpp +--- cgal-3.4~/demo/Polyhedron/MainWindow_curvature_estimation.cpp 2008-12-19 14:49:52.000000000 +0100 ++++ cgal-3.4/demo/Polyhedron/MainWindow_curvature_estimation.cpp 2009-04-28 23:57:32.000000000 +0200 +@@ -1,3 +1,5 @@ ++#ifdef CGAL_LAPACK_ENABLED ++ + #include + #include "MainWindow.h" + #include "Scene.h" +@@ -107,3 +109,15 @@ + QApplication::restoreOverrideCursor(); + } + } ++ ++#else // CGAL_LAPACK_ENABLED ++ ++#include ++void MainWindow::on_actionEstimateCurvature_triggered() ++{ ++ QMessageBox::warning(this, "Function not available", ++ "This function is not available." ++ " You need to configure LAPACK support."); ++} ++ ++#endif // CGAL_LAPACK_ENABLED +diff -urNad cgal-3.4~/demo/Polyhedron/MainWindow_parameterization.cpp cgal-3.4/demo/Polyhedron/MainWindow_parameterization.cpp +--- cgal-3.4~/demo/Polyhedron/MainWindow_parameterization.cpp 2008-12-19 14:49:52.000000000 +0100 ++++ cgal-3.4/demo/Polyhedron/MainWindow_parameterization.cpp 2009-04-28 23:57:32.000000000 +0200 +@@ -108,12 +108,17 @@ + + #else // #ifdef CGAL_TAUCS_ENABLED + ++#include + void MainWindow::on_actionMVC_triggered() + { ++ QMessageBox::warning(this, "Function not available", "This function is not available. " ++ "You need to configure TAUCS support."); + } + + void MainWindow::on_actionDCP_triggered() + { ++ QMessageBox::warning(this, "Function not available", "This function is not available. " ++ "You need to configure TAUCS support."); + } + + #endif // #ifdef CGAL_TAUCS_ENABLED --- cgal-3.4.orig/debian/patches/add-cmake-2.6.3-support.dpatch +++ cgal-3.4/debian/patches/add-cmake-2.6.3-support.dpatch @@ -0,0 +1,104 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## add-cmake-2.6.3-support.dpatch by Joachim Reichel +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Add support for cmake 2.6.3. +## DP: svn 48666, 48686, 48718, 48957 + +@DPATCH@ +diff -urNad cgal-3.4~/cmake/modules/CGALConfig_binary.cmake.in cgal-3.4/cmake/modules/CGALConfig_binary.cmake.in +--- cgal-3.4~/cmake/modules/CGALConfig_binary.cmake.in 2009-04-28 23:51:44.000000000 +0200 ++++ cgal-3.4/cmake/modules/CGALConfig_binary.cmake.in 2009-04-28 23:51:45.000000000 +0200 +@@ -122,3 +122,6 @@ + check_cgal_component("_${CGAL_COMPONENT}") + endforeach() + ++# Starting with cmake 2.6.3, CGAL_FIND_COMPONENTS is cleared out when find_package returns. ++# But we need it within UseCGAL.cmake, so we save it aside into another variable ++set( CGAL_REQUESTED_COMPONENTS ${CGAL_FIND_COMPONENTS} ) +diff -urNad cgal-3.4~/cmake/modules/CGALConfig_install.cmake.fhs.in cgal-3.4/cmake/modules/CGALConfig_install.cmake.fhs.in +--- cgal-3.4~/cmake/modules/CGALConfig_install.cmake.fhs.in 2009-04-28 23:51:44.000000000 +0200 ++++ cgal-3.4/cmake/modules/CGALConfig_install.cmake.fhs.in 2009-04-28 23:51:45.000000000 +0200 +@@ -124,3 +124,6 @@ + check_cgal_component("_${CGAL_COMPONENT}") + endforeach() + ++# Starting with cmake 2.6.3, CGAL_FIND_COMPONENTS is cleared out when find_package returns. ++# But we need it within UseCGAL.cmake, so we save it aside into another variable ++set( CGAL_REQUESTED_COMPONENTS ${CGAL_FIND_COMPONENTS} ) +diff -urNad cgal-3.4~/cmake/modules/CGALConfig_install.cmake.source.in cgal-3.4/cmake/modules/CGALConfig_install.cmake.source.in +--- cgal-3.4~/cmake/modules/CGALConfig_install.cmake.source.in 2009-04-28 23:51:44.000000000 +0200 ++++ cgal-3.4/cmake/modules/CGALConfig_install.cmake.source.in 2009-04-28 23:51:45.000000000 +0200 +@@ -122,3 +122,6 @@ + check_cgal_component("_${CGAL_COMPONENT}") + endforeach() + ++# Starting with cmake 2.6.3, CGAL_FIND_COMPONENTS is cleared out when find_package returns. ++# But we need it within UseCGAL.cmake, so we save it aside into another variable ++set( CGAL_REQUESTED_COMPONENTS ${CGAL_FIND_COMPONENTS} ) +diff -urNad cgal-3.4~/cmake/modules/CGAL_Common.cmake cgal-3.4/cmake/modules/CGAL_Common.cmake +--- cgal-3.4~/cmake/modules/CGAL_Common.cmake 2009-04-28 23:51:44.000000000 +0200 ++++ cgal-3.4/cmake/modules/CGAL_Common.cmake 2009-04-28 23:51:45.000000000 +0200 +@@ -17,9 +17,19 @@ + if (NOT CMAKE_ROOT) + message( FATAL_ERROR "CMAKE_ROOT enviroment variable not set. It should point to the directory where CMake is installed.") + endif() +- ++ ++ # CMAKE_VERSION was introduced in 2.6.3 so we use it to detect the fact ++ if ( CMAKE_VERSION ) ++ set( CMAKE_2_6_3_OR_ABOVE TRUE ) ++ else() ++ set( CMAKE_2_6_3_OR_ABOVE FALSE ) ++ endif() ++ + if ( COMMAND cmake_policy ) + cmake_policy( SET CMP0007 OLD ) ++ if ( CMAKE_2_6_3_OR_ABOVE ) ++ cmake_policy( SET CMP0011 OLD ) ++ endif() + endif() + + if ( "${BUILD_SHARED_LIBS}" STREQUAL "" ) +@@ -52,7 +62,4 @@ + + set(CMAKE_COLORMAKEFILE ON) + +- # Needed by the testsuite results parser +- set(CMAKE_VERBOSE_MAKEFILE ON) +- + endif() +\ No newline at end of file +diff -urNad cgal-3.4~/cmake/modules/FindQGLViewer.cmake cgal-3.4/cmake/modules/FindQGLViewer.cmake +--- cgal-3.4~/cmake/modules/FindQGLViewer.cmake 2009-04-28 23:51:44.000000000 +0200 ++++ cgal-3.4/cmake/modules/FindQGLViewer.cmake 2009-04-28 23:51:45.000000000 +0200 +@@ -15,7 +15,7 @@ + ) + + find_library(QGLVIEWER_LIBRARY_RELEASE +- NAMES QGLViewer QGLViewer2 ++ NAMES qglviewer QGLViewer QGLViewer2 + PATHS /usr/lib + /usr/local/lib + ENV QGLVIEWERROOT +@@ -25,7 +25,7 @@ + ) + + find_library(QGLVIEWER_LIBRARY_DEBUG +- NAMES dQGLViewer dQGLViewer2 ++ NAMES dqglviewer dQGLViewer dQGLViewer2 + PATHS /usr/lib + /usr/local/lib + ENV QGLVIEWERROOT +diff -urNad cgal-3.4~/cmake/modules/UseCGAL.cmake cgal-3.4/cmake/modules/UseCGAL.cmake +--- cgal-3.4~/cmake/modules/UseCGAL.cmake 2009-04-28 23:51:44.000000000 +0200 ++++ cgal-3.4/cmake/modules/UseCGAL.cmake 2009-04-28 23:51:54.000000000 +0200 +@@ -19,7 +19,7 @@ + + set( CGAL_LIBRARIES ) + +- foreach ( CGAL_COMPONENT ${CGAL_FIND_COMPONENTS} ) ++ foreach ( CGAL_COMPONENT ${CGAL_REQUESTED_COMPONENTS} ) + + add_to_list( CGAL_LIBRARIES ${CGAL_${CGAL_COMPONENT}_LIBRARY} ) + add_to_list( CGAL_3RD_PARTY_LIBRARIES ${CGAL_${CGAL_COMPONENT}_3RD_PARTY_LIBRARIES} ) --- cgal-3.4.orig/debian/patches/fix-demos-examples-configuration.dpatch +++ cgal-3.4/debian/patches/fix-demos-examples-configuration.dpatch @@ -0,0 +1,40 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## fix-demos-examples-configuration.dpatch by Joachim Reichel +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix problem with lost flags if all demos or examples get configured at once. +## DP: svn 48346 + +@DPATCH@ +diff -urNad cgal-3.4~/cmake/modules/CGAL_SetupFlags.cmake cgal-3.4/cmake/modules/CGAL_SetupFlags.cmake +--- cgal-3.4~/cmake/modules/CGAL_SetupFlags.cmake 2008-12-19 14:49:02.000000000 +0100 ++++ cgal-3.4/cmake/modules/CGAL_SetupFlags.cmake 2009-04-26 11:02:46.000000000 +0200 +@@ -1,3 +1,6 @@ ++if ( NOT CGAL_SETUP_FLAGS_INCLUDED ) ++ set( CGAL_SETUP_FLAGS_INCLUDED 1 ) ++ + # + # Set CGAL_DONT_OVERRIDE_CMAKE_FLAGS to TRUE if you need to prevent the CGAL configuration to + # override the flags used to build the libraries +@@ -75,3 +78,4 @@ + endif() + + ++endif() +diff -urNad cgal-3.4~/cmake/modules/UseCGAL.cmake cgal-3.4/cmake/modules/UseCGAL.cmake +--- cgal-3.4~/cmake/modules/UseCGAL.cmake 2008-12-19 14:49:02.000000000 +0100 ++++ cgal-3.4/cmake/modules/UseCGAL.cmake 2009-04-26 11:02:46.000000000 +0200 +@@ -14,11 +14,8 @@ + set(USE_CGAL_FILE_INCLUDED 1) + + include(CGAL_Common) +- +- if ( CGAL_IS_CURRENT_SCRIPT_TOP_LEVEL ) +- include(CGAL_SetupFlags) +- include(CGAL_GeneratorSpecificSettings) +- endif() ++ include(CGAL_SetupFlags) ++ include(CGAL_GeneratorSpecificSettings) + + set( CGAL_LIBRARIES ) + --- cgal-3.4.orig/debian/patches/fix-FindCGAL-cmake.dpatch +++ cgal-3.4/debian/patches/fix-FindCGAL-cmake.dpatch @@ -0,0 +1,39 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## fix-FindCGAL-cmake.dpatch by Joachim Reichel +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix location of cmake support files. + +@DPATCH@ +diff -urNad cgal-3.4~/cmake/modules/FindCGAL.cmake cgal-3.4/cmake/modules/FindCGAL.cmake +--- cgal-3.4~/cmake/modules/FindCGAL.cmake 2009-01-22 19:53:05.000000000 +0100 ++++ cgal-3.4/cmake/modules/FindCGAL.cmake 2009-01-22 19:53:46.000000000 +0100 +@@ -11,7 +11,7 @@ + # + + # Construct consitent error messages for use below. +-set(CGAL_DIR_DESCRIPTION "directory containing CGALConfig.cmake. This is either the binary directory where CGAL was configured or PREFIX/lib/CGAL-3.4 for an installation.") ++set(CGAL_DIR_DESCRIPTION "directory containing CGALConfig.cmake. This is either the binary directory where CGAL was configured or PREFIX/lib/CGAL for an installation.") + set(CGAL_DIR_MESSAGE "CGAL not found. Set the CGAL_DIR cmake variable or environment variable to the ${CGAL_DIR_DESCRIPTION}") + + set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true) +@@ -32,7 +32,7 @@ + + foreach(dir ${CGAL_DIR_SEARCH2}) + +- set(CGAL_DIR_SEARCH ${CGAL_DIR_SEARCH} ${dir}/../lib/CGAL-3.4 ) ++ set(CGAL_DIR_SEARCH ${CGAL_DIR_SEARCH} ${dir}/../lib/CGAL ) + + endforeach() + +@@ -49,8 +49,8 @@ + ${CGAL_DIR_SEARCH} + + # Look in standard UNIX install locations. +- /usr/local/lib/CGAL-3.4 +- /usr/lib/CGAL-3.4 ++ /usr/local/lib/CGAL ++ /usr/lib/CGAL + + # Read from the CMakeSetup registry entries. It is likely that + # CGAL will have been recently built. --- cgal-3.4.orig/debian/patches/00list +++ cgal-3.4/debian/patches/00list @@ -0,0 +1,4 @@ +fix-FindCGAL-cmake.dpatch +fix-demos-examples-configuration.dpatch +add-cmake-2.6.3-support.dpatch +fix-demo-polyheron-3.dpatch