songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* updated for 3.2.1-2 (sid)

This commit is contained in:
Joachim Reichel 2007-01-27 14:44:13 +00:00
parent 6abebd42be
commit 19498ad49f
9 changed files with 51 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -812,6 +812,7 @@ Maintenance/deb/sid/debian/misc/adjust-demo-examples-makefiles.sed -text
Maintenance/deb/sid/debian/misc/cgal_create_makefile.1 -text Maintenance/deb/sid/debian/misc/cgal_create_makefile.1 -text
Maintenance/deb/sid/debian/patches/00list -text Maintenance/deb/sid/debian/patches/00list -text
Maintenance/deb/sid/debian/rules -text Maintenance/deb/sid/debian/rules -text
Maintenance/deb/sid/debian/watch -text
Maintenance/public_release/announcement/CGAL-3.2 -text Maintenance/public_release/announcement/CGAL-3.2 -text
Maintenance/release_building/BUGFIX_NUMBER -text Maintenance/release_building/BUGFIX_NUMBER -text
Maintenance/release_building/MAJOR_NUMBER -text Maintenance/release_building/MAJOR_NUMBER -text

5
Maintenance/deb/TODO
View File

@ -2,11 +2,8 @@ TODO
==== ====
next revision: next revision:
- check if linda override for #369977 is still needed [done]
- use binNMU-safe version dependencies: s/=/>=/ fuer all -> any [done]
- incorporate changes for non-free buildd network:
http://lists.debian.org/debian-devel-announce/2006/11/msg00012.html [done]
- update list of authors in debian/copyright - update list of authors in debian/copyright
CGAL 3.3: CGAL 3.3:
- SONAME issue - SONAME issue
- -D_REENTRANT

13
Maintenance/deb/sid/debian/changelog
View File

@ -1,11 +1,14 @@
cgal (3.2.99.210-1) unstable; urgency=low cgal (3.2.1-2) unstable; urgency=low
* New upstream release. * Fix FTBFS on hppa (and probably also on other architectures) related
* Make package binNMU-safe. to FPU rounding modes (Closes: #404464).
* Handle new shared library libCGALQt. * debian/control: Add tag XS-Autobuild.
* debian/copyright: Add note about autobuilding.
* debian/control: Make package binNMU-safe.
* Remove linda override for bug #369977 (no longer needed). * Remove linda override for bug #369977 (no longer needed).
* Add watch file.
-- Joachim Reichel <joachim.reichel@gmx.de> Sun, 14 Jan 2007 21:41:37 +0100 -- Joachim Reichel <joachim.reichel@gmx.de> Fri, 26 Jan 2007 19:16:36 +0100
cgal (3.2.1-1) unstable; urgency=low cgal (3.2.1-1) unstable; urgency=low

1
Maintenance/deb/sid/debian/libcgal1.shlibs
View File

@ -1,2 +1 @@
libCGAL 1 libcgal1 libCGAL 1 libcgal1
libCGALQt 1 libcgal1

1
Maintenance/deb/sid/debian/patches/00list
View File

@ -1,2 +1,3 @@
build-library.dpatch build-library.dpatch
cgal-create-makefile.dpatch cgal-create-makefile.dpatch
fix-ftbfs-fpu-rounding-modes.dpatch

49
Maintenance/deb/sid/debian/patches/build-library.dpatch
View File

@ -5,21 +5,21 @@
## DP: No description. ## DP: No description.
@DPATCH@ @DPATCH@
diff -urNad cgal-3.2.99.210~/install_cgal cgal-3.2.99.210/install_cgal diff -urNad cgal/install_cgal cgal/install_cgal
--- cgal-3.2.99.210~/install_cgal 2007-01-14 22:20:07.000000000 +0100 --- cgal/install_cgal 2006-04-17 22:33:03.000000000 +0200
+++ cgal-3.2.99.210/install_cgal 2007-01-14 22:20:08.000000000 +0100 +++ cgal/install_cgal 2006-04-17 22:33:06.000000000 +0200
@@ -4189,7 +4189,7 @@ @@ -4156,7 +4156,7 @@
MAKE_OPTION="${MAKE_OPTION} CXXFLAGS=\$(CGAL_SHARED_LIB_CXXFLAGS) shared_lib";; MAKE_OPTION="${MAKE_OPTION} CXXFLAGS=\$(CGAL_SHARED_LIB_CXXFLAGS) shared_lib";;
esac esac
- if make ${MAKE_OPTION} >"${COMPILE_LOGFILE}" 2>&1; then - if make ${MAKE_OPTION} >"${COMPILE_LOGFILE}" 2>&1; then
+ if make ${MAKE_OPTION} | tee "${COMPILE_LOGFILE}" 2>&1; then + if make ${MAKE_OPTION} | tee "${COMPILE_LOGFILE}" 2>&1; then
log_print "Compilation of $1 $2 ${_libname} succeeded." log_print "Compilation of $1 $2 ${_libname} succeeded."
log_print "vvvvvvvvvvvv build log for $1 $2 shown below vvvvvvvvvvvv" ${_printf} "%s\n" " done."
eval ${_cat} \"${COMPILE_LOGFILE}\" ${INSTALL_LOGFILE_REDIRECTION} ANY_LIB_COMPILED='y'
diff -urNad cgal-3.2.99.210~/src/CGAL/makefile cgal-3.2.99.210/src/CGAL/makefile diff -urNad cgal/src/CGAL/makefile cgal/src/CGAL/makefile
--- cgal-3.2.99.210~/src/CGAL/makefile 2007-01-14 22:20:07.000000000 +0100 --- cgal/src/CGAL/makefile 2006-04-17 22:33:03.000000000 +0200
+++ cgal-3.2.99.210/src/CGAL/makefile 2007-01-14 22:20:08.000000000 +0100 +++ cgal/src/CGAL/makefile 2006-04-17 22:33:28.000000000 +0200
@@ -74,11 +74,14 @@ @@ -74,11 +74,14 @@
# target entries # target entries
#---------------------------------------------------------------------# #---------------------------------------------------------------------#
@ -37,35 +37,18 @@ diff -urNad cgal-3.2.99.210~/src/CGAL/makefile cgal-3.2.99.210/src/CGAL/makefile
rm $(CGAL_OBJECTS) rm $(CGAL_OBJECTS)
static_lib: static_lib_no_install static_lib: static_lib_no_install
@@ -101,5 +104,5 @@ @@ -99,5 +102,5 @@
.SUFFIXES: .cpp $(SUFFIXES) #---------------------------------------------------------------------#
.cpp$(OBJ_EXT): .cpp$(OBJ_EXT):
- $(CGAL_CXX) $(CXXFLAGS) -c $< - $(CGAL_CXX) $(CXXFLAGS) -c $<
+ $(CGAL_CXX) $(CXXFLAGS) -D_REENTRANT -c $< + $(CGAL_CXX) $(CXXFLAGS) -D_REENTRANT -c $<
diff -urNad cgal-3.2.99.210~/src/CGALQt/makefile cgal-3.2.99.210/src/CGALQt/makefile diff -urNad cgal/src/CGALQt/makefile cgal/src/CGALQt/makefile
--- cgal-3.2.99.210~/src/CGALQt/makefile 2007-01-14 22:20:07.000000000 +0100 --- cgal/src/CGALQt/makefile 2006-04-17 21:00:25.000000000 +0200
+++ cgal-3.2.99.210/src/CGALQt/makefile 2007-01-14 22:21:31.000000000 +0100 +++ cgal/src/CGALQt/makefile 2006-04-17 22:33:53.000000000 +0200
@@ -64,11 +64,14 @@ @@ -125,5 +125,5 @@
# target entries $(CGAL_CXX) $(CXXFLAGS) -c Qt_widget_OpenGL.cpp
#---------------------------------------------------------------------#
+SOVERSION=1.0.1
+SOMAJOR=1
+
shared_lib: $(CGAL_OBJECTS)
- $(CGAL_SHARED_LIB_CREATE)$(CGAL_QT_SHARED_LIB) -Wl,-soname,$(CGAL_QT_SHARED_LIB) \
+ $(CGAL_SHARED_LIB_CREATE)$(CGAL_QT_SHARED_LIB).$(SOVERSION) -Wl,-soname,$(CGAL_QT_SHARED_LIB).${SOMAJOR} \
`ls *$(OBJ_EXT) | awk '{for (i=1; i<=NF;++i){printf "$(CGAL_OBJ_PREFIX)";print $$i}}'`\
$(CGAL_SHARED_LIB_LDFLAGS) $(OPENGL_LIBS)
- mv $(CGAL_QT_SHARED_LIB) '$(CGAL_LIB_DESTINATION)'
+ mv $(CGAL_QT_SHARED_LIB).$(SOVERSION) '$(CGAL_LIB_DESTINATION)'
rm $(CGAL_OBJECTS)
static_lib: lib
@@ -129,5 +132,5 @@
.SUFFIXES: .cpp $(SUFFIXES)
.cpp$(OBJ_EXT): .cpp$(OBJ_EXT):
- $(CGAL_CXX) $(CXXFLAGS) -c $< - $(CGAL_CXX) $(CXXFLAGS) -c $<

20
Maintenance/deb/sid/debian/patches/fix-ftbfs-fpu-rounding-modes.dpatch Executable file
View File

@ -0,0 +1,20 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## fix-ftbfs-fpu-rounding-modes.dpatch by Joachim Reichel <joachim.reichel@gmx.de>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.
@DPATCH@
diff -urNad cgal-3.2.1~/include/CGAL/FPU.h cgal-3.2.1/include/CGAL/FPU.h
--- cgal-3.2.1~/include/CGAL/FPU.h 2006-07-13 21:01:20.000000000 +0200
+++ cgal-3.2.1/include/CGAL/FPU.h 2007-01-26 19:21:35.000000000 +0100
@@ -34,8 +34,7 @@
extern "C" {
# include <fenv.h>
}
-#elif defined __linux__ && !defined __PGI && !defined __ia64__ \
- && !defined __x86_64__
+#elif defined __powerpc__
# include <fpu_control.h>
#elif defined __SUNPRO_CC || (defined __KCC && defined __sun)
# include <ieeefp.h>

6
Maintenance/deb/sid/debian/rules
View File

@ -33,7 +33,7 @@ clean: clean-patched unpatch
clean-patched: patch clean-patched: patch
dh_testdir dh_testdir
dh_testroot dh_testroot
rm -f build-stamp rm -f build-stamp configure-stamp
cd src/CGAL && OBJ_EXT=.o $(MAKE) clean cd src/CGAL && OBJ_EXT=.o $(MAKE) clean
cd src/CGALQt && OBJ_EXT=.o $(MAKE) clean cd src/CGALQt && OBJ_EXT=.o $(MAKE) clean
-rm -f compile.log install.{log,completed} -rm -f compile.log install.{log,completed}
@ -71,11 +71,9 @@ install: build
rm debian/tmp/usr/include/OpenNL/LICENSE.OPENNL rm debian/tmp/usr/include/OpenNL/LICENSE.OPENNL
cp -a lib/*/libCGAL.{so.$(SOVERSION),a} debian/tmp/usr/lib cp -a lib/*/libCGAL.{so.$(SOVERSION),a} debian/tmp/usr/lib
cp -a lib/*/libCGALQt.{so.$(SOVERSION),a} debian/tmp/usr/lib cp -a lib/*/libCGALQt.a debian/tmp/usr/lib
cd debian/tmp/usr/lib && ln -s libCGAL.so.$(SOVERSION) libCGAL.so.$(SOMAJOR) cd debian/tmp/usr/lib && ln -s libCGAL.so.$(SOVERSION) libCGAL.so.$(SOMAJOR)
cd debian/tmp/usr/lib && ln -s libCGAL.so.$(SOVERSION) libCGAL.so cd debian/tmp/usr/lib && ln -s libCGAL.so.$(SOVERSION) libCGAL.so
cd debian/tmp/usr/lib && ln -s libCGALQt.so.$(SOVERSION) libCGALQt.so.$(SOMAJOR)
cd debian/tmp/usr/lib && ln -s libCGALQt.so.$(SOVERSION) libCGALQt.so
cat make/makefile_* | sed -f debian/misc/adjust-default-makefile.sed >debian/tmp/usr/share/cgal/makefile cat make/makefile_* | sed -f debian/misc/adjust-default-makefile.sed >debian/tmp/usr/share/cgal/makefile

2
Maintenance/deb/sid/debian/watch Normal file
View File

@ -0,0 +1,2 @@
version=3
ftp://ftp.mpi-sb.mpg.de/pub/outgoing/CGAL/CGAL-([0-9\.]*).tar.gz 3.2.1