copy changes for 3.3-2 from CGAL-3.3-branch

This commit is contained in:
Joachim Reichel 2007-07-17 17:45:15 +00:00
parent 5d9a4b2eb3
commit eecba52625
5 changed files with 30 additions and 6 deletions

View File

@ -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

View File

@ -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 <joachim.reichel@gmx.de> Mon, 16 Jul 2007 15:32:35 +0200
cgal (3.3-1) unstable; urgency=low
* New upstream release.

View File

@ -2,7 +2,7 @@ Source: cgal
Section: non-free/libs
Priority: optional
Maintainer: Joachim Reichel <joachim.reichel@gmx.de>
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

View File

@ -1,3 +1,4 @@
build-library.dpatch
cgal-create-makefile.dpatch
boost-library-name.dpatch
bugfix-fpu-rounding-mode-alpha.dpatch

View File

@ -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