tags 470359 + patch
thanks

Hi!

Please find attached a patch to effect this transition. Please do
check the architectures though, I have just left them as they are, in
the depends.

One issue which I didn't bother checking too much is the Qt error
during the build:

...
  Testing for QT (Unix (multi-threaded)) ... compilation failed.

Compiler call:
--------------
g++ -Wall -frounding-math 
-I/tmp/buildd/cgal-3.3.1/include/CGAL/config/i686_Linux-2.6_g++-4.2.3   -c 
'./tmp_test.cpp'

Got the following error messages:
---------------------------------
./tmp_test.cpp:27:21: error: qglobal.h: No such file or directory
./tmp_test.cpp:28:23: error: qmemarray.h: No such file or directory
./tmp_test.cpp:30: error: expected constructor, destructor, or type conversion 
before '<' token
./tmp_test.cpp: In function 'int main()':
./tmp_test.cpp:44: error: 'QT_VERSION_STR' was not declared in this scope
./tmp_test.cpp:46: error: 'QArray' was not declared in this scope
./tmp_test.cpp:46: error: expected primary-expression before 'int'
./tmp_test.cpp:46: error: expected `;' before 'int'
./tmp_test.cpp:48: error: 'a' was not declared in this scope
--------------------------------------------------------

  Testing for QT (Unix (multi-threaded)) with include /usr/include/qt3 ... ok.
  Linking QT3MT without extra libdir ... ok.
  Saving current setup ... done.

However, this probably isn't a problem, since it finds the includes in
the next step. But do check on this.

HTH. Thanks.

Kumar
-- 
Kumar Appaiah,
458, Jamuna Hostel,
Indian Institute of Technology Madras,
Chennai - 600 036
diff -u cgal-3.3.1/debian/control cgal-3.3.1/debian/control
--- cgal-3.3.1/debian/control
+++ cgal-3.3.1/debian/control
@@ -2,7 +2,7 @@
 Section: non-free/libs
 Priority: optional
 Maintainer: Joachim Reichel <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5), dpatch, libboost-dev, libboost-program-options-dev (>= 1.34), libgmp3-dev, libmpfr-dev, libqt3-mt-dev, lapack3-dev [!arm !armeb !armel !m68k], atlas3-base-dev [!arm !armeb !armel !m68k] | libatlas-3.so [!arm !armeb !armel !m68k], zlib1g-dev
+Build-Depends: debhelper (>= 5), dpatch, libboost-dev, libboost-program-options-dev (>= 1.34), libgmp3-dev, libmpfr-dev, libqt3-mt-dev, liblapack-dev [!arm !armeb !armel !m68k], libatlas-base-dev [!arm !armeb !armel !m68k] | libatlas.so.3gf [!arm !armeb !armel !m68k], zlib1g-dev, gfortran
 Standards-Version: 3.7.3
 Homepage: http://www.cgal.org/
 XS-Autobuild: yes
@@ -33,8 +33,8 @@
 Architecture: any
 Depends: libcgal2 (= ${binary:Version}), libboost-dev, libboost-graph-dev,
  libboost-program-options-dev (>= 1.34), libgmp3-dev, libmpfr-dev, libqt3-mt-dev,
- lapack3-dev [!arm !armeb !armel !m68k],
- atlas3-base-dev [!arm !armeb !armel !m68k] | libatlas-3.so [!arm !armeb !armel !m68k],
+ liblapack-dev [!arm !armeb !armel !m68k],
+ libatlas-base-dev [!arm !armeb !armel !m68k] | libatlas.so.3gf [!arm !armeb !armel !m68k],
  zlib1g-dev
 Description: C++ library for computational geometry (development files)
  CGAL (Computational Geometry Algorithms Library) makes the most important
only in patch2:
unchanged:
--- cgal-3.3.1.orig/config/support/S53-BLASGCCATLAS
+++ cgal-3.3.1/config/support/S53-BLASGCCATLAS
@@ -7,7 +7,7 @@
 PROVIDES = ATLAS BLAS
 CXXFLAGS = -DCGAL_USE_F2C
 LDFLAGS =
-LIBS = lapack f77blas cblas atlas g2c
+LIBS = lapack f77blas cblas atlas gfortran
 REQUIRES =
 INCOMPATIBLE = DOLLAR_WINDOWS_COMPILER
 STDINCLDIRS =
only in patch2:
unchanged:
--- cgal-3.3.1.orig/config/support/S55b-REFBLASLINUXGCC
+++ cgal-3.3.1/config/support/S55b-REFBLASLINUXGCC
@@ -7,7 +7,7 @@
 PROVIDES = BLAS
 CXXFLAGS = -DCGAL_USE_F2C
 LDFLAGS =
-LIBS = blas_LINUX g2c
+LIBS = blas_LINUX gfortran
 REQUIRES =
 INCOMPATIBLE = DOLLAR_WINDOWS_COMPILER
 STDINCLDIRS =
only in patch2:
unchanged:
--- cgal-3.3.1.orig/config/support/S55a-REFBLASGCC
+++ cgal-3.3.1/config/support/S55a-REFBLASGCC
@@ -10,7 +10,7 @@
 PROVIDES = BLAS
 CXXFLAGS = -DCGAL_USE_F2C
 LDFLAGS =
-LIBS = blas g2c
+LIBS = blas gfortran
 REQUIRES =
 INCOMPATIBLE = DOLLAR_WINDOWS_COMPILER
 STDINCLDIRS =

Attachment: signature.asc
Description: Digital signature

Reply via email to