diff --git a/Maintenance/deb/README b/Maintenance/deb/README index 5abb438529e..618f1fc0579 100644 --- a/Maintenance/deb/README +++ b/Maintenance/deb/README @@ -5,6 +5,8 @@ backport for etch: - debian/changelog: * adjust version suffix from -X to -X~etch1 * adjust suite from unstable to stable +- debian/control: + * reverse versioned dependency on libboost-program-options-dev - debian/patches/boost-library-name.dpatch * remove - debian/patches/00list @@ -20,6 +22,7 @@ backport for sarge: * adjust lapack3-dev dependency to lapack-dev * adjust atlas3-base-dev dependency to atlas2-base-dev * replace binary: by Source- + * reverse versioned dependency on libboost-program-options-dev - debian/compat: * adjust debhelper compatibility level from 5 to 4 - debian/patches/boost-library-name.dpatch @@ -31,3 +34,7 @@ tagging: svn copy $SVNROOT/trunk/Maintenance/deb/sid/debian $SVNROOT/tags/debian/3.3-1 svn copy $SVNROOT/trunk/Maintenance/deb/etch/debian $SVNROOT/tags/debian/3.3-1~etch1 svn copy $SVNROOT/trunk/Maintenance/deb/sarge/debian $SVNROOT/tags/debian/3.3-0sarge1 +or: +svn copy $SVNROOT/branches/CGAL-3.3-branch/Maintenance/deb/sid/debian $SVNROOT/tags/debian/3.3-1 +svn copy $SVNROOT/branches/CGAL-3.3-branch/Maintenance/deb/etch/debian $SVNROOT/tags/debian/3.3-1~etch1 +svn copy $SVNROOT/branches/CGAL-3.3-branch/Maintenance/deb/sarge/debian $SVNROOT/tags/debian/3.3-1sarge1 diff --git a/Maintenance/deb/sid/debian/changelog b/Maintenance/deb/sid/debian/changelog index e60b75c2678..de13e134572 100644 --- a/Maintenance/deb/sid/debian/changelog +++ b/Maintenance/deb/sid/debian/changelog @@ -1,3 +1,12 @@ +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. diff --git a/Maintenance/deb/sid/debian/control b/Maintenance/deb/sid/debian/control index 3079ace1d67..ec076a9d102 100644 --- a/Maintenance/deb/sid/debian/control +++ b/Maintenance/deb/sid/debian/control @@ -2,7 +2,7 @@ Source: cgal Section: non-free/libs Priority: optional Maintainer: Joachim Reichel -Build-Depends: debhelper (>= 5), dpatch, libboost-dev, libboost-graph-dev, libboost-program-options-dev, libgmp3-dev, libmpfr-dev, libqt3-mt-dev, libqt3-compat-headers, lapack3-dev, atlas3-base-dev, zlib1g-dev +Build-Depends: debhelper (>= 5), dpatch, libboost-dev, libboost-program-options-dev (>= 1.34), libgmp3-dev, libmpfr-dev, libqt3-mt-dev, libqt3-compat-headers, lapack3-dev, atlas3-base-dev [!arm !m68k], zlib1g-dev Standards-Version: 3.7.2 XS-Autobuild: yes @@ -33,8 +33,8 @@ Package: libcgal-dev Section: non-free/libdevel Architecture: any Depends: libcgal2 (= ${binary:Version}), libboost-dev, libboost-graph-dev, - libboost-program-options-dev,libgmp3-dev, libmpfr-dev, libqt3-mt-dev, - libqt3-compat-headers, lapack3-dev, atlas3-base-dev, zlib1g-dev + libboost-program-options-dev (>= 1.34), libgmp3-dev, libmpfr-dev, libqt3-mt-dev, + libqt3-compat-headers, lapack3-dev, atlas3-base-dev [!arm !m68k], 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 diff --git a/Maintenance/deb/sid/debian/patches/00list b/Maintenance/deb/sid/debian/patches/00list index 46bec00d8ef..732c37e22df 100644 --- a/Maintenance/deb/sid/debian/patches/00list +++ b/Maintenance/deb/sid/debian/patches/00list @@ -1,3 +1,4 @@ build-library.dpatch cgal-create-makefile.dpatch boost-library-name.dpatch +bugfix-fpu-rounding-mode-alpha.dpatch diff --git a/Maintenance/deb/sid/debian/rules b/Maintenance/deb/sid/debian/rules index 8f319e322b0..e6d2858bd75 100755 --- a/Maintenance/deb/sid/debian/rules +++ b/Maintenance/deb/sid/debian/rules @@ -14,6 +14,13 @@ endif ifndef CXX CXX = g++ endif +ifeq ($(DEB_BUILD_ARCH), arm) + LAPACK_OPTION= +else ifeq ($(DEB_BUILD_ARCH), m68k) + LAPACK_OPTION= +else + LAPACK_OPTION=--with-LAPACK +endif build: build-stamp build-stamp: patch-stamp @@ -24,10 +31,10 @@ build-stamp: patch-stamp --without-autofind --with-ZLIB --with-BOOST --with-BOOST_PROGRAM_OPTIONS \ --with-GMP --with-GMPXX --with-MPFR \ --with-X11 --with-OPENGL --with-QT3MT \ - --with-BLASGCCATLAS --with-LAPACK + --with-BLASGCCATLAS $(LAPACK_OPTION) $(MAKE) -C $(CURDIR)/debian/tests rounding_modes -LD_LIBRARY_PATH=$(CURDIR)/debian/tmp/usr/lib $(CURDIR)/debian/tests/rounding_modes - -$(MAKE) -C $(CURDIR)/debian/tests clean + $(MAKE) -C $(CURDIR)/debian/tests clean touch build-stamp clean: clean-patched unpatch @@ -35,7 +42,7 @@ clean-patched: patch dh_testdir dh_testroot rm -f build-stamp configure-stamp - -for DIR in src/*; do $(MAKE) -C $$DIR clean; done + for DIR in src/*; do $(MAKE) -C $$DIR clean; done -rm -f compile.log install.log install.completed -rm -f config/support/tmp_test* -rm -f config/testfiles/a.out