update Debian packaging information for 4.1-1

.gitattributes

@@ -2158,6 +2158,7 @@ Maintenance/Third_party/GMP/gmp-4.2.4.patch.gz -text svneol=unset#application/gz
 Maintenance/Third_party/GMP/mpfr-2.3.2.patch.gz -text svneol=unset#application/gzip
 Maintenance/deb/ANNOUNCEMENT.beta -text
 Maintenance/deb/ANNOUNCEMENT.final -text
+Maintenance/deb/sid/debian/NEWS.Debian -text
 Maintenance/deb/sid/debian/README.Debian -text
 Maintenance/deb/sid/debian/README.source -text
 Maintenance/deb/sid/debian/changelog -text
@@ -2166,12 +2167,20 @@ Maintenance/deb/sid/debian/control -text
 Maintenance/deb/sid/debian/libcgal-demo.install -text
 Maintenance/deb/sid/debian/libcgal-dev.install -text
 Maintenance/deb/sid/debian/libcgal-ipelets.install -text
-Maintenance/deb/sid/debian/libcgal9.install -text
+Maintenance/deb/sid/debian/libcgal-ipelets.lintian-overrides -text
-Maintenance/deb/sid/debian/libcgal9.shlibs -text
+Maintenance/deb/sid/debian/libcgal-qt4-10.install -text
+Maintenance/deb/sid/debian/libcgal-qt4-10.lintian-overrides -text
+Maintenance/deb/sid/debian/libcgal-qt4-10.shlibs -text
+Maintenance/deb/sid/debian/libcgal-qt4-dev.install -text
+Maintenance/deb/sid/debian/libcgal10.install -text
+Maintenance/deb/sid/debian/libcgal10.lintian-overrides -text
+Maintenance/deb/sid/debian/libcgal10.shlibs -text
+Maintenance/deb/sid/debian/patches/do-not-link-example-with-qt4-support-library.patch -text
 Maintenance/deb/sid/debian/patches/series -text
 Maintenance/deb/sid/debian/rules -text
 Maintenance/deb/sid/debian/source/format -text
 Maintenance/deb/sid/debian/watch -text
+Maintenance/deb/squeeze/debian/NEWS.Debian -text
 Maintenance/deb/squeeze/debian/README.Debian -text
 Maintenance/deb/squeeze/debian/README.source -text
 Maintenance/deb/squeeze/debian/changelog -text
@@ -2180,12 +2189,20 @@ Maintenance/deb/squeeze/debian/control -text
 Maintenance/deb/squeeze/debian/libcgal-demo.install -text
 Maintenance/deb/squeeze/debian/libcgal-dev.install -text
 Maintenance/deb/squeeze/debian/libcgal-ipelets.install -text
-Maintenance/deb/squeeze/debian/libcgal9.install -text
+Maintenance/deb/squeeze/debian/libcgal-ipelets.lintian-overrides -text
-Maintenance/deb/squeeze/debian/libcgal9.shlibs -text
+Maintenance/deb/squeeze/debian/libcgal-qt4-10.install -text
+Maintenance/deb/squeeze/debian/libcgal-qt4-10.lintian-overrides -text
+Maintenance/deb/squeeze/debian/libcgal-qt4-10.shlibs -text
+Maintenance/deb/squeeze/debian/libcgal-qt4-dev.install -text
+Maintenance/deb/squeeze/debian/libcgal10.install -text
+Maintenance/deb/squeeze/debian/libcgal10.lintian-overrides -text
+Maintenance/deb/squeeze/debian/libcgal10.shlibs -text
+Maintenance/deb/squeeze/debian/patches/do-not-link-example-with-qt4-support-library.patch -text
 Maintenance/deb/squeeze/debian/patches/series -text
 Maintenance/deb/squeeze/debian/rules -text
 Maintenance/deb/squeeze/debian/source/format -text
 Maintenance/deb/squeeze/debian/watch -text
+Maintenance/deb/wheezy/debian/NEWS.Debian -text
 Maintenance/deb/wheezy/debian/README.Debian -text
 Maintenance/deb/wheezy/debian/README.source -text
 Maintenance/deb/wheezy/debian/changelog -text
@@ -2194,8 +2211,15 @@ Maintenance/deb/wheezy/debian/control -text
 Maintenance/deb/wheezy/debian/libcgal-demo.install -text
 Maintenance/deb/wheezy/debian/libcgal-dev.install -text
 Maintenance/deb/wheezy/debian/libcgal-ipelets.install -text
-Maintenance/deb/wheezy/debian/libcgal9.install -text
+Maintenance/deb/wheezy/debian/libcgal-ipelets.lintian-overrides -text
-Maintenance/deb/wheezy/debian/libcgal9.shlibs -text
+Maintenance/deb/wheezy/debian/libcgal-qt4-10.install -text
+Maintenance/deb/wheezy/debian/libcgal-qt4-10.lintian-overrides -text
+Maintenance/deb/wheezy/debian/libcgal-qt4-10.shlibs -text
+Maintenance/deb/wheezy/debian/libcgal-qt4-dev.install -text
+Maintenance/deb/wheezy/debian/libcgal10.install -text
+Maintenance/deb/wheezy/debian/libcgal10.lintian-overrides -text
+Maintenance/deb/wheezy/debian/libcgal10.shlibs -text
+Maintenance/deb/wheezy/debian/patches/do-not-link-example-with-qt4-support-library.patch -text
 Maintenance/deb/wheezy/debian/patches/series -text
 Maintenance/deb/wheezy/debian/rules -text
 Maintenance/deb/wheezy/debian/source/format -text

Maintenance/deb/ANNOUNCEMENT.beta

@@ -1,4 +1,4 @@
-Debian packages for CGAL 4.0 Beta 1 are now available for i386 and
+Debian packages for CGAL 4.1 Beta 1 are now available for i386 and
 amd64. To download the packages via apt-get you need to add
 
   deb http://www.joachim-reichel.de/debian/repository squeeze main
@@ -11,14 +11,13 @@ amd64. To download the packages via apt-get you need to add
   deb-src http://www.joachim-reichel.de/debian/repository sid main
 
 to /etc/apt/sources.list (you only need the pair of lines corresponding
-to the release you are using). The packages are called libcgal9,
+to the release you are using). The packages are called libcgal10,
-libcgal-dev, libcgal-demo, and libcgal-ipelets. (Note: the repository
+libcgal-dev, libcgal-demo, and libcgal-ipelets.
-component has changed from "non-free" to "main".)
 
 In case you want to download the packages manually, have a look at
 http://www.joachim-reichel.de/debian/repository/pool/main/c/cgal/
 
-For the final 4.0 release, similar packages will be uploaded to the
+For the final 4.1 release, similar packages will be uploaded to the
 official Debian repository and/or be available from the CGAL web site.
 
 See also http://www.cgal.org/FAQ.html#debian_packages .

Maintenance/deb/ANNOUNCEMENT.final

@@ -1,4 +1,4 @@
-Debian packages for CGAL 4.0 are now available as well. Simply add
+Debian packages for CGAL 4.1 are now available as well. Simply add
 
   deb ftp://ftp.mpi-sb.mpg.de/pub/outgoing/CGAL/debian squeeze main
   deb-src ftp://ftp.mpi-sb.mpg.de/pub/outgoing/CGAL/debian squeeze main
@@ -9,8 +9,8 @@ Debian packages for CGAL 4.0 are now available as well. Simply add
 to /etc/apt/sources list (you only need the pair of lines corresponding
 to the release you are using). For sid, packages should be available
 from the official Debian repository in a few days. The packages are called
-libcgal9, libcgal-dev, libcgal-demo, and libcgal-ipelets. (Note: the
+libcgal10, libcgal-dev, libcgal-qt4-10. libcgal-qt4-dev, libcgal-demo, and
-repository component has changed from "non-free" to "main".)
+libcgal-ipelets.
 
 In case you want to download the packages manually, have a look at
 ftp://ftp.mpi-sb.mpg.de/pub/outgoing/CGAL/debian/pool/main/c/cgal/

Maintenance/deb/README

@@ -14,30 +14,44 @@ backport for squeeze:
   * adjust version suffix from -X to -X~squeeze1
   * adjust suite from unstable to stable
 - debian/control
-  * adjust Standards-Version from 3.9.2 to 3.9.1
+  * adjust Standards-Version from 3.9.3 to 3.9.1
   * replace libgmp10-dev by libgmp3-dev (twice)
+  * adjust debhelper minimum version from 9 to 8
+- debian/compat
+  * adjust debhelper compatibility version from 9 to 8
 
 
 Tags
 ----
 
-svn copy $SVNROOT/branches/next/Maintenance/deb/sid/debian $SVNROOT/tags/debian/4.0-1 -m "Tag for revision 4.0-1"
+svn copy $SVNROOT/branches/next/Maintenance/deb/sid/debian $SVNROOT/tags/debian/4.1-1 -m "Tag for revision 4.1-1"
-svn copy $SVNROOT/branches/next/Maintenance/deb/wheezy/debian $SVNROOT/tags/debian/4.0-1~wheezy1 -m "Tag for revision 4.0-1~wheezy1"
+svn copy $SVNROOT/branches/next/Maintenance/deb/wheezy/debian $SVNROOT/tags/debian/4.1-1~wheezy1 -m "Tag for revision 4.1-1~wheezy1"
-svn copy $SVNROOT/branches/next/Maintenance/deb/squeeze/debian $SVNROOT/tags/debian/4.0-1~squeeze1 -m "Tag for revision 4.0-1~squeeze1"
+svn copy $SVNROOT/branches/next/Maintenance/deb/squeeze/debian $SVNROOT/tags/debian/4.1-1~squeeze1 -m "Tag for revision 4.1-1~squeeze1"
-
-or:
-svn copy $SVNROOT/branches/CGAL-4.0-branch/Maintenance/deb/sid/debian $SVNROOT/tags/debian/4.0-1 -m "Tag for revision 4.0-1"
-svn copy $SVNROOT/branches/CGAL-4.0-branch/Maintenance/deb/wheezy/debian $SVNROOT/tags/debian/4.0-1~wheezy1 -m "Tag for revision 4.0-1~wheezy1"
-svn copy $SVNROOT/branches/CGAL-4.0-branch/Maintenance/deb/squeeze/debian $SVNROOT/tags/debian/4.0-1~squeeze1 -m "Tag for revision 4.0-1~squeeze1"
 
 
 FTP server
 ----------
 
-wget http://www.joachim-reichel.de/tmp/cgal-4.0.tar.bz2
+# on my server
+cd /var/tmp
+tar xjf cgal.org-debian-repository.tar.bz2
+cd cgal.org-debian-repository
+mv pool/main/c/cgal/* archive
+reprepro -b . include wheezy|squeeze /path/to/*.changes
+cd ..
+tar cjf cgal.org-debian-repository.tar.bz2 cgal.org-debian-repository
+cd cgal.org-debian-repository
+rm -fr archive conf db
+tar cjf /srv/www/www.joachim-reichel.de/tmp/cgal.tar.bz2 .
+cd ..
+rm -fr cgal.org-debian-repository
+
+# on MPI machine
+cd /tmp
+wget http://www.joachim-reichel.de/tmp/cgal.tar.bz2
 su cgal
 cd /ftp/pub/outgoing/CGAL/debian
 mv pool/main/c/cgal/* archive
 rm -fr dists pool
-tar xjf /path/to/downloaded/tarball
+tar xjf /tmp/cgal.tar.bz2
 # There should be 3 subdirectories "archive", "dists", and "pool" now.

Maintenance/deb/sid/debian/NEWS.Debian

@@ -0,0 +1,9 @@
+cgal (4.2-1) unstable; urgency=low
+
+  The Qt4 support library libCGAL_Qt4.so.10.0.0 has been moved from the package
+  libcgal10 to the new package libcgal-qt4-10. Similarly, the corresponding
+  headers and the static library have been moved from the pacakge libcgal-dev
+  to the new package libcgal-qt4-dev. That is the packages libcgal10 and
+  libcgal-dev do not any longer depend on the Qt packages.
+
+ -- Joachim Reichel <reichel@debian.org>  Sun, 02 Sep 2012 12:31:08 +0200

Maintenance/deb/sid/debian/changelog

@@ -1,3 +1,50 @@
+cgal (4.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Rename binary package libcgal9 to libcgal10 to reflect SONAME change.
+  * Configure CGAL using -DCGAL_ENABLE_PRECONFIG=OFF since we do not want
+    that the accidential presence of optional libraries (for demos and
+    examples) influences the build of the library.
+  * Move the Qt4 support library and the corresponding headers into new
+    binary packages libcgal-qt4-10 and libcgal-qt4-dev (Closes: #683214).
+  * Add libboost-system-dev to Builds-Depends: of cgal.
+  * Move libmpfi-dev from Suggests: of cgal-demo to Build-Depends: of cgal.
+
+ -- Joachim Reichel <reichel@debian.org>  Wed, 24 Oct 2012 19:08:35 +0200
+
+cgal (4.0.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Remove gcc-4.7 patch (fixed upstream).
+
+ -- Joachim Reichel <reichel@debian.org>  Wed, 04 Jul 2012 19:45:28 +0200
+
+cgal (4.0-4) unstable; urgency=low
+
+  * Add Suggests: libeigen3-dev (>= 3.1.0~beta1-1), libmpfi-dev to
+    libcgal-demo.
+
+ -- Joachim Reichel <reichel@debian.org>  Tue, 12 Jun 2012 23:53:14 +0200
+
+cgal (4.0-3) unstable; urgency=low
+
+  * Change Build-Depends: debhelper (>= 8) to debhelper (>= 9), update
+    debian/compat to get the default build flags for hardening. Inject
+    CPPFLAGS into CFLAGS and CXXFLAGS, since CPPFLAGS is ignored by cmake.
+  * Add lintian override to silence incorrect warnings about
+    hardening-no-fortify-functions for some libraries (all libraries are
+    built with the same flags).
+
+ -- Joachim Reichel <reichel@debian.org>  Sun, 10 Jun 2012 15:36:27 +0200
+
+cgal (4.0-2) unstable; urgency=low
+
+  * Add patch gcc-4.7 to fix a syntax error in template code which is
+    not instantiated during the package build itself (Closes: #673554).
+  * Fix debian/watch.
+
+ -- Joachim Reichel <reichel@debian.org>  Sun, 20 May 2012 22:47:56 +0200
+
 cgal (4.0-1) unstable; urgency=low
 
   * New upstream release.
@@ -298,3 +345,4 @@ cgal (3.2-1) unstable; urgency=low
   * First upload to Debian archive. (Closes: #251885)
 
  -- Joachim Reichel <joachim.reichel@gmx.de>  Mon, 29 May 2006 20:24:27 +0200
+5~

Maintenance/deb/sid/debian/compat

@@ -1 +1 @@
-8
+9

Maintenance/deb/sid/debian/control

@@ -2,15 +2,16 @@ Source: cgal
 Priority: optional
 Maintainer: Joachim Reichel <reichel@debian.org>
 # "ipe" is only needed because it contains goodies.lua which is needed by FindIPE.cmake
-Build-Depends: debhelper (>= 8), dpkg-awk, cmake, libboost-dev,
+Build-Depends: debhelper (>= 9), dpkg-awk, cmake, zlib1g-dev, libboost-dev, 
- libboost-thread-dev, libboost-program-options-dev, libgmp10-dev, libmpfr-dev,
+ libboost-thread-dev, libboost-program-options-dev, libboost-system-dev,
- libqt4-dev, libqt4-opengl-dev, zlib1g-dev, libipe-dev (>= 7), ipe
+ libgmp10-dev, libmpfr-dev, libmpfi-dev, libqt4-dev, libqt4-opengl-dev, 
+ libipe-dev (>= 7), ipe
 Standards-Version: 3.9.3
 Section: libs
 Homepage: http://www.cgal.org/
 XS-Autobuild: yes
 
-Package: libcgal9
+Package: libcgal10
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: C++ library for computational geometry
@@ -29,29 +30,72 @@ Description: C++ library for computational geometry
     and multidimensional query structures.
   - the Support Library which offers interfaces to other packages, e.g., for
     visualisation, and I/O, and other support facilities.
+ .
+ This package contains the main library libCGAL.so as well as two support
+ libraries libCGAL_Core.so (from the CORE project) and libCGAL_ImageIO.so
+ (image I/O). The library libCGAL_Qt4.so used for visualization in demos
+ can be found in the package libcgal-qt4-10.
+
+Package: libcgal-qt4-10
+Architecture: any
+Depends: libcgal10 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: C++ library for computational geometry (support for Qt4)
+ 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.
+ .
+ This package contains libCGAL_Qt4.so used for visualization in demos.
 
 Package: libcgal-dev
 Section: libdevel
 Architecture: any
-Depends: libcgal9 (= ${binary:Version}), libboost-dev,
+Depends: libcgal10 (= ${binary:Version}), libboost-dev, libboost-thread-dev,
- libboost-thread-dev, libboost-program-options-dev, libgmp10-dev, libmpfr-dev,
+ libboost-program-options-dev, libgmp10-dev, libmpfr-dev, zlib1g-dev, ${misc:Depends}
- libqt4-dev, zlib1g-dev, ${misc:Depends}
 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.
+ This package contains the header files and static libraries for libCGAL.so,
+ libCGAL_Core.so, and libCGAL_ImageIO.so. The  header files and static
+ libraries for libCGAL_Qt4.so can be found in the package libcgal-qt4-dev.
+
+Package: libcgal-qt4-dev
+Section: libdevel
+Architecture: any
+Depends: libcgal10 (= ${binary:Version}), libcgal-qt4-10 (= ${binary:Version}),
+ libcgal-dev, libqt4-dev, ${misc:Depends}
+Description: C++ library for computational geometry (development files, support for Qt4)
+ 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 for
+ libCGAL_Qt.so.
 
 Package: libcgal-demo
 Section: devel
 Architecture: all
-Depends: libcgal-dev (>= ${binary:Version}), libcgal9 (>= ${binary:Version}),
+Depends: libcgal-dev (>= ${binary:Version}), libcgal10 (>= ${binary:Version}),
  ${misc:Depends}
+Recommends: libcgal-qt4-dev (>= ${binary:Version}), libcgal10-qt4 (>= ${binary:Version})
 Suggests: liblapack-dev, libatlas-base-dev | libatlas.so.3gf, gfortran,
  geomview, libqglviewer-qt4-dev, libipe-dev (>= 7), libglew1.5-dev | libglew-dev,
- libmagick++-dev, qt4-dev-tools, libqt4-opengl-dev
+ libmagick++-dev, qt4-dev-tools, libqt4-opengl-dev, libeigen3-dev (>= 3.1.0~beta1-1)
 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
@@ -63,7 +107,7 @@ Description: C++ library for computational geometry (demos)
 Package: libcgal-ipelets
 Section: graphics
 Architecture: any
-Depends: libcgal9 (>= ${binary:Version}), ipe (>= ${Ipe-Version}), ipe (<< ${Ipe-Version}+),
+Depends: libcgal10 (>= ${binary:Version}), ipe (>= ${Ipe-Version}), ipe (<< ${Ipe-Version}+),
  ${shlibs:Depends}, ${misc:Depends}
 Conflicts: libcgal5-ipelets
 Replaces: libcgal5-ipelets

Maintenance/deb/sid/debian/copyright

@@ -164,9 +164,9 @@ Copyright (from upstream file LICENSE)
    CGAL, are the following third-party libraries, available under their own
    licenses:
 
-   - CORE, in the directories "include/CGAL/CORE" and "src/CGAL_Core", is
+   - CORE, in the directories "include/CGAL/CORE" and "src/CGALCore", is
      licensed under the LGPL (see LICENSE.LGPL).
-   - ImageIO, in the directory "src/CGAL_ImageIO", is licensed under the LGPL
+   - ImageIO, in the directory "src/CGALimageIO", is licensed under the LGPL
      (see LICENSE.LGPL).
    - OpenNL, in the directory "include/CGAL/OpenNL", is licensed under the LGPL
     (see LICENSE.LGPL).
@@ -312,7 +312,7 @@ CORE
 ====
 
 The following copyright statement applies to the CORE library in
-src/CGAL_Core and include/CGAL/CORE.
+src/CGALCore and include/CGAL/CORE.
 
    Core Library Version 1.7, August 2004
    Copyright (c) 1995-2004 Exact Computation Project
@@ -336,7 +336,7 @@ ImageIO
 =======
 
 The following copyright statement applies to the ImageIO library in
-src/CGAL_ImageIO.
+src/CGALimageIO.
 
    Copyright (c) 2005, 2006 ASCLEPIOS Project, INRIA Sophia-Antipolis (France)
    All rights reserved.

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

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

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

@@ -1,7 +1,11 @@
 usr/bin/*
 usr/include/*
-usr/lib/lib*.a
+usr/lib/libCGAL.a
-usr/lib/lib*.so
+usr/lib/libCGAL_Core.a
+usr/lib/libCGAL_ImageIO.a
+usr/lib/libCGAL.so
+usr/lib/libCGAL_Core.so
+usr/lib/libCGAL_ImageIO.so
 usr/lib/CGAL/*
 usr/share/cmake-2.8/Modules/*
 usr/share/man/man1/cgal_create_cmake_script.1

Maintenance/deb/sid/debian/libcgal-ipelets.lintian-overrides

@@ -0,0 +1 @@
+libcgal-ipelets: hardening-no-fortify-functions usr/lib/ipe/*/ipelets/libCGAL_*.so

Maintenance/deb/sid/debian/libcgal-qt4-10.install

@@ -0,0 +1 @@
+usr/lib/libCGAL_Qt4.so.*       usr/lib

Maintenance/deb/sid/debian/libcgal-qt4-10.lintian-overrides

@@ -0,0 +1 @@
+libcgal-qt4-10: hardening-no-fortify-functions usr/lib/libCGAL_Qt4.so.*

Maintenance/deb/sid/debian/libcgal-qt4-10.shlibs

@@ -0,0 +1 @@
+libCGAL_Qt4 10 libcgal-qt4-10

Maintenance/deb/sid/debian/libcgal-qt4-dev.install

@@ -0,0 +1,5 @@
+# The next entry is disabled here because it overlaps with the corresponding
+# entry in libcgal-dev.install. The files are moved in debian/rules.
+# usr/include/CGAL/Qt
+usr/lib/libCGAL_Qt4.a
+usr/lib/libCGAL_Qt4.so

Maintenance/deb/sid/debian/libcgal10.install

@@ -0,0 +1,4 @@
+usr/lib/libCGAL.so.*           usr/lib
+usr/lib/libCGAL_Core.so.*      usr/lib
+usr/lib/libCGAL_ImageIO.so.*   usr/lib
+usr/share/doc/cgal/changelog   usr/share/doc/libcgal10

Maintenance/deb/sid/debian/libcgal10.lintian-overrides

@@ -0,0 +1 @@
+libcgal10: hardening-no-fortify-functions usr/lib/libCGAL.so.*

Maintenance/deb/sid/debian/libcgal10.shlibs

@@ -0,0 +1,3 @@
+libCGAL 10 libcgal10
+libCGAL_Core 10 libcgal10
+libCGAL_ImageIO 10 libcgal10

Maintenance/deb/sid/debian/libcgal9.install

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

Maintenance/deb/sid/debian/libcgal9.shlibs

@@ -1,4 +0,0 @@
-libCGAL 9 libcgal9
-libCGAL_Core 9 libcgal9
-libCGAL_ImageIO 9 libcgal9
-libCGAL_Qt4 9 libcgal9

Maintenance/deb/sid/debian/patches/do-not-link-example-with-qt4-support-library.patch

@@ -0,0 +1,12 @@
+Description: Avoid -lCGAL_Qt4 in linker command of Linear_cell_complex example
+--- cgal-4.1~beta1.orig/examples/Linear_cell_complex/CMakeLists.txt
++++ cgal-4.1~beta1/examples/Linear_cell_complex/CMakeLists.txt
+@@ -12,7 +12,7 @@ if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR
+   endif()
+ endif()
+ 
+-find_package(CGAL QUIET COMPONENTS Core Qt4)
++find_package(CGAL QUIET COMPONENTS Core)
+ 
+ # For Gprof.
+ # ADD_DEFINITIONS("-pg")

Maintenance/deb/sid/debian/patches/series

@@ -1 +1 @@
-# currently empty
+do-not-link-example-with-qt4-support-library.patch

Maintenance/deb/sid/debian/rules

@@ -2,6 +2,17 @@
 
 # export DH_VERBOSE=1
 
+# See http://wiki.debian.org/Hardening#Notes_for_packages_using_CMake
+CFLAGS   := $(CFLAGS) $(CPPFLAGS)
+CXXFLAGS := $(CXXFLAGS) $(CPPFLAGS)
+
+# The build system links all four libraries against all dependencies.
+LDFLAGS  += -Wl,--as-needed
+
+ifeq ($(DEB_BUILD_ARCH),alpha)
+  IEEE_FPU_OPTION = -mieee -mfp-rounding-mode=d
+endif
+
 %:
 	dh $@
 
@@ -9,18 +20,17 @@ override_dh_auto_configure:
 	mkdir -p static
 	cd static && QTDIR= cmake .. \
 	  -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \
-	  -DCMAKE_SKIP_RPATH=TRUE -DBUILD_SHARED_LIBS=FALSE \
+	  -DWITH_CGAL_Qt3=OFF -DWITH_demos=OFF -DWITH_examples=OFF \
-	  -DWITH_CGAL_Qt3=OFF -DWITH_demos=OFF -DWITH_examples=OFF
+	  -DCGAL_ENABLE_PRECONFIG=OFF -DBUILD_SHARED_LIBS=FALSE
 	mkdir -p shared
 	cd shared && QTDIR= cmake .. \
 	  -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \
-	  -DCMAKE_SKIP_RPATH=TRUE -DBUILD_SHARED_LIBS=TRUE \
+	  -DWITH_CGAL_Qt3=OFF -DWITH_demos=OFF -DWITH_examples=OFF \
-	  -DWITH_CGAL_Qt3=OFF -DWITH_demos=OFF -DWITH_examples=OFF
+	  -DCGAL_ENABLE_PRECONFIG=OFF -DBUILD_SHARED_LIBS=TRUE -DCMAKE_SKIP_RPATH=TRUE 
 	mkdir -p shared/demo/CGAL_ipelets
 	cd shared/demo/CGAL_ipelets && QTDIR= cmake ../../../demo/CGAL_ipelets \
 	  -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \
-	  -DCMAKE_SKIP_RPATH=TRUE -DBUILD_SHARED_LIBS=TRUE \
+	  -DCGAL_DIR=$(CURDIR)/shared   
-	  -DWITH_CGAL_Qt3=OFF -DCGAL_DIR=$(CURDIR)/shared   
 
 override_dh_auto_build:
 	$(MAKE) -C static
@@ -59,21 +69,28 @@ override_dh_install:
 
 	dh_install --sourcedir=debian/tmp --list-missing
 
-	mkdir -p debian/libcgal-demo/usr/share/doc
+	mkdir -p  debian/libcgal-qt4-dev/usr/include/CGAL
-	ln -s libcgal9 debian/libcgal-demo/usr/share/doc/libcgal-demo
+	mv debian/libcgal-dev/usr/include/CGAL/Qt debian/libcgal-qt4-dev/usr/include/CGAL
+
+	mkdir -p debian/libcgal-qt4-10/usr/share/doc
+	ln -s libcgal10 debian/libcgal-qt4-10/usr/share/doc/libcgal-qt4-10
 	mkdir -p debian/libcgal-dev/usr/share/doc
-	ln -s libcgal9 debian/libcgal-dev/usr/share/doc/libcgal-dev
+	ln -s libcgal10 debian/libcgal-dev/usr/share/doc/libcgal-dev
+	mkdir -p debian/libcgal-qt4-dev/usr/share/doc
+	ln -s libcgal10 debian/libcgal-qt4-dev/usr/share/doc/libcgal-qt4-dev
+	mkdir -p debian/libcgal-demo/usr/share/doc
+	ln -s libcgal10 debian/libcgal-demo/usr/share/doc/libcgal-demo
 	mkdir -p debian/libcgal-ipelets/usr/share/doc
-	ln -s libcgal9 debian/libcgal-ipelets/usr/share/doc/libcgal-ipelets
+	ln -s libcgal10 debian/libcgal-ipelets/usr/share/doc/libcgal-ipelets
 
 override_dh_installdocs:
-	dh_installdocs -plibcgal9 debian/copyright
+	dh_installdocs -plibcgal10 debian/copyright
 
 override_dh_installchangelogs:
-	dh_installchangelogs -plibcgal9
+	dh_installchangelogs -plibcgal10
 
-override_dh_shlibdeps:
+override_dh_shlibdeps: # TODO Is that really needed?
-	dh_shlibdeps -a -ldebian/libcgal9/usr/lib
+	dh_shlibdeps -a -ldebian/libcgal10/usr/lib
 
 override_dh_gencontrol:
 	dh_gencontrol -- -VIpe-Version=`dpkg-awk 'Package:^ipe$$' -- Version | grep Version | sed 's/Version: //;s/-[^-]*$$//'`

Maintenance/deb/sid/debian/tests/Makefile

@@ -5,10 +5,10 @@ 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)
+	g++ -c $< -o $@ -O2 -frounding-math $(IEEE_FPU_OPTION)
 
 rounding_modes2.o: rounding_modes2.cpp
-	g++ -c $< -o $@ -frounding-math $(IEEE_FPU_OPTION) -I../../include -I../../shared/include
+	g++ -c $< -o $@ -O2 -frounding-math $(IEEE_FPU_OPTION) -I../../include -I../../shared/include
 
 clean:
 	rm -f *.o rounding_modes1 rounding_modes2

Maintenance/deb/sid/debian/tests/rounding_modes1.cpp

@@ -16,17 +16,14 @@ std::string str (int mode)
 		}
 }
 
-// global variable to stop constant propagation
-double eps;
-
 int fetestround ()
 {
-	eps = std::numeric_limits<double>::denorm_min();
+	volatile double eps = std::numeric_limits<double>::denorm_min();
 
 	double x = -1.0;
 	double y =  1.0;
-	double x_plus_eps  = x + eps;
+	volatile double x_plus_eps  = x + eps;
-	double y_minus_eps = y - eps;
+	volatile double y_minus_eps = y - eps;
 
 	if ((x == x_plus_eps) && (y == y_minus_eps))
 		return FE_TONEAREST;

Maintenance/deb/sid/debian/watch

@@ -7,4 +7,4 @@
 version=3
 opts=uversionmangle=s/(\d+).([\d\.]+)/$2/ \
   https://gforge.inria.fr/frs/?group_id=52 \
-  https://gforge.inria.fr/frs/download.php/(\d+)/CGAL-([\d\.]+).tar.gz
+  /frs/download.php/(\d+)/CGAL-([\d\.]+).tar.gz

Maintenance/deb/squeeze/debian/NEWS.Debian

@@ -0,0 +1,9 @@
+cgal (4.2-1) unstable; urgency=low
+
+  The Qt4 support library libCGAL_Qt4.so.10.0.0 has been moved from the package
+  libcgal10 to the new package libcgal-qt4-10. Similarly, the corresponding
+  headers and the static library have been moved from the pacakge libcgal-dev
+  to the new package libcgal-qt4-dev. That is the packages libcgal10 and
+  libcgal-dev do not any longer depend on the Qt packages.
+
+ -- Joachim Reichel <reichel@debian.org>  Sun, 02 Sep 2012 12:31:08 +0200

Maintenance/deb/squeeze/debian/changelog

@@ -1,10 +1,58 @@
-cgal (4.0-1~squeeze1) stable; urgency=low
+cgal (4.1-1~squeeze1) stable; urgency=low
+
+  * New upstream release.
+  * Rename binary package libcgal9 to libcgal10 to reflect SONAME change.
+  * Configure CGAL using -DCGAL_ENABLE_PRECONFIG=OFF since we do not want
+    that the accidential presence of optional libraries (for demos and
+    examples) influences the build of the library.
+  * Move the Qt4 support library and the corresponding headers into new
+    binary packages libcgal-qt4-10 and libcgal-qt4-dev (Closes: #683214).
+  * Add libboost-system-dev to Builds-Depends: of cgal.
+  * Move libmpfi-dev from Suggests: of cgal-demo to Build-Depends: of cgal.
+
+ -- Joachim Reichel <reichel@debian.org>  Wed, 24 Oct 2012 19:08:35 +0200
+
+cgal (4.0.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Remove gcc-4.7 patch (fixed upstream).
+
+ -- Joachim Reichel <reichel@debian.org>  Wed, 04 Jul 2012 19:45:28 +0200
+
+cgal (4.0-4) unstable; urgency=low
+
+  * Add Suggests: libeigen3-dev (>= 3.1.0~beta1-1), libmpfi-dev to
+    libcgal-demo.
+
+ -- Joachim Reichel <reichel@debian.org>  Tue, 12 Jun 2012 23:53:14 +0200
+
+cgal (4.0-3) unstable; urgency=low
+
+  * Change Build-Depends: debhelper (>= 8) to debhelper (>= 9), update
+    debian/compat to get the default build flags for hardening. Inject
+    CPPFLAGS into CFLAGS and CXXFLAGS, since CPPFLAGS is ignored by cmake.
+  * Add lintian override to silence incorrect warnings about
+    hardening-no-fortify-functions for some libraries (all libraries are
+    built with the same flags).
+
+ -- Joachim Reichel <reichel@debian.org>  Sun, 10 Jun 2012 15:36:27 +0200
+
+cgal (4.0-2) unstable; urgency=low
+
+  * Add patch gcc-4.7 to fix a syntax error in template code which is
+    not instantiated during the package build itself (Closes: #673554).
+  * Fix debian/watch.
+
+ -- Joachim Reichel <reichel@debian.org>  Sun, 20 May 2012 22:47:56 +0200
+
+cgal (4.0-1) unstable; urgency=low
 
   * New upstream release.
   * Move from non-free to main due to upstream license change from QPL
     to GPL 3+ (and from LGPL 2.1 to LGPL 3+), updated debian/copyright
     accordingly.
   * Rename binary package libcgal8 to libcgal9 to reflect SONAME change.
+  * Update Standards-Version to 3.9.3 (no changes needed).
   * Remove fix-ipe-version-detection.dpatch and
     fix-qt-moc-parse-error.dpatch (fixed upstream).
   * Removed libmagick++9-dev from Suggests: of libcgal-demo, because
@@ -297,3 +345,4 @@ cgal (3.2-1) unstable; urgency=low
   * First upload to Debian archive. (Closes: #251885)
 
  -- Joachim Reichel <joachim.reichel@gmx.de>  Mon, 29 May 2006 20:24:27 +0200
+5~

Maintenance/deb/squeeze/debian/control

@@ -2,15 +2,16 @@ Source: cgal
 Priority: optional
 Maintainer: Joachim Reichel <reichel@debian.org>
 # "ipe" is only needed because it contains goodies.lua which is needed by FindIPE.cmake
-Build-Depends: debhelper (>= 8), dpkg-awk, cmake, libboost-dev,
+Build-Depends: debhelper (>= 8), dpkg-awk, cmake, zlib1g-dev, libboost-dev, 
- libboost-thread-dev, libboost-program-options-dev, libgmp3-dev, libmpfr-dev,
+ libboost-thread-dev, libboost-program-options-dev, libboost-system-dev,
- libqt4-dev, libqt4-opengl-dev, zlib1g-dev, libipe-dev (>= 7), ipe
+ libgmp3-dev, libmpfr-dev, libmpfi-dev, libqt4-dev, libqt4-opengl-dev, 
+ libipe-dev (>= 7), ipe
 Standards-Version: 3.9.1
 Section: libs
 Homepage: http://www.cgal.org/
 XS-Autobuild: yes
 
-Package: libcgal9
+Package: libcgal10
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: C++ library for computational geometry
@@ -29,29 +30,72 @@ Description: C++ library for computational geometry
     and multidimensional query structures.
   - the Support Library which offers interfaces to other packages, e.g., for
     visualisation, and I/O, and other support facilities.
+ .
+ This package contains the main library libCGAL.so as well as two support
+ libraries libCGAL_Core.so (from the CORE project) and libCGAL_ImageIO.so
+ (image I/O). The library libCGAL_Qt4.so used for visualization in demos
+ can be found in the package libcgal-qt4-10.
+
+Package: libcgal-qt4-10
+Architecture: any
+Depends: libcgal10 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: C++ library for computational geometry (support for Qt4)
+ 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.
+ .
+ This package contains libCGAL_Qt4.so used for visualization in demos.
 
 Package: libcgal-dev
 Section: libdevel
 Architecture: any
-Depends: libcgal9 (= ${binary:Version}), libboost-dev,
+Depends: libcgal10 (= ${binary:Version}), libboost-dev, libboost-thread-dev,
- libboost-thread-dev, libboost-program-options-dev, libgmp3-dev, libmpfr-dev,
+ libboost-program-options-dev, libgmp3-dev, libmpfr-dev, zlib1g-dev, ${misc:Depends}
- libqt4-dev, zlib1g-dev, ${misc:Depends}
 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.
+ This package contains the header files and static libraries for libCGAL.so,
+ libCGAL_Core.so, and libCGAL_ImageIO.so. The  header files and static
+ libraries for libCGAL_Qt4.so can be found in the package libcgal-qt4-dev.
+
+Package: libcgal-qt4-dev
+Section: libdevel
+Architecture: any
+Depends: libcgal10 (= ${binary:Version}), libcgal-qt4-10 (= ${binary:Version}),
+ libcgal-dev, libqt4-dev, ${misc:Depends}
+Description: C++ library for computational geometry (development files, support for Qt4)
+ 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 for
+ libCGAL_Qt.so.
 
 Package: libcgal-demo
 Section: devel
 Architecture: all
-Depends: libcgal-dev (>= ${binary:Version}), libcgal9 (>= ${binary:Version}),
+Depends: libcgal-dev (>= ${binary:Version}), libcgal10 (>= ${binary:Version}),
  ${misc:Depends}
+Recommends: libcgal-qt4-dev (>= ${binary:Version}), libcgal10-qt4 (>= ${binary:Version})
 Suggests: liblapack-dev, libatlas-base-dev | libatlas.so.3gf, gfortran,
  geomview, libqglviewer-qt4-dev, libipe-dev (>= 7), libglew1.5-dev | libglew-dev,
- libmagick++-dev, qt4-dev-tools, libqt4-opengl-dev
+ libmagick++-dev, qt4-dev-tools, libqt4-opengl-dev, libeigen3-dev (>= 3.1.0~beta1-1)
 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
@@ -63,7 +107,7 @@ Description: C++ library for computational geometry (demos)
 Package: libcgal-ipelets
 Section: graphics
 Architecture: any
-Depends: libcgal9 (>= ${binary:Version}), ipe (>= ${Ipe-Version}), ipe (<< ${Ipe-Version}+),
+Depends: libcgal10 (>= ${binary:Version}), ipe (>= ${Ipe-Version}), ipe (<< ${Ipe-Version}+),
  ${shlibs:Depends}, ${misc:Depends}
 Conflicts: libcgal5-ipelets
 Replaces: libcgal5-ipelets

Maintenance/deb/squeeze/debian/copyright

@@ -164,9 +164,9 @@ Copyright (from upstream file LICENSE)
    CGAL, are the following third-party libraries, available under their own
    licenses:
 
-   - CORE, in the directories "include/CGAL/CORE" and "src/CGAL_Core", is
+   - CORE, in the directories "include/CGAL/CORE" and "src/CGALCore", is
      licensed under the LGPL (see LICENSE.LGPL).
-   - ImageIO, in the directory "src/CGAL_ImageIO", is licensed under the LGPL
+   - ImageIO, in the directory "src/CGALimageIO", is licensed under the LGPL
      (see LICENSE.LGPL).
    - OpenNL, in the directory "include/CGAL/OpenNL", is licensed under the LGPL
     (see LICENSE.LGPL).
@@ -312,7 +312,7 @@ CORE
 ====
 
 The following copyright statement applies to the CORE library in
-src/CGAL_Core and include/CGAL/CORE.
+src/CGALCore and include/CGAL/CORE.
 
    Core Library Version 1.7, August 2004
    Copyright (c) 1995-2004 Exact Computation Project
@@ -336,7 +336,7 @@ ImageIO
 =======
 
 The following copyright statement applies to the ImageIO library in
-src/CGAL_ImageIO.
+src/CGALimageIO.
 
    Copyright (c) 2005, 2006 ASCLEPIOS Project, INRIA Sophia-Antipolis (France)
    All rights reserved.

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

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

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

@@ -1,7 +1,11 @@
 usr/bin/*
 usr/include/*
-usr/lib/lib*.a
+usr/lib/libCGAL.a
-usr/lib/lib*.so
+usr/lib/libCGAL_Core.a
+usr/lib/libCGAL_ImageIO.a
+usr/lib/libCGAL.so
+usr/lib/libCGAL_Core.so
+usr/lib/libCGAL_ImageIO.so
 usr/lib/CGAL/*
 usr/share/cmake-2.8/Modules/*
 usr/share/man/man1/cgal_create_cmake_script.1

Maintenance/deb/squeeze/debian/libcgal-ipelets.lintian-overrides

@@ -0,0 +1 @@
+libcgal-ipelets: hardening-no-fortify-functions usr/lib/ipe/*/ipelets/libCGAL_*.so

Maintenance/deb/squeeze/debian/libcgal-qt4-10.install

@@ -0,0 +1 @@
+usr/lib/libCGAL_Qt4.so.*       usr/lib

Maintenance/deb/squeeze/debian/libcgal-qt4-10.lintian-overrides

@@ -0,0 +1 @@
+libcgal-qt4-10: hardening-no-fortify-functions usr/lib/libCGAL_Qt4.so.*

Maintenance/deb/squeeze/debian/libcgal-qt4-10.shlibs

@@ -0,0 +1 @@
+libCGAL_Qt4 10 libcgal-qt4-10

Maintenance/deb/squeeze/debian/libcgal-qt4-dev.install

@@ -0,0 +1,5 @@
+# The next entry is disabled here because it overlaps with the corresponding
+# entry in libcgal-dev.install. The files are moved in debian/rules.
+# usr/include/CGAL/Qt
+usr/lib/libCGAL_Qt4.a
+usr/lib/libCGAL_Qt4.so

Maintenance/deb/squeeze/debian/libcgal10.install

@@ -0,0 +1,4 @@
+usr/lib/libCGAL.so.*           usr/lib
+usr/lib/libCGAL_Core.so.*      usr/lib
+usr/lib/libCGAL_ImageIO.so.*   usr/lib
+usr/share/doc/cgal/changelog   usr/share/doc/libcgal10

Maintenance/deb/squeeze/debian/libcgal10.lintian-overrides

@@ -0,0 +1 @@
+libcgal10: hardening-no-fortify-functions usr/lib/libCGAL.so.*

Maintenance/deb/squeeze/debian/libcgal10.shlibs

@@ -0,0 +1,3 @@
+libCGAL 10 libcgal10
+libCGAL_Core 10 libcgal10
+libCGAL_ImageIO 10 libcgal10

Maintenance/deb/squeeze/debian/libcgal9.install

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

Maintenance/deb/squeeze/debian/libcgal9.shlibs

@@ -1,4 +0,0 @@
-libCGAL 9 libcgal9
-libCGAL_Core 9 libcgal9
-libCGAL_ImageIO 9 libcgal9
-libCGAL_Qt4 9 libcgal9

Maintenance/deb/squeeze/debian/patches/do-not-link-example-with-qt4-support-library.patch

@@ -0,0 +1,12 @@
+Description: Avoid -lCGAL_Qt4 in linker command of Linear_cell_complex example
+--- cgal-4.1~beta1.orig/examples/Linear_cell_complex/CMakeLists.txt
++++ cgal-4.1~beta1/examples/Linear_cell_complex/CMakeLists.txt
+@@ -12,7 +12,7 @@ if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR
+   endif()
+ endif()
+ 
+-find_package(CGAL QUIET COMPONENTS Core Qt4)
++find_package(CGAL QUIET COMPONENTS Core)
+ 
+ # For Gprof.
+ # ADD_DEFINITIONS("-pg")

Maintenance/deb/squeeze/debian/patches/series

@@ -1 +1 @@
-# currently empty
+do-not-link-example-with-qt4-support-library.patch

Maintenance/deb/squeeze/debian/rules

@@ -2,6 +2,17 @@
 
 # export DH_VERBOSE=1
 
+# See http://wiki.debian.org/Hardening#Notes_for_packages_using_CMake
+CFLAGS   := $(CFLAGS) $(CPPFLAGS)
+CXXFLAGS := $(CXXFLAGS) $(CPPFLAGS)
+
+# The build system links all four libraries against all dependencies.
+LDFLAGS  += -Wl,--as-needed
+
+ifeq ($(DEB_BUILD_ARCH),alpha)
+  IEEE_FPU_OPTION = -mieee -mfp-rounding-mode=d
+endif
+
 %:
 	dh $@
 
@@ -9,18 +20,17 @@ override_dh_auto_configure:
 	mkdir -p static
 	cd static && QTDIR= cmake .. \
 	  -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \
-	  -DCMAKE_SKIP_RPATH=TRUE -DBUILD_SHARED_LIBS=FALSE \
+	  -DWITH_CGAL_Qt3=OFF -DWITH_demos=OFF -DWITH_examples=OFF \
-	  -DWITH_CGAL_Qt3=OFF -DWITH_demos=OFF -DWITH_examples=OFF
+	  -DCGAL_ENABLE_PRECONFIG=OFF -DBUILD_SHARED_LIBS=FALSE
 	mkdir -p shared
 	cd shared && QTDIR= cmake .. \
 	  -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \
-	  -DCMAKE_SKIP_RPATH=TRUE -DBUILD_SHARED_LIBS=TRUE \
+	  -DWITH_CGAL_Qt3=OFF -DWITH_demos=OFF -DWITH_examples=OFF \
-	  -DWITH_CGAL_Qt3=OFF -DWITH_demos=OFF -DWITH_examples=OFF
+	  -DCGAL_ENABLE_PRECONFIG=OFF -DBUILD_SHARED_LIBS=TRUE -DCMAKE_SKIP_RPATH=TRUE 
 	mkdir -p shared/demo/CGAL_ipelets
 	cd shared/demo/CGAL_ipelets && QTDIR= cmake ../../../demo/CGAL_ipelets \
 	  -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \
-	  -DCMAKE_SKIP_RPATH=TRUE -DBUILD_SHARED_LIBS=TRUE \
+	  -DCGAL_DIR=$(CURDIR)/shared   
-	  -DWITH_CGAL_Qt3=OFF -DCGAL_DIR=$(CURDIR)/shared   
 
 override_dh_auto_build:
 	$(MAKE) -C static
@@ -59,21 +69,28 @@ override_dh_install:
 
 	dh_install --sourcedir=debian/tmp --list-missing
 
-	mkdir -p debian/libcgal-demo/usr/share/doc
+	mkdir -p  debian/libcgal-qt4-dev/usr/include/CGAL
-	ln -s libcgal9 debian/libcgal-demo/usr/share/doc/libcgal-demo
+	mv debian/libcgal-dev/usr/include/CGAL/Qt debian/libcgal-qt4-dev/usr/include/CGAL
+
+	mkdir -p debian/libcgal-qt4-10/usr/share/doc
+	ln -s libcgal10 debian/libcgal-qt4-10/usr/share/doc/libcgal-qt4-10
 	mkdir -p debian/libcgal-dev/usr/share/doc
-	ln -s libcgal9 debian/libcgal-dev/usr/share/doc/libcgal-dev
+	ln -s libcgal10 debian/libcgal-dev/usr/share/doc/libcgal-dev
+	mkdir -p debian/libcgal-qt4-dev/usr/share/doc
+	ln -s libcgal10 debian/libcgal-qt4-dev/usr/share/doc/libcgal-qt4-dev
+	mkdir -p debian/libcgal-demo/usr/share/doc
+	ln -s libcgal10 debian/libcgal-demo/usr/share/doc/libcgal-demo
 	mkdir -p debian/libcgal-ipelets/usr/share/doc
-	ln -s libcgal9 debian/libcgal-ipelets/usr/share/doc/libcgal-ipelets
+	ln -s libcgal10 debian/libcgal-ipelets/usr/share/doc/libcgal-ipelets
 
 override_dh_installdocs:
-	dh_installdocs -plibcgal9 debian/copyright
+	dh_installdocs -plibcgal10 debian/copyright
 
 override_dh_installchangelogs:
-	dh_installchangelogs -plibcgal9
+	dh_installchangelogs -plibcgal10
 
-override_dh_shlibdeps:
+override_dh_shlibdeps: # TODO Is that really needed?
-	dh_shlibdeps -a -ldebian/libcgal9/usr/lib
+	dh_shlibdeps -a -ldebian/libcgal10/usr/lib
 
 override_dh_gencontrol:
 	dh_gencontrol -- -VIpe-Version=`dpkg-awk 'Package:^ipe$$' -- Version | grep Version | sed 's/Version: //;s/-[^-]*$$//'`

Maintenance/deb/squeeze/debian/tests/Makefile

@@ -5,10 +5,10 @@ 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)
+	g++ -c $< -o $@ -O2 -frounding-math $(IEEE_FPU_OPTION)
 
 rounding_modes2.o: rounding_modes2.cpp
-	g++ -c $< -o $@ -frounding-math $(IEEE_FPU_OPTION) -I../../include -I../../shared/include
+	g++ -c $< -o $@ -O2 -frounding-math $(IEEE_FPU_OPTION) -I../../include -I../../shared/include
 
 clean:
 	rm -f *.o rounding_modes1 rounding_modes2

Maintenance/deb/squeeze/debian/tests/rounding_modes1.cpp

@@ -16,17 +16,14 @@ std::string str (int mode)
 		}
 }
 
-// global variable to stop constant propagation
-double eps;
-
 int fetestround ()
 {
-	eps = std::numeric_limits<double>::denorm_min();
+	volatile double eps = std::numeric_limits<double>::denorm_min();
 
 	double x = -1.0;
 	double y =  1.0;
-	double x_plus_eps  = x + eps;
+	volatile double x_plus_eps  = x + eps;
-	double y_minus_eps = y - eps;
+	volatile double y_minus_eps = y - eps;
 
 	if ((x == x_plus_eps) && (y == y_minus_eps))
 		return FE_TONEAREST;

Maintenance/deb/squeeze/debian/watch

@@ -7,4 +7,4 @@
 version=3
 opts=uversionmangle=s/(\d+).([\d\.]+)/$2/ \
   https://gforge.inria.fr/frs/?group_id=52 \
-  https://gforge.inria.fr/frs/download.php/(\d+)/CGAL-([\d\.]+).tar.gz
+  /frs/download.php/(\d+)/CGAL-([\d\.]+).tar.gz

Maintenance/deb/wheezy/debian/NEWS.Debian

@@ -0,0 +1,9 @@
+cgal (4.2-1) unstable; urgency=low
+
+  The Qt4 support library libCGAL_Qt4.so.10.0.0 has been moved from the package
+  libcgal10 to the new package libcgal-qt4-10. Similarly, the corresponding
+  headers and the static library have been moved from the pacakge libcgal-dev
+  to the new package libcgal-qt4-dev. That is the packages libcgal10 and
+  libcgal-dev do not any longer depend on the Qt packages.
+
+ -- Joachim Reichel <reichel@debian.org>  Sun, 02 Sep 2012 12:31:08 +0200

Maintenance/deb/wheezy/debian/changelog

@@ -1,4 +1,51 @@
-cgal (4.0-1~wheezy1) testing; urgency=low
+cgal (4.1-1~wheezy1) testing; urgency=low
+
+  * New upstream release.
+  * Rename binary package libcgal9 to libcgal10 to reflect SONAME change.
+  * Configure CGAL using -DCGAL_ENABLE_PRECONFIG=OFF since we do not want
+    that the accidential presence of optional libraries (for demos and
+    examples) influences the build of the library.
+  * Move the Qt4 support library and the corresponding headers into new
+    binary packages libcgal-qt4-10 and libcgal-qt4-dev (Closes: #683214).
+  * Add libboost-system-dev to Builds-Depends: of cgal.
+  * Move libmpfi-dev from Suggests: of cgal-demo to Build-Depends: of cgal.
+
+ -- Joachim Reichel <reichel@debian.org>  Wed, 24 Oct 2012 19:08:35 +0200
+
+cgal (4.0.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Remove gcc-4.7 patch (fixed upstream).
+
+ -- Joachim Reichel <reichel@debian.org>  Wed, 04 Jul 2012 19:45:28 +0200
+
+cgal (4.0-4) unstable; urgency=low
+
+  * Add Suggests: libeigen3-dev (>= 3.1.0~beta1-1), libmpfi-dev to
+    libcgal-demo.
+
+ -- Joachim Reichel <reichel@debian.org>  Tue, 12 Jun 2012 23:53:14 +0200
+
+cgal (4.0-3) unstable; urgency=low
+
+  * Change Build-Depends: debhelper (>= 8) to debhelper (>= 9), update
+    debian/compat to get the default build flags for hardening. Inject
+    CPPFLAGS into CFLAGS and CXXFLAGS, since CPPFLAGS is ignored by cmake.
+  * Add lintian override to silence incorrect warnings about
+    hardening-no-fortify-functions for some libraries (all libraries are
+    built with the same flags).
+
+ -- Joachim Reichel <reichel@debian.org>  Sun, 10 Jun 2012 15:36:27 +0200
+
+cgal (4.0-2) unstable; urgency=low
+
+  * Add patch gcc-4.7 to fix a syntax error in template code which is
+    not instantiated during the package build itself (Closes: #673554).
+  * Fix debian/watch.
+
+ -- Joachim Reichel <reichel@debian.org>  Sun, 20 May 2012 22:47:56 +0200
+
+cgal (4.0-1) unstable; urgency=low
 
   * New upstream release.
   * Move from non-free to main due to upstream license change from QPL
@@ -298,3 +345,4 @@ cgal (3.2-1) unstable; urgency=low
   * First upload to Debian archive. (Closes: #251885)
 
  -- Joachim Reichel <joachim.reichel@gmx.de>  Mon, 29 May 2006 20:24:27 +0200
+5~

Maintenance/deb/wheezy/debian/compat

@@ -1 +1 @@
-8
+9

Maintenance/deb/wheezy/debian/control

@@ -2,15 +2,16 @@ Source: cgal
 Priority: optional
 Maintainer: Joachim Reichel <reichel@debian.org>
 # "ipe" is only needed because it contains goodies.lua which is needed by FindIPE.cmake
-Build-Depends: debhelper (>= 8), dpkg-awk, cmake, libboost-dev,
+Build-Depends: debhelper (>= 9), dpkg-awk, cmake, zlib1g-dev, libboost-dev, 
- libboost-thread-dev, libboost-program-options-dev, libgmp10-dev, libmpfr-dev,
+ libboost-thread-dev, libboost-program-options-dev, libboost-system-dev,
- libqt4-dev, libqt4-opengl-dev, zlib1g-dev, libipe-dev (>= 7), ipe
+ libgmp10-dev, libmpfr-dev, libmpfi-dev, libqt4-dev, libqt4-opengl-dev, 
+ libipe-dev (>= 7), ipe
 Standards-Version: 3.9.3
 Section: libs
 Homepage: http://www.cgal.org/
 XS-Autobuild: yes
 
-Package: libcgal9
+Package: libcgal10
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: C++ library for computational geometry
@@ -29,29 +30,72 @@ Description: C++ library for computational geometry
     and multidimensional query structures.
   - the Support Library which offers interfaces to other packages, e.g., for
     visualisation, and I/O, and other support facilities.
+ .
+ This package contains the main library libCGAL.so as well as two support
+ libraries libCGAL_Core.so (from the CORE project) and libCGAL_ImageIO.so
+ (image I/O). The library libCGAL_Qt4.so used for visualization in demos
+ can be found in the package libcgal-qt4-10.
+
+Package: libcgal-qt4-10
+Architecture: any
+Depends: libcgal10 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: C++ library for computational geometry (support for Qt4)
+ 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.
+ .
+ This package contains libCGAL_Qt4.so used for visualization in demos.
 
 Package: libcgal-dev
 Section: libdevel
 Architecture: any
-Depends: libcgal9 (= ${binary:Version}), libboost-dev,
+Depends: libcgal10 (= ${binary:Version}), libboost-dev, libboost-thread-dev,
- libboost-thread-dev, libboost-program-options-dev, libgmp10-dev, libmpfr-dev,
+ libboost-program-options-dev, libgmp10-dev, libmpfr-dev, zlib1g-dev, ${misc:Depends}
- libqt4-dev, zlib1g-dev, ${misc:Depends}
 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.
+ This package contains the header files and static libraries for libCGAL.so,
+ libCGAL_Core.so, and libCGAL_ImageIO.so. The  header files and static
+ libraries for libCGAL_Qt4.so can be found in the package libcgal-qt4-dev.
+
+Package: libcgal-qt4-dev
+Section: libdevel
+Architecture: any
+Depends: libcgal10 (= ${binary:Version}), libcgal-qt4-10 (= ${binary:Version}),
+ libcgal-dev, libqt4-dev, ${misc:Depends}
+Description: C++ library for computational geometry (development files, support for Qt4)
+ 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 for
+ libCGAL_Qt.so.
 
 Package: libcgal-demo
 Section: devel
 Architecture: all
-Depends: libcgal-dev (>= ${binary:Version}), libcgal9 (>= ${binary:Version}),
+Depends: libcgal-dev (>= ${binary:Version}), libcgal10 (>= ${binary:Version}),
  ${misc:Depends}
+Recommends: libcgal-qt4-dev (>= ${binary:Version}), libcgal10-qt4 (>= ${binary:Version})
 Suggests: liblapack-dev, libatlas-base-dev | libatlas.so.3gf, gfortran,
  geomview, libqglviewer-qt4-dev, libipe-dev (>= 7), libglew1.5-dev | libglew-dev,
- libmagick++-dev, qt4-dev-tools, libqt4-opengl-dev
+ libmagick++-dev, qt4-dev-tools, libqt4-opengl-dev, libeigen3-dev (>= 3.1.0~beta1-1)
 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
@@ -63,7 +107,7 @@ Description: C++ library for computational geometry (demos)
 Package: libcgal-ipelets
 Section: graphics
 Architecture: any
-Depends: libcgal9 (>= ${binary:Version}), ipe (>= ${Ipe-Version}), ipe (<< ${Ipe-Version}+),
+Depends: libcgal10 (>= ${binary:Version}), ipe (>= ${Ipe-Version}), ipe (<< ${Ipe-Version}+),
  ${shlibs:Depends}, ${misc:Depends}
 Conflicts: libcgal5-ipelets
 Replaces: libcgal5-ipelets

Maintenance/deb/wheezy/debian/copyright

@@ -164,9 +164,9 @@ Copyright (from upstream file LICENSE)
    CGAL, are the following third-party libraries, available under their own
    licenses:
 
-   - CORE, in the directories "include/CGAL/CORE" and "src/CGAL_Core", is
+   - CORE, in the directories "include/CGAL/CORE" and "src/CGALCore", is
      licensed under the LGPL (see LICENSE.LGPL).
-   - ImageIO, in the directory "src/CGAL_ImageIO", is licensed under the LGPL
+   - ImageIO, in the directory "src/CGALimageIO", is licensed under the LGPL
      (see LICENSE.LGPL).
    - OpenNL, in the directory "include/CGAL/OpenNL", is licensed under the LGPL
     (see LICENSE.LGPL).
@@ -312,7 +312,7 @@ CORE
 ====
 
 The following copyright statement applies to the CORE library in
-src/CGAL_Core and include/CGAL/CORE.
+src/CGALCore and include/CGAL/CORE.
 
    Core Library Version 1.7, August 2004
    Copyright (c) 1995-2004 Exact Computation Project
@@ -336,7 +336,7 @@ ImageIO
 =======
 
 The following copyright statement applies to the ImageIO library in
-src/CGAL_ImageIO.
+src/CGALimageIO.
 
    Copyright (c) 2005, 2006 ASCLEPIOS Project, INRIA Sophia-Antipolis (France)
    All rights reserved.

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

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

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

@@ -1,7 +1,11 @@
 usr/bin/*
 usr/include/*
-usr/lib/lib*.a
+usr/lib/libCGAL.a
-usr/lib/lib*.so
+usr/lib/libCGAL_Core.a
+usr/lib/libCGAL_ImageIO.a
+usr/lib/libCGAL.so
+usr/lib/libCGAL_Core.so
+usr/lib/libCGAL_ImageIO.so
 usr/lib/CGAL/*
 usr/share/cmake-2.8/Modules/*
 usr/share/man/man1/cgal_create_cmake_script.1

Maintenance/deb/wheezy/debian/libcgal-ipelets.lintian-overrides

@@ -0,0 +1 @@
+libcgal-ipelets: hardening-no-fortify-functions usr/lib/ipe/*/ipelets/libCGAL_*.so

Maintenance/deb/wheezy/debian/libcgal-qt4-10.install

@@ -0,0 +1 @@
+usr/lib/libCGAL_Qt4.so.*       usr/lib

Maintenance/deb/wheezy/debian/libcgal-qt4-10.lintian-overrides

@@ -0,0 +1 @@
+libcgal-qt4-10: hardening-no-fortify-functions usr/lib/libCGAL_Qt4.so.*

Maintenance/deb/wheezy/debian/libcgal-qt4-10.shlibs

@@ -0,0 +1 @@
+libCGAL_Qt4 10 libcgal-qt4-10

Maintenance/deb/wheezy/debian/libcgal-qt4-dev.install

@@ -0,0 +1,5 @@
+# The next entry is disabled here because it overlaps with the corresponding
+# entry in libcgal-dev.install. The files are moved in debian/rules.
+# usr/include/CGAL/Qt
+usr/lib/libCGAL_Qt4.a
+usr/lib/libCGAL_Qt4.so

Maintenance/deb/wheezy/debian/libcgal10.install

@@ -0,0 +1,4 @@
+usr/lib/libCGAL.so.*           usr/lib
+usr/lib/libCGAL_Core.so.*      usr/lib
+usr/lib/libCGAL_ImageIO.so.*   usr/lib
+usr/share/doc/cgal/changelog   usr/share/doc/libcgal10

Maintenance/deb/wheezy/debian/libcgal10.lintian-overrides

@@ -0,0 +1 @@
+libcgal10: hardening-no-fortify-functions usr/lib/libCGAL.so.*

Maintenance/deb/wheezy/debian/libcgal10.shlibs

@@ -0,0 +1,3 @@
+libCGAL 10 libcgal10
+libCGAL_Core 10 libcgal10
+libCGAL_ImageIO 10 libcgal10

Maintenance/deb/wheezy/debian/libcgal9.install

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

Maintenance/deb/wheezy/debian/libcgal9.shlibs

@@ -1,4 +0,0 @@
-libCGAL 9 libcgal9
-libCGAL_Core 9 libcgal9
-libCGAL_ImageIO 9 libcgal9
-libCGAL_Qt4 9 libcgal9

Maintenance/deb/wheezy/debian/patches/do-not-link-example-with-qt4-support-library.patch

@@ -0,0 +1,12 @@
+Description: Avoid -lCGAL_Qt4 in linker command of Linear_cell_complex example
+--- cgal-4.1~beta1.orig/examples/Linear_cell_complex/CMakeLists.txt
++++ cgal-4.1~beta1/examples/Linear_cell_complex/CMakeLists.txt
+@@ -12,7 +12,7 @@ if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR
+   endif()
+ endif()
+ 
+-find_package(CGAL QUIET COMPONENTS Core Qt4)
++find_package(CGAL QUIET COMPONENTS Core)
+ 
+ # For Gprof.
+ # ADD_DEFINITIONS("-pg")

Maintenance/deb/wheezy/debian/patches/series

@@ -1 +1 @@
-# currently empty
+do-not-link-example-with-qt4-support-library.patch

Maintenance/deb/wheezy/debian/rules

@@ -2,6 +2,17 @@
 
 # export DH_VERBOSE=1
 
+# See http://wiki.debian.org/Hardening#Notes_for_packages_using_CMake
+CFLAGS   := $(CFLAGS) $(CPPFLAGS)
+CXXFLAGS := $(CXXFLAGS) $(CPPFLAGS)
+
+# The build system links all four libraries against all dependencies.
+LDFLAGS  += -Wl,--as-needed
+
+ifeq ($(DEB_BUILD_ARCH),alpha)
+  IEEE_FPU_OPTION = -mieee -mfp-rounding-mode=d
+endif
+
 %:
 	dh $@
 
@@ -9,18 +20,17 @@ override_dh_auto_configure:
 	mkdir -p static
 	cd static && QTDIR= cmake .. \
 	  -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \
-	  -DCMAKE_SKIP_RPATH=TRUE -DBUILD_SHARED_LIBS=FALSE \
+	  -DWITH_CGAL_Qt3=OFF -DWITH_demos=OFF -DWITH_examples=OFF \
-	  -DWITH_CGAL_Qt3=OFF -DWITH_demos=OFF -DWITH_examples=OFF
+	  -DCGAL_ENABLE_PRECONFIG=OFF -DBUILD_SHARED_LIBS=FALSE
 	mkdir -p shared
 	cd shared && QTDIR= cmake .. \
 	  -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \
-	  -DCMAKE_SKIP_RPATH=TRUE -DBUILD_SHARED_LIBS=TRUE \
+	  -DWITH_CGAL_Qt3=OFF -DWITH_demos=OFF -DWITH_examples=OFF \
-	  -DWITH_CGAL_Qt3=OFF -DWITH_demos=OFF -DWITH_examples=OFF
+	  -DCGAL_ENABLE_PRECONFIG=OFF -DBUILD_SHARED_LIBS=TRUE -DCMAKE_SKIP_RPATH=TRUE 
 	mkdir -p shared/demo/CGAL_ipelets
 	cd shared/demo/CGAL_ipelets && QTDIR= cmake ../../../demo/CGAL_ipelets \
 	  -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \
-	  -DCMAKE_SKIP_RPATH=TRUE -DBUILD_SHARED_LIBS=TRUE \
+	  -DCGAL_DIR=$(CURDIR)/shared   
-	  -DWITH_CGAL_Qt3=OFF -DCGAL_DIR=$(CURDIR)/shared   
 
 override_dh_auto_build:
 	$(MAKE) -C static
@@ -59,21 +69,28 @@ override_dh_install:
 
 	dh_install --sourcedir=debian/tmp --list-missing
 
-	mkdir -p debian/libcgal-demo/usr/share/doc
+	mkdir -p  debian/libcgal-qt4-dev/usr/include/CGAL
-	ln -s libcgal9 debian/libcgal-demo/usr/share/doc/libcgal-demo
+	mv debian/libcgal-dev/usr/include/CGAL/Qt debian/libcgal-qt4-dev/usr/include/CGAL
+
+	mkdir -p debian/libcgal-qt4-10/usr/share/doc
+	ln -s libcgal10 debian/libcgal-qt4-10/usr/share/doc/libcgal-qt4-10
 	mkdir -p debian/libcgal-dev/usr/share/doc
-	ln -s libcgal9 debian/libcgal-dev/usr/share/doc/libcgal-dev
+	ln -s libcgal10 debian/libcgal-dev/usr/share/doc/libcgal-dev
+	mkdir -p debian/libcgal-qt4-dev/usr/share/doc
+	ln -s libcgal10 debian/libcgal-qt4-dev/usr/share/doc/libcgal-qt4-dev
+	mkdir -p debian/libcgal-demo/usr/share/doc
+	ln -s libcgal10 debian/libcgal-demo/usr/share/doc/libcgal-demo
 	mkdir -p debian/libcgal-ipelets/usr/share/doc
-	ln -s libcgal9 debian/libcgal-ipelets/usr/share/doc/libcgal-ipelets
+	ln -s libcgal10 debian/libcgal-ipelets/usr/share/doc/libcgal-ipelets
 
 override_dh_installdocs:
-	dh_installdocs -plibcgal9 debian/copyright
+	dh_installdocs -plibcgal10 debian/copyright
 
 override_dh_installchangelogs:
-	dh_installchangelogs -plibcgal9
+	dh_installchangelogs -plibcgal10
 
-override_dh_shlibdeps:
+override_dh_shlibdeps: # TODO Is that really needed?
-	dh_shlibdeps -a -ldebian/libcgal9/usr/lib
+	dh_shlibdeps -a -ldebian/libcgal10/usr/lib
 
 override_dh_gencontrol:
 	dh_gencontrol -- -VIpe-Version=`dpkg-awk 'Package:^ipe$$' -- Version | grep Version | sed 's/Version: //;s/-[^-]*$$//'`

Maintenance/deb/wheezy/debian/tests/Makefile

@@ -5,10 +5,10 @@ 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)
+	g++ -c $< -o $@ -O2 -frounding-math $(IEEE_FPU_OPTION)
 
 rounding_modes2.o: rounding_modes2.cpp
-	g++ -c $< -o $@ -frounding-math $(IEEE_FPU_OPTION) -I../../include -I../../shared/include
+	g++ -c $< -o $@ -O2 -frounding-math $(IEEE_FPU_OPTION) -I../../include -I../../shared/include
 
 clean:
 	rm -f *.o rounding_modes1 rounding_modes2

Maintenance/deb/wheezy/debian/tests/rounding_modes1.cpp

@@ -16,17 +16,14 @@ std::string str (int mode)
 		}
 }
 
-// global variable to stop constant propagation
-double eps;
-
 int fetestround ()
 {
-	eps = std::numeric_limits<double>::denorm_min();
+	volatile double eps = std::numeric_limits<double>::denorm_min();
 
 	double x = -1.0;
 	double y =  1.0;
-	double x_plus_eps  = x + eps;
+	volatile double x_plus_eps  = x + eps;
-	double y_minus_eps = y - eps;
+	volatile double y_minus_eps = y - eps;
 
 	if ((x == x_plus_eps) && (y == y_minus_eps))
 		return FE_TONEAREST;

Maintenance/deb/wheezy/debian/watch

@@ -7,4 +7,4 @@
 version=3
 opts=uversionmangle=s/(\d+).([\d\.]+)/$2/ \
   https://gforge.inria.fr/frs/?group_id=52 \
-  https://gforge.inria.fr/frs/download.php/(\d+)/CGAL-([\d\.]+).tar.gz
+  /frs/download.php/(\d+)/CGAL-([\d\.]+).tar.gz