mirror of https://github.com/CGAL/cgal
update Debian stuff for 3.4-1
This commit is contained in:
parent
f709e20493
commit
0f47edde35
|
|
@ -13,15 +13,22 @@ backport for etch:
|
||||||
- debian/compat
|
- debian/compat
|
||||||
* adjust from 7 to 5
|
* adjust from 7 to 5
|
||||||
- debian/control
|
- debian/control
|
||||||
* adjust debhelper versio from 7 to 5
|
* adjust debhelper version from >= 7 to >= 5
|
||||||
* adjust Standards-Version from 3.8.0 to 3.7.2
|
* adjust Standards-Version from 3.8.0 to 3.7.2
|
||||||
|
* remove libqt4-opengl-dev from Build-Depends
|
||||||
|
* remove Homepage field
|
||||||
|
- debian/rules
|
||||||
|
* replace dh_prep by dh_clean -k (twice)
|
||||||
|
* replace cmake-2.6 by cmake-2.4 (twice)
|
||||||
|
- debian/libcgal-dev.install
|
||||||
|
* replace cmake-2.6 by cmake-2.4
|
||||||
|
|
||||||
tagging:
|
tagging:
|
||||||
svn copy $SVNROOT/trunk/Maintenance/deb/sid/debian $SVNROOT/tags/debian/3.3.1-1
|
svn copy $SVNROOT/trunk/Maintenance/deb/sid/debian $SVNROOT/tags/debian/3.4.1-1
|
||||||
svn copy $SVNROOT/trunk/Maintenance/deb/etch/debian $SVNROOT/tags/debian/3.3.1-1~etch1
|
svn copy $SVNROOT/trunk/Maintenance/deb/lenny/debian $SVNROOT/tags/debian/3.4.1-1~lenny1
|
||||||
svn copy $SVNROOT/trunk/Maintenance/deb/sarge/debian $SVNROOT/tags/debian/3.3.1-0sarge1
|
svn copy $SVNROOT/trunk/Maintenance/deb/etch/debian $SVNROOT/tags/debian/3.4.1-1~etch1
|
||||||
|
|
||||||
or:
|
or:
|
||||||
svn copy $SVNROOT/branches/CGAL-3.3-branch/Maintenance/deb/sid/debian $SVNROOT/tags/debian/3.3.1-1
|
svn copy $SVNROOT/branches/CGAL-3.4-branch/Maintenance/deb/sid/debian $SVNROOT/tags/debian/3.4.1-1
|
||||||
svn copy $SVNROOT/branches/CGAL-3.3-branch/Maintenance/deb/etch/debian $SVNROOT/tags/debian/3.3.1-1~etch1
|
svn copy $SVNROOT/branches/CGAL-3.4-branch/Maintenance/deb/lenny/debian $SVNROOT/tags/debian/3.4.1-1~lenny1
|
||||||
svn copy $SVNROOT/branches/CGAL-3.3-branch/Maintenance/deb/sarge/debian $SVNROOT/tags/debian/3.3.1-0sarge1
|
svn copy $SVNROOT/branches/CGAL-3.4-branch/Maintenance/deb/etch/debian $SVNROOT/tags/debian/3.4.1-1~etch1
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,10 @@
|
||||||
cgal (3.4~beta1-1~etch1) stable; urgency=low
|
cgal (3.4-1~etch1) stable; urgency=low
|
||||||
|
|
||||||
|
* Backport to etch.
|
||||||
|
|
||||||
|
-- Joachim Reichel <reichel@debian.org> Thu, 22 Jan 2009 21:20:28 +0100
|
||||||
|
|
||||||
|
cgal (3.4-1) unstable; urgency=low
|
||||||
|
|
||||||
* New upstream release.
|
* New upstream release.
|
||||||
* Adapt debian/rules to the new cmake-based build system.
|
* Adapt debian/rules to the new cmake-based build system.
|
||||||
|
|
@ -6,7 +12,7 @@ cgal (3.4~beta1-1~etch1) stable; urgency=low
|
||||||
libcgal-demo, since it is now possible to configure demos and examples
|
libcgal-demo, since it is now possible to configure demos and examples
|
||||||
independently of the library.
|
independently of the library.
|
||||||
|
|
||||||
-- Joachim Reichel <reichel@debian.org> Sat, 20 Dec 2008 19:09:13 +0100
|
-- Joachim Reichel <reichel@debian.org> Thu, 22 Jan 2009 18:39:44 +0100
|
||||||
|
|
||||||
cgal (3.3.1-4) unstable; urgency=low
|
cgal (3.3.1-4) unstable; urgency=low
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,9 +4,9 @@ Priority: optional
|
||||||
Maintainer: Joachim Reichel <reichel@debian.org>
|
Maintainer: Joachim Reichel <reichel@debian.org>
|
||||||
Build-Depends: debhelper (>= 5), dpatch, cmake, libboost-dev,
|
Build-Depends: debhelper (>= 5), dpatch, cmake, libboost-dev,
|
||||||
libboost-thread-dev, libboost-graph-dev, libboost-program-options-dev,
|
libboost-thread-dev, libboost-graph-dev, libboost-program-options-dev,
|
||||||
libgmp3-dev, libmpfr-dev, libqt3-mt-dev, libqt4-dev, zlib1g-dev
|
libgmp3-dev, libmpfr-dev, libqt3-mt-dev, libqt4-dev,
|
||||||
|
zlib1g-dev
|
||||||
Standards-Version: 3.7.2
|
Standards-Version: 3.7.2
|
||||||
Homepage: http://www.cgal.org/
|
|
||||||
XS-Autobuild: yes
|
XS-Autobuild: yes
|
||||||
|
|
||||||
Package: libcgal3
|
Package: libcgal3
|
||||||
|
|
|
||||||
|
|
@ -2,5 +2,5 @@ usr/bin/*
|
||||||
usr/include/*
|
usr/include/*
|
||||||
usr/lib/lib*.a
|
usr/lib/lib*.a
|
||||||
usr/lib/lib*.so
|
usr/lib/lib*.so
|
||||||
usr/lib/CGAL-3.4/*
|
usr/lib/CGAL/*
|
||||||
usr/share/cmake-2.6/Modules/*
|
usr/share/cmake-2.4/Modules/*
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
# currently empty
|
fix-FindCGAL-cmake.dpatch
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,39 @@
|
||||||
|
#! /bin/sh /usr/share/dpatch/dpatch-run
|
||||||
|
## fix-FindCGAL-cmake.dpatch by Joachim Reichel <reichel@debian.org>
|
||||||
|
##
|
||||||
|
## All lines beginning with `## DP:' are a description of the patch.
|
||||||
|
## DP: Fix location of cmake support files.
|
||||||
|
|
||||||
|
@DPATCH@
|
||||||
|
diff -urNad cgal-3.4~/cmake/modules/FindCGAL.cmake cgal-3.4/cmake/modules/FindCGAL.cmake
|
||||||
|
--- cgal-3.4~/cmake/modules/FindCGAL.cmake 2009-01-22 19:53:05.000000000 +0100
|
||||||
|
+++ cgal-3.4/cmake/modules/FindCGAL.cmake 2009-01-22 19:53:46.000000000 +0100
|
||||||
|
@@ -11,7 +11,7 @@
|
||||||
|
#
|
||||||
|
|
||||||
|
# Construct consitent error messages for use below.
|
||||||
|
-set(CGAL_DIR_DESCRIPTION "directory containing CGALConfig.cmake. This is either the binary directory where CGAL was configured or PREFIX/lib/CGAL-3.4 for an installation.")
|
||||||
|
+set(CGAL_DIR_DESCRIPTION "directory containing CGALConfig.cmake. This is either the binary directory where CGAL was configured or PREFIX/lib/CGAL for an installation.")
|
||||||
|
set(CGAL_DIR_MESSAGE "CGAL not found. Set the CGAL_DIR cmake variable or environment variable to the ${CGAL_DIR_DESCRIPTION}")
|
||||||
|
|
||||||
|
set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
|
||||||
|
@@ -32,7 +32,7 @@
|
||||||
|
|
||||||
|
foreach(dir ${CGAL_DIR_SEARCH2})
|
||||||
|
|
||||||
|
- set(CGAL_DIR_SEARCH ${CGAL_DIR_SEARCH} ${dir}/../lib/CGAL-3.4 )
|
||||||
|
+ set(CGAL_DIR_SEARCH ${CGAL_DIR_SEARCH} ${dir}/../lib/CGAL )
|
||||||
|
|
||||||
|
endforeach()
|
||||||
|
|
||||||
|
@@ -49,8 +49,8 @@
|
||||||
|
${CGAL_DIR_SEARCH}
|
||||||
|
|
||||||
|
# Look in standard UNIX install locations.
|
||||||
|
- /usr/local/lib/CGAL-3.4
|
||||||
|
- /usr/lib/CGAL-3.4
|
||||||
|
+ /usr/local/lib/CGAL
|
||||||
|
+ /usr/lib/CGAL
|
||||||
|
|
||||||
|
# Read from the CMakeSetup registry entries. It is likely that
|
||||||
|
# CGAL will have been recently built.
|
||||||
|
|
@ -33,17 +33,17 @@ build-stamp: configure-stamp
|
||||||
dh_clean -k
|
dh_clean -k
|
||||||
$(MAKE) -C static
|
$(MAKE) -C static
|
||||||
$(MAKE) -C shared
|
$(MAKE) -C shared
|
||||||
$(MAKE) -C $(CURDIR)/debian/tests rounding_modes1
|
$(MAKE) -C debian/tests rounding_modes1
|
||||||
LD_LIBRARY_PATH=$(CURDIR)/shared/lib $(CURDIR)/debian/tests/rounding_modes1
|
LD_LIBRARY_PATH=shared/lib debian/tests/rounding_modes1
|
||||||
$(MAKE) -C $(CURDIR)/debian/tests rounding_modes2
|
$(MAKE) -C debian/tests rounding_modes2
|
||||||
LD_LIBRARY_PATH=$(CURDIR)/shared/lib $(CURDIR)/debian/tests/rounding_modes2
|
LD_LIBRARY_PATH=shared/lib debian/tests/rounding_modes2
|
||||||
touch build-stamp
|
touch build-stamp
|
||||||
|
|
||||||
clean: clean-patched unpatch
|
clean: clean-patched unpatch
|
||||||
clean-patched: patch
|
clean-patched: patch
|
||||||
dh_testdir
|
dh_testdir
|
||||||
dh_testroot
|
dh_testroot
|
||||||
$(MAKE) -C $(CURDIR)/debian/tests clean
|
$(MAKE) -C debian/tests clean
|
||||||
rm -fr shared static
|
rm -fr shared static
|
||||||
rm -f build-stamp configure-stamp
|
rm -f build-stamp configure-stamp
|
||||||
dh_clean
|
dh_clean
|
||||||
|
|
@ -56,9 +56,10 @@ install: build
|
||||||
|
|
||||||
$(MAKE) -C static DESTDIR=$(CURDIR)/debian/tmp install
|
$(MAKE) -C static DESTDIR=$(CURDIR)/debian/tmp install
|
||||||
$(MAKE) -C shared DESTDIR=$(CURDIR)/debian/tmp install
|
$(MAKE) -C shared DESTDIR=$(CURDIR)/debian/tmp install
|
||||||
$(MAKE) -C shared DESTDIR=$(CURDIR)/debian/tmp install_FindCGAL
|
|
||||||
mkdir -p $(CURDIR)/debian/tmp/usr/share/cmake-2.6/Modules
|
# $(MAKE) -C shared DESTDIR=$(CURDIR)/debian/tmp install_FindCGAL
|
||||||
mv /usr/share/cmake-2.6/Modules/FindCGAL.cmake $(CURDIR)/debian/tmp/usr/share/cmake-2.6/Modules
|
mkdir -p debian/tmp/usr/share/cmake-2.4/Modules
|
||||||
|
cp cmake/modules/FindCGAL.cmake debian/tmp/usr/share/cmake-2.4/Modules
|
||||||
|
|
||||||
mv debian/tmp/usr/share/doc/CGAL-3.4 debian/tmp/usr/share/doc/cgal
|
mv debian/tmp/usr/share/doc/CGAL-3.4 debian/tmp/usr/share/doc/cgal
|
||||||
mv debian/tmp/usr/share/doc/cgal/CHANGES debian/tmp/usr/share/doc/cgal/changelog
|
mv debian/tmp/usr/share/doc/cgal/CHANGES debian/tmp/usr/share/doc/cgal/changelog
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,10 @@
|
||||||
cgal (3.4~beta1-1~lenny1) testing; urgency=low
|
cgal (3.4-1~lenny1) testing; urgency=low
|
||||||
|
|
||||||
|
* Backport to lenny.
|
||||||
|
|
||||||
|
-- Joachim Reichel <reichel@debian.org> Thu, 22 Jan 2009 21:20:00 +0100
|
||||||
|
|
||||||
|
cgal (3.4-1) unstable; urgency=low
|
||||||
|
|
||||||
* New upstream release.
|
* New upstream release.
|
||||||
* Adapt debian/rules to the new cmake-based build system.
|
* Adapt debian/rules to the new cmake-based build system.
|
||||||
|
|
@ -6,7 +12,7 @@ cgal (3.4~beta1-1~lenny1) testing; urgency=low
|
||||||
libcgal-demo, since it is now possible to configure demos and examples
|
libcgal-demo, since it is now possible to configure demos and examples
|
||||||
independently of the library.
|
independently of the library.
|
||||||
|
|
||||||
-- Joachim Reichel <reichel@debian.org> Sat, 20 Dec 2008 19:09:13 +0100
|
-- Joachim Reichel <reichel@debian.org> Thu, 22 Jan 2009 18:39:44 +0100
|
||||||
|
|
||||||
cgal (3.3.1-4) unstable; urgency=low
|
cgal (3.3.1-4) unstable; urgency=low
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,8 @@ Priority: optional
|
||||||
Maintainer: Joachim Reichel <reichel@debian.org>
|
Maintainer: Joachim Reichel <reichel@debian.org>
|
||||||
Build-Depends: debhelper (>= 7), dpatch, cmake, libboost-dev,
|
Build-Depends: debhelper (>= 7), dpatch, cmake, libboost-dev,
|
||||||
libboost-thread-dev, libboost-graph-dev, libboost-program-options-dev,
|
libboost-thread-dev, libboost-graph-dev, libboost-program-options-dev,
|
||||||
libgmp3-dev, libmpfr-dev, libqt3-mt-dev, libqt4-dev, zlib1g-dev
|
libgmp3-dev, libmpfr-dev, libqt3-mt-dev, libqt4-dev, libqt4-opengl-dev,
|
||||||
|
zlib1g-dev
|
||||||
Standards-Version: 3.8.0
|
Standards-Version: 3.8.0
|
||||||
Homepage: http://www.cgal.org/
|
Homepage: http://www.cgal.org/
|
||||||
XS-Autobuild: yes
|
XS-Autobuild: yes
|
||||||
|
|
|
||||||
|
|
@ -2,5 +2,5 @@ usr/bin/*
|
||||||
usr/include/*
|
usr/include/*
|
||||||
usr/lib/lib*.a
|
usr/lib/lib*.a
|
||||||
usr/lib/lib*.so
|
usr/lib/lib*.so
|
||||||
usr/lib/CGAL-3.4/*
|
usr/lib/CGAL/*
|
||||||
usr/share/cmake-2.6/Modules/*
|
usr/share/cmake-2.6/Modules/*
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
# currently empty
|
fix-FindCGAL-cmake.dpatch
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,39 @@
|
||||||
|
#! /bin/sh /usr/share/dpatch/dpatch-run
|
||||||
|
## fix-FindCGAL-cmake.dpatch by Joachim Reichel <reichel@debian.org>
|
||||||
|
##
|
||||||
|
## All lines beginning with `## DP:' are a description of the patch.
|
||||||
|
## DP: Fix location of cmake support files.
|
||||||
|
|
||||||
|
@DPATCH@
|
||||||
|
diff -urNad cgal-3.4~/cmake/modules/FindCGAL.cmake cgal-3.4/cmake/modules/FindCGAL.cmake
|
||||||
|
--- cgal-3.4~/cmake/modules/FindCGAL.cmake 2009-01-22 19:53:05.000000000 +0100
|
||||||
|
+++ cgal-3.4/cmake/modules/FindCGAL.cmake 2009-01-22 19:53:46.000000000 +0100
|
||||||
|
@@ -11,7 +11,7 @@
|
||||||
|
#
|
||||||
|
|
||||||
|
# Construct consitent error messages for use below.
|
||||||
|
-set(CGAL_DIR_DESCRIPTION "directory containing CGALConfig.cmake. This is either the binary directory where CGAL was configured or PREFIX/lib/CGAL-3.4 for an installation.")
|
||||||
|
+set(CGAL_DIR_DESCRIPTION "directory containing CGALConfig.cmake. This is either the binary directory where CGAL was configured or PREFIX/lib/CGAL for an installation.")
|
||||||
|
set(CGAL_DIR_MESSAGE "CGAL not found. Set the CGAL_DIR cmake variable or environment variable to the ${CGAL_DIR_DESCRIPTION}")
|
||||||
|
|
||||||
|
set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
|
||||||
|
@@ -32,7 +32,7 @@
|
||||||
|
|
||||||
|
foreach(dir ${CGAL_DIR_SEARCH2})
|
||||||
|
|
||||||
|
- set(CGAL_DIR_SEARCH ${CGAL_DIR_SEARCH} ${dir}/../lib/CGAL-3.4 )
|
||||||
|
+ set(CGAL_DIR_SEARCH ${CGAL_DIR_SEARCH} ${dir}/../lib/CGAL )
|
||||||
|
|
||||||
|
endforeach()
|
||||||
|
|
||||||
|
@@ -49,8 +49,8 @@
|
||||||
|
${CGAL_DIR_SEARCH}
|
||||||
|
|
||||||
|
# Look in standard UNIX install locations.
|
||||||
|
- /usr/local/lib/CGAL-3.4
|
||||||
|
- /usr/lib/CGAL-3.4
|
||||||
|
+ /usr/local/lib/CGAL
|
||||||
|
+ /usr/lib/CGAL
|
||||||
|
|
||||||
|
# Read from the CMakeSetup registry entries. It is likely that
|
||||||
|
# CGAL will have been recently built.
|
||||||
|
|
@ -30,20 +30,20 @@ configure-stamp: patch-stamp
|
||||||
build: build-stamp
|
build: build-stamp
|
||||||
build-stamp: configure-stamp
|
build-stamp: configure-stamp
|
||||||
dh_testdir
|
dh_testdir
|
||||||
dh_clean -k
|
dh_prep
|
||||||
$(MAKE) -C static
|
$(MAKE) -C static
|
||||||
$(MAKE) -C shared
|
$(MAKE) -C shared
|
||||||
$(MAKE) -C $(CURDIR)/debian/tests rounding_modes1
|
$(MAKE) -C debian/tests rounding_modes1
|
||||||
LD_LIBRARY_PATH=$(CURDIR)/shared/lib $(CURDIR)/debian/tests/rounding_modes1
|
LD_LIBRARY_PATH=shared/lib debian/tests/rounding_modes1
|
||||||
$(MAKE) -C $(CURDIR)/debian/tests rounding_modes2
|
$(MAKE) -C debian/tests rounding_modes2
|
||||||
LD_LIBRARY_PATH=$(CURDIR)/shared/lib $(CURDIR)/debian/tests/rounding_modes2
|
LD_LIBRARY_PATH=shared/lib debian/tests/rounding_modes2
|
||||||
touch build-stamp
|
touch build-stamp
|
||||||
|
|
||||||
clean: clean-patched unpatch
|
clean: clean-patched unpatch
|
||||||
clean-patched: patch
|
clean-patched: patch
|
||||||
dh_testdir
|
dh_testdir
|
||||||
dh_testroot
|
dh_testroot
|
||||||
$(MAKE) -C $(CURDIR)/debian/tests clean
|
$(MAKE) -C debian/tests clean
|
||||||
rm -fr shared static
|
rm -fr shared static
|
||||||
rm -f build-stamp configure-stamp
|
rm -f build-stamp configure-stamp
|
||||||
dh_clean
|
dh_clean
|
||||||
|
|
@ -51,14 +51,15 @@ clean-patched: patch
|
||||||
install: build
|
install: build
|
||||||
dh_testdir
|
dh_testdir
|
||||||
dh_testroot
|
dh_testroot
|
||||||
# dh_clean -k
|
# dh_prep
|
||||||
dh_installdirs
|
dh_installdirs
|
||||||
|
|
||||||
$(MAKE) -C static DESTDIR=$(CURDIR)/debian/tmp install
|
$(MAKE) -C static DESTDIR=$(CURDIR)/debian/tmp install
|
||||||
$(MAKE) -C shared DESTDIR=$(CURDIR)/debian/tmp install
|
$(MAKE) -C shared DESTDIR=$(CURDIR)/debian/tmp install
|
||||||
$(MAKE) -C shared DESTDIR=$(CURDIR)/debian/tmp install_FindCGAL
|
|
||||||
mkdir -p $(CURDIR)/debian/tmp/usr/share/cmake-2.6/Modules
|
# $(MAKE) -C shared DESTDIR=$(CURDIR)/debian/tmp install_FindCGAL
|
||||||
mv /usr/share/cmake-2.6/Modules/FindCGAL.cmake $(CURDIR)/debian/tmp/usr/share/cmake-2.6/Modules
|
mkdir -p debian/tmp/usr/share/cmake-2.6/Modules
|
||||||
|
cp cmake/modules/FindCGAL.cmake debian/tmp/usr/share/cmake-2.6/Modules
|
||||||
|
|
||||||
mv debian/tmp/usr/share/doc/CGAL-3.4 debian/tmp/usr/share/doc/cgal
|
mv debian/tmp/usr/share/doc/CGAL-3.4 debian/tmp/usr/share/doc/cgal
|
||||||
mv debian/tmp/usr/share/doc/cgal/CHANGES debian/tmp/usr/share/doc/cgal/changelog
|
mv debian/tmp/usr/share/doc/cgal/CHANGES debian/tmp/usr/share/doc/cgal/changelog
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
cgal (3.4~beta1-1) unstable; urgency=low
|
cgal (3.4-1) unstable; urgency=low
|
||||||
|
|
||||||
* New upstream release.
|
* New upstream release.
|
||||||
* Adapt debian/rules to the new cmake-based build system.
|
* Adapt debian/rules to the new cmake-based build system.
|
||||||
|
|
@ -6,7 +6,7 @@ cgal (3.4~beta1-1) unstable; urgency=low
|
||||||
libcgal-demo, since it is now possible to configure demos and examples
|
libcgal-demo, since it is now possible to configure demos and examples
|
||||||
independently of the library.
|
independently of the library.
|
||||||
|
|
||||||
-- Joachim Reichel <reichel@debian.org> Sat, 20 Dec 2008 19:09:13 +0100
|
-- Joachim Reichel <reichel@debian.org> Thu, 22 Jan 2009 18:39:44 +0100
|
||||||
|
|
||||||
cgal (3.3.1-4) unstable; urgency=low
|
cgal (3.3.1-4) unstable; urgency=low
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,8 @@ Priority: optional
|
||||||
Maintainer: Joachim Reichel <reichel@debian.org>
|
Maintainer: Joachim Reichel <reichel@debian.org>
|
||||||
Build-Depends: debhelper (>= 7), dpatch, cmake, libboost-dev,
|
Build-Depends: debhelper (>= 7), dpatch, cmake, libboost-dev,
|
||||||
libboost-thread-dev, libboost-graph-dev, libboost-program-options-dev,
|
libboost-thread-dev, libboost-graph-dev, libboost-program-options-dev,
|
||||||
libgmp3-dev, libmpfr-dev, libqt3-mt-dev, libqt4-dev, zlib1g-dev
|
libgmp3-dev, libmpfr-dev, libqt3-mt-dev, libqt4-dev, libqt4-opengl-dev,
|
||||||
|
zlib1g-dev
|
||||||
Standards-Version: 3.8.0
|
Standards-Version: 3.8.0
|
||||||
Homepage: http://www.cgal.org/
|
Homepage: http://www.cgal.org/
|
||||||
XS-Autobuild: yes
|
XS-Autobuild: yes
|
||||||
|
|
|
||||||
|
|
@ -2,5 +2,5 @@ usr/bin/*
|
||||||
usr/include/*
|
usr/include/*
|
||||||
usr/lib/lib*.a
|
usr/lib/lib*.a
|
||||||
usr/lib/lib*.so
|
usr/lib/lib*.so
|
||||||
usr/lib/CGAL-3.4/*
|
usr/lib/CGAL/*
|
||||||
usr/share/cmake-2.6/Modules/*
|
usr/share/cmake-2.6/Modules/*
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
# currently empty
|
fix-FindCGAL-cmake.dpatch
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,39 @@
|
||||||
|
#! /bin/sh /usr/share/dpatch/dpatch-run
|
||||||
|
## fix-FindCGAL-cmake.dpatch by Joachim Reichel <reichel@debian.org>
|
||||||
|
##
|
||||||
|
## All lines beginning with `## DP:' are a description of the patch.
|
||||||
|
## DP: Fix location of cmake support files.
|
||||||
|
|
||||||
|
@DPATCH@
|
||||||
|
diff -urNad cgal-3.4~/cmake/modules/FindCGAL.cmake cgal-3.4/cmake/modules/FindCGAL.cmake
|
||||||
|
--- cgal-3.4~/cmake/modules/FindCGAL.cmake 2009-01-22 19:53:05.000000000 +0100
|
||||||
|
+++ cgal-3.4/cmake/modules/FindCGAL.cmake 2009-01-22 19:53:46.000000000 +0100
|
||||||
|
@@ -11,7 +11,7 @@
|
||||||
|
#
|
||||||
|
|
||||||
|
# Construct consitent error messages for use below.
|
||||||
|
-set(CGAL_DIR_DESCRIPTION "directory containing CGALConfig.cmake. This is either the binary directory where CGAL was configured or PREFIX/lib/CGAL-3.4 for an installation.")
|
||||||
|
+set(CGAL_DIR_DESCRIPTION "directory containing CGALConfig.cmake. This is either the binary directory where CGAL was configured or PREFIX/lib/CGAL for an installation.")
|
||||||
|
set(CGAL_DIR_MESSAGE "CGAL not found. Set the CGAL_DIR cmake variable or environment variable to the ${CGAL_DIR_DESCRIPTION}")
|
||||||
|
|
||||||
|
set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
|
||||||
|
@@ -32,7 +32,7 @@
|
||||||
|
|
||||||
|
foreach(dir ${CGAL_DIR_SEARCH2})
|
||||||
|
|
||||||
|
- set(CGAL_DIR_SEARCH ${CGAL_DIR_SEARCH} ${dir}/../lib/CGAL-3.4 )
|
||||||
|
+ set(CGAL_DIR_SEARCH ${CGAL_DIR_SEARCH} ${dir}/../lib/CGAL )
|
||||||
|
|
||||||
|
endforeach()
|
||||||
|
|
||||||
|
@@ -49,8 +49,8 @@
|
||||||
|
${CGAL_DIR_SEARCH}
|
||||||
|
|
||||||
|
# Look in standard UNIX install locations.
|
||||||
|
- /usr/local/lib/CGAL-3.4
|
||||||
|
- /usr/lib/CGAL-3.4
|
||||||
|
+ /usr/local/lib/CGAL
|
||||||
|
+ /usr/lib/CGAL
|
||||||
|
|
||||||
|
# Read from the CMakeSetup registry entries. It is likely that
|
||||||
|
# CGAL will have been recently built.
|
||||||
|
|
@ -30,20 +30,20 @@ configure-stamp: patch-stamp
|
||||||
build: build-stamp
|
build: build-stamp
|
||||||
build-stamp: configure-stamp
|
build-stamp: configure-stamp
|
||||||
dh_testdir
|
dh_testdir
|
||||||
dh_clean -k
|
dh_prep
|
||||||
$(MAKE) -C static
|
$(MAKE) -C static
|
||||||
$(MAKE) -C shared
|
$(MAKE) -C shared
|
||||||
$(MAKE) -C $(CURDIR)/debian/tests rounding_modes1
|
$(MAKE) -C debian/tests rounding_modes1
|
||||||
LD_LIBRARY_PATH=$(CURDIR)/shared/lib $(CURDIR)/debian/tests/rounding_modes1
|
LD_LIBRARY_PATH=shared/lib debian/tests/rounding_modes1
|
||||||
$(MAKE) -C $(CURDIR)/debian/tests rounding_modes2
|
$(MAKE) -C debian/tests rounding_modes2
|
||||||
LD_LIBRARY_PATH=$(CURDIR)/shared/lib $(CURDIR)/debian/tests/rounding_modes2
|
LD_LIBRARY_PATH=shared/lib debian/tests/rounding_modes2
|
||||||
touch build-stamp
|
touch build-stamp
|
||||||
|
|
||||||
clean: clean-patched unpatch
|
clean: clean-patched unpatch
|
||||||
clean-patched: patch
|
clean-patched: patch
|
||||||
dh_testdir
|
dh_testdir
|
||||||
dh_testroot
|
dh_testroot
|
||||||
$(MAKE) -C $(CURDIR)/debian/tests clean
|
$(MAKE) -C debian/tests clean
|
||||||
rm -fr shared static
|
rm -fr shared static
|
||||||
rm -f build-stamp configure-stamp
|
rm -f build-stamp configure-stamp
|
||||||
dh_clean
|
dh_clean
|
||||||
|
|
@ -51,14 +51,15 @@ clean-patched: patch
|
||||||
install: build
|
install: build
|
||||||
dh_testdir
|
dh_testdir
|
||||||
dh_testroot
|
dh_testroot
|
||||||
# dh_clean -k
|
# dh_prep
|
||||||
dh_installdirs
|
dh_installdirs
|
||||||
|
|
||||||
$(MAKE) -C static DESTDIR=$(CURDIR)/debian/tmp install
|
$(MAKE) -C static DESTDIR=$(CURDIR)/debian/tmp install
|
||||||
$(MAKE) -C shared DESTDIR=$(CURDIR)/debian/tmp install
|
$(MAKE) -C shared DESTDIR=$(CURDIR)/debian/tmp install
|
||||||
$(MAKE) -C shared DESTDIR=$(CURDIR)/debian/tmp install_FindCGAL
|
|
||||||
mkdir -p $(CURDIR)/debian/tmp/usr/share/cmake-2.6/Modules
|
# $(MAKE) -C shared DESTDIR=$(CURDIR)/debian/tmp install_FindCGAL
|
||||||
mv /usr/share/cmake-2.6/Modules/FindCGAL.cmake $(CURDIR)/debian/tmp/usr/share/cmake-2.6/Modules
|
mkdir -p debian/tmp/usr/share/cmake-2.6/Modules
|
||||||
|
cp cmake/modules/FindCGAL.cmake debian/tmp/usr/share/cmake-2.6/Modules
|
||||||
|
|
||||||
mv debian/tmp/usr/share/doc/CGAL-3.4 debian/tmp/usr/share/doc/cgal
|
mv debian/tmp/usr/share/doc/CGAL-3.4 debian/tmp/usr/share/doc/cgal
|
||||||
mv debian/tmp/usr/share/doc/cgal/CHANGES debian/tmp/usr/share/doc/cgal/changelog
|
mv debian/tmp/usr/share/doc/cgal/CHANGES debian/tmp/usr/share/doc/cgal/changelog
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue