diff -Nru cgal-4.0/debian/changelog cgal9-4.0/debian/changelog --- cgal-4.0/debian/changelog 2013-03-05 18:21:58.000000000 +0000 +++ cgal9-4.0/debian/changelog 2013-11-28 02:14:02.000000000 +0000 @@ -1,3 +1,13 @@ +cgal9 (4.0-5+rpi1) jessie-staging; urgency=low + + * Package created to support dolfin. + * Rename source package and dev package names to allow coexistance + with newer versions. + * Build with boost 1.49 explicitly. + * Disable demo and ipelets packages. + + -- Peter Michael Green Thu, 28 Nov 2013 01:37:43 +0000 + cgal (4.0-5) testing-proposed-updates; urgency=low * Extend patch gcc-4.7 to fix a syntax error in template code which is diff -Nru cgal-4.0/debian/control cgal9-4.0/debian/control --- cgal-4.0/debian/control 2012-06-12 21:53:02.000000000 +0000 +++ cgal9-4.0/debian/control 2013-11-28 02:13:47.000000000 +0000 @@ -1,9 +1,9 @@ -Source: cgal +Source: cgal9 Priority: optional Maintainer: Joachim Reichel # "ipe" is only needed because it contains goodies.lua which is needed by FindIPE.cmake -Build-Depends: debhelper (>= 9), dpkg-awk, cmake, libboost-dev, - libboost-thread-dev, libboost-program-options-dev, libgmp10-dev, libmpfr-dev, +Build-Depends: debhelper (>= 9), dpkg-awk, cmake, libboost1.49-dev, + libboost-thread1.49-dev, libboost-program-options1.49-dev, libgmp10-dev, libmpfr-dev, libqt4-dev, libqt4-opengl-dev, zlib1g-dev, libipe-dev (>= 7), ipe Standards-Version: 3.9.3 Section: libs @@ -30,11 +30,11 @@ - the Support Library which offers interfaces to other packages, e.g., for visualisation, and I/O, and other support facilities. -Package: libcgal-dev +Package: libcgal9-dev Section: libdevel Architecture: any -Depends: libcgal9 (= ${binary:Version}), libboost-dev, - libboost-thread-dev, libboost-program-options-dev, libgmp10-dev, libmpfr-dev, +Depends: libcgal9 (= ${binary:Version}), libboost1.49-dev, + libboost-thread1.49-dev, libboost-program-options1.49-dev, libgmp10-dev, libmpfr-dev, libqt4-dev, zlib1g-dev, ${misc:Depends} Description: C++ library for computational geometry (development files) CGAL (Computational Geometry Algorithms Library) makes the most important @@ -44,34 +44,34 @@ . This package contains the header files and static libraries. -Package: libcgal-demo -Section: devel -Architecture: all -Depends: libcgal-dev (>= ${binary:Version}), libcgal9 (>= ${binary:Version}), - ${misc:Depends} -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, libeigen3-dev (>= 3.1.0~beta1-1), - libmpfi-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. +#Package: libcgal-demo +#Section: devel +#Architecture: all +#Depends: libcgal-dev (>= ${binary:Version}), libcgal9 (>= ${binary:Version}), +# ${misc:Depends} +#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, libeigen3-dev (>= 3.1.0~beta1-1), +# libmpfi-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.# -Package: libcgal-ipelets -Section: graphics -Architecture: any -Depends: libcgal9 (>= ${binary:Version}), ipe (>= ${Ipe-Version}), ipe (<< ${Ipe-Version}+), - ${shlibs:Depends}, ${misc:Depends} -Conflicts: libcgal5-ipelets -Replaces: libcgal5-ipelets -Description: C++ library for computational geometry (ipelets) - 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 ipelets, i.e., plugins for ipe. +#Package: libcgal-ipelets +#Section: graphics +#Architecture: any +#Depends: libcgal9 (>= ${binary:Version}), ipe (>= ${Ipe-Version}), ipe (<< ${Ipe-Version}+), +# ${shlibs:Depends}, ${misc:Depends} +#Conflicts: libcgal5-ipelets +#Replaces: libcgal5-ipelets +#Description: C++ library for computational geometry (ipelets) +# 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 ipelets, i.e., plugins for ipe. diff -Nru cgal-4.0/debian/libcgal9-dev.install cgal9-4.0/debian/libcgal9-dev.install --- cgal-4.0/debian/libcgal9-dev.install 1970-01-01 00:00:00.000000000 +0000 +++ cgal9-4.0/debian/libcgal9-dev.install 2012-01-15 14:30:22.000000000 +0000 @@ -0,0 +1,7 @@ +usr/bin/* +usr/include/* +usr/lib/lib*.a +usr/lib/lib*.so +usr/lib/CGAL/* +usr/share/cmake-2.8/Modules/* +usr/share/man/man1/cgal_create_cmake_script.1 diff -Nru cgal-4.0/debian/libcgal-demo.substvars cgal9-4.0/debian/libcgal-demo.substvars --- cgal-4.0/debian/libcgal-demo.substvars 1970-01-01 00:00:00.000000000 +0000 +++ cgal9-4.0/debian/libcgal-demo.substvars 2013-11-28 02:10:18.000000000 +0000 @@ -0,0 +1 @@ +misc:Depends= diff -Nru cgal-4.0/debian/libcgal-dev.install cgal9-4.0/debian/libcgal-dev.install --- cgal-4.0/debian/libcgal-dev.install 2012-01-15 14:30:22.000000000 +0000 +++ cgal9-4.0/debian/libcgal-dev.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -usr/bin/* -usr/include/* -usr/lib/lib*.a -usr/lib/lib*.so -usr/lib/CGAL/* -usr/share/cmake-2.8/Modules/* -usr/share/man/man1/cgal_create_cmake_script.1 diff -Nru cgal-4.0/debian/libcgal-ipelets.substvars cgal9-4.0/debian/libcgal-ipelets.substvars --- cgal-4.0/debian/libcgal-ipelets.substvars 1970-01-01 00:00:00.000000000 +0000 +++ cgal9-4.0/debian/libcgal-ipelets.substvars 2013-11-28 02:10:18.000000000 +0000 @@ -0,0 +1,2 @@ +shlibs:Depends=libboost-thread1.49.0 (>= 1.49.0-1), libc6 (>= 2.4), libcgal9, libgcc1 (>= 1:4.4.0), libgmp10, libgmpxx4ldbl, libipe7.1.3, libmpfr4 (>= 3.1.1), libstdc++6 (>= 4.6) +misc:Depends= diff -Nru cgal-4.0/debian/rules cgal9-4.0/debian/rules --- cgal-4.0/debian/rules 2012-06-10 14:36:13.000000000 +0000 +++ cgal9-4.0/debian/rules 2013-11-28 09:21:01.000000000 +0000 @@ -67,12 +67,12 @@ dh_install --sourcedir=debian/tmp --list-missing - mkdir -p debian/libcgal-demo/usr/share/doc - ln -s libcgal9 debian/libcgal-demo/usr/share/doc/libcgal-demo - mkdir -p debian/libcgal-dev/usr/share/doc - ln -s libcgal9 debian/libcgal-dev/usr/share/doc/libcgal-dev - mkdir -p debian/libcgal-ipelets/usr/share/doc - ln -s libcgal9 debian/libcgal-ipelets/usr/share/doc/libcgal-ipelets + #mkdir -p debian/libcgal-demo/usr/share/doc + #ln -s libcgal9 debian/libcgal-demo/usr/share/doc/libcgal-demo + mkdir -p debian/libcgal9-dev/usr/share/doc + ln -s libcgal9 debian/libcgal9-dev/usr/share/doc/libcgal9-dev + #mkdir -p debian/libcgal-ipelets/usr/share/doc + #ln -s libcgal9 debian/libcgal-ipelets/usr/share/doc/libcgal-ipelets override_dh_installdocs: dh_installdocs -plibcgal9 debian/copyright