Use packaging of 3.7-1 as basis for 3.8 and later releases (2nd try).

This commit is contained in:
Joachim Reichel 2010-10-17 14:48:14 +00:00
parent c6ddc80744
commit a88623ecea
19 changed files with 149 additions and 204 deletions

View File

@ -5,29 +5,23 @@ backport for squeeze:
- debian/changelog: - debian/changelog:
* adjust version suffix from -X to -X~squeeze1 * adjust version suffix from -X to -X~squeeze1
* adjust suite from unstable to testing * adjust suite from unstable to testing
- debian/control:
* adjust Standards-Version from 3.9.0 to 3.8.4
backport for lenny: backport for lenny:
- debian/changelog: - debian/changelog:
* adjust version suffix from -X to -X~lenny1 * adjust version suffix from -X to -X~lenny1
* adjust suite from unstable to stable * adjust suite from unstable to stable
- debian/control: - debian/control:
* adjust Standards-Version from 3.9.0 to 3.8.0 * adjust Standards-Version from 3.9.1 to 3.8.0
* add boost version 1.35 (several times) * add boost version 1.35 (several times)
* replace libipe-dev by libipe1-dev, remove >= 7 qualifier * replace libipe-dev by libipe1-dev, remove >= 7 qualifier (twice)
* add libboost-graph1.35-dev to Build-Depends: and Suggests: for libcgal-demo * add libboost-graph1.35-dev to Build-Depends: and Suggests: for libcgal-demo
- debian-patches/00list
* disable ipe-default-to-version-7.dpatch
- debian/rules
* change value of WITH_IPE_7 to FALSE
tagging: tagging:
svn copy $SVNROOT/trunk/Maintenance/deb/sid/debian $SVNROOT/tags/debian/3.6.1-1 svn copy $SVNROOT/trunk/Maintenance/deb/sid/debian $SVNROOT/tags/debian/3.7-1
svn copy $SVNROOT/trunk/Maintenance/deb/squeeze/debian $SVNROOT/tags/debian/3.6.1-1~squeeze1 svn copy $SVNROOT/trunk/Maintenance/deb/squeeze/debian $SVNROOT/tags/debian/3.7-1~squeeze1
svn copy $SVNROOT/trunk/Maintenance/deb/lenny/debian $SVNROOT/tags/debian/3.6.1-1~lenny1 svn copy $SVNROOT/trunk/Maintenance/deb/lenny/debian $SVNROOT/tags/debian/3.7-1~lenny1
or: or:
svn copy $SVNROOT/branches/CGAL-3.6-branch/Maintenance/deb/sid/debian $SVNROOT/tags/debian/3.6.1-1 svn copy $SVNROOT/branches/CGAL-3.7-branch/Maintenance/deb/sid/debian $SVNROOT/tags/debian/3.7-1
svn copy $SVNROOT/branches/CGAL-3.6-branch/Maintenance/deb/squeeze/debian $SVNROOT/tags/debian/3.6.1-1~squeeze1 svn copy $SVNROOT/branches/CGAL-3.7-branch/Maintenance/deb/squeeze/debian $SVNROOT/tags/debian/3.7-1~squeeze1
svn copy $SVNROOT/branches/CGAL-3.6-branch/Maintenance/deb/lenny/debian $SVNROOT/tags/debian/3.6.1-1~lenny1 svn copy $SVNROOT/branches/CGAL-3.7-branch/Maintenance/deb/lenny/debian $SVNROOT/tags/debian/3.7-1~lenny1

View File

@ -1,8 +1,23 @@
cgal (3.6.1-1~lenny1) stable; urgency=low cgal (3.7-1~lenny1) stable; urgency=low
* Backport for lenny. * New upstream release.
* Rename binary package libcgal5 to libcgal6 to reflect SONAME change.
* Rename binary package libcgal5-ipelets to libcgal-ipelets because it is
not possible to install the ipelets for different SONAMEs in parallel.
* Remove ipe-default-to-version-7.dpatch: the Ipe version is now
auto-detected.
* Remove fix-core-64bit.dpatch (fixed upstream).
* Add qt4-dev-tools to Suggests: of libcgal-demo for qcollectiongenerator.
* Update Standards-Version to 3.9.1 (-D_REENTRANT no longer needed).
-- Joachim Reichel <reichel@debian.org> Sat, 03 Jul 2010 20:44:22 +0200 -- Joachim Reichel <reichel@debian.org> Sun, 17 Oct 2010 14:27:54 +0200
cgal (3.6.1-2) unstable; urgency=low
* Add fix-core-64bit.dpatch: use CORE::CHUNK_BIT instead of hard-coded
constant 14.
-- Joachim Reichel <reichel@debian.org> Tue, 24 Aug 2010 19:46:36 +0200
cgal (3.6.1-1) unstable; urgency=low cgal (3.6.1-1) unstable; urgency=low
@ -25,6 +40,8 @@ cgal (3.6-1) unstable; urgency=low
* New binary package libcgal5-ipelets which contains plugins for Ipe 7.x * New binary package libcgal5-ipelets which contains plugins for Ipe 7.x
(Closes: #557643). (Closes: #557643).
* Add ipe-default-to-version-7.dpatch: change default of WITH_IPE_7 to ON. * Add ipe-default-to-version-7.dpatch: change default of WITH_IPE_7 to ON.
* Remove libboost-graph1.35-dev from Build-Depends: and Suggests: of
libcgal-demo (not needed).
-- Joachim Reichel <reichel@debian.org> Mon, 22 Mar 2010 19:09:15 +0100 -- Joachim Reichel <reichel@debian.org> Mon, 22 Mar 2010 19:09:15 +0100

View File

@ -4,13 +4,13 @@ Priority: optional
Maintainer: Joachim Reichel <reichel@debian.org> Maintainer: Joachim Reichel <reichel@debian.org>
# "ipe" is only needed because it contains goodies.lua which is needed by FindIPE.cmake # "ipe" is only needed because it contains goodies.lua which is needed by FindIPE.cmake
Build-Depends: debhelper (>= 7), dpatch, cmake, libboost1.35-dev, libboost-graph1.35-dev, Build-Depends: debhelper (>= 7), dpatch, cmake, libboost1.35-dev, libboost-graph1.35-dev,
libboost-thread1.35-dev, libboost-program-options1.35-dev, libgmp3-dev, libmpfr-dev, libboost1.35-thread-dev, libboost-program-options1.35-dev, libgmp3-dev, libmpfr-dev,
libqt3-mt-dev, libqt4-dev, libqt4-opengl-dev, zlib1g-dev, libipe1-dev, ipe libqt3-mt-dev, libqt4-dev, libqt4-opengl-dev, zlib1g-dev, libipe1-dev, ipe
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
Package: libcgal5 Package: libcgal6
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends} Depends: ${shlibs:Depends}, ${misc:Depends}
Description: C++ library for computational geometry Description: C++ library for computational geometry
@ -33,7 +33,7 @@ Description: C++ library for computational geometry
Package: libcgal-dev Package: libcgal-dev
Section: non-free/libdevel Section: non-free/libdevel
Architecture: any Architecture: any
Depends: libcgal5 (= ${binary:Version}), libboost1.35-dev, Depends: libcgal6 (= ${binary:Version}), libboost1.35-dev,
libboost-thread1.35-dev, libboost-program-options1.35-dev, libgmp3-dev, libmpfr-dev, libboost-thread1.35-dev, libboost-program-options1.35-dev, libgmp3-dev, libmpfr-dev,
libqt3-mt-dev, libqt4-dev, zlib1g-dev, ${misc:Depends} libqt3-mt-dev, libqt4-dev, zlib1g-dev, ${misc:Depends}
Description: C++ library for computational geometry (development files) Description: C++ library for computational geometry (development files)
@ -47,11 +47,11 @@ Description: C++ library for computational geometry (development files)
Package: libcgal-demo Package: libcgal-demo
Section: non-free/devel Section: non-free/devel
Architecture: all Architecture: all
Depends: libcgal-dev (>= ${binary:Version}), libcgal5 (>= ${binary:Version}), Depends: libcgal-dev (>= ${binary:Version}), libcgal6 (>= ${binary:Version}),
${misc:Depends} ${misc:Depends}
Suggests: liblapack-dev, libatlas-base-dev | libatlas.so.3gf, gfortran, Suggests: liblapack-dev, libatlas-base-dev | libatlas.so.3gf, gfortran,
geomview, libqglviewer-qt4-dev, libipe1-dev, libglew1.5-dev | libglew-dev, geomview, libqglviewer-qt4-dev, libipe1-dev, libglew1.5-dev | libglew-dev,
libmagick++-dev | libmagick++9-dev, libboost-graph1.35-dev libmagick++-dev | libmagick++9-dev, qt4-dev-tools, libboost-graph1.35-dev
Description: C++ library for computational geometry (demos) Description: C++ library for computational geometry (demos)
CGAL (Computational Geometry Algorithms Library) makes the most important CGAL (Computational Geometry Algorithms Library) makes the most important
of the solutions and methods developed in computational geometry available of the solutions and methods developed in computational geometry available
@ -60,9 +60,11 @@ Description: C++ library for computational geometry (demos)
. .
This package contains the demos and examples. This package contains the demos and examples.
Package: libcgal5-ipelets Package: libcgal-ipelets
Architecture: any Architecture: any
Depends: libcgal5 (>= ${binary:Version}), ipe (>= 7), ${shlibs:Depends}, ${misc:Depends} Depends: libcgal6 (>= ${binary:Version}), ipe (>= 7), ${shlibs:Depends}, ${misc:Depends}
Conflicts: libcgal5-ipelets
Replaces: libcgal5-ipelets
Description: C++ library for computational geometry (ipelets) Description: C++ library for computational geometry (ipelets)
CGAL (Computational Geometry Algorithms Library) makes the most important CGAL (Computational Geometry Algorithms Library) makes the most important
of the solutions and methods developed in computational geometry available of the solutions and methods developed in computational geometry available

View File

@ -156,8 +156,8 @@ Copyright (from upstream file LICENSE)
The source code of the CGAL library can be found in the directories The source code of the CGAL library can be found in the directories
"src/CGAL", "src/CGALQt", "src/CGALQt4" and "include/CGAL" (with the "src/CGAL", "src/CGALQt", "src/CGALQt4" and "include/CGAL" (with the
exception of "include/CGAL/CORE", "include/CGAL/OpenNL" and exception of "include/CGAL/CORE", and "include/CGAL/OpenNL").
"include/CGAL/PDB"). It is specified in each file of the CGAL library which It is specified in each file of the CGAL library which
license applies to it. This is either the GNU Lesser General Public License license applies to it. This is either the GNU Lesser General Public License
(as published by the Free Software Foundation; version 2.1 of the License) (as published by the Free Software Foundation; version 2.1 of the License)
or the Q Public License (version 1.0), *depending on each file*. The texts or the Q Public License (version 1.0), *depending on each file*. The texts
@ -171,8 +171,6 @@ Copyright (from upstream file LICENSE)
licensed under the QPL (see LICENSE.QPL). licensed under the QPL (see LICENSE.QPL).
- ImageIO, in the directory "src/CGALimageIO", is licensed under the LGPL - ImageIO, in the directory "src/CGALimageIO", is licensed under the LGPL
(see LICENSE.LGPL). (see LICENSE.LGPL).
- PDB, in the directory "include/CGAL/PDB" and "src/CGALPDB" is licensed
under the LGPL (see LICENSE.LGPL).
- OpenNL, in the directory "include/CGAL/OpenNL", is licensed under the LGPL - OpenNL, in the directory "include/CGAL/OpenNL", is licensed under the LGPL
(see LICENSE.LGPL). (see LICENSE.LGPL).
@ -311,34 +309,6 @@ src/CGALimageIO.
PDB
===
The following copyright statement applies to the PDB library in
include/CGAL/PDB and src/CGALPDB.
Copyright 2004
Stanford University
This file is part of the DSR PDB Library.
The DSR PDB Library is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or (at your
option) any later version.
The DSR PDB Library is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
License for more details.
You should have received a copy of the GNU Lesser General Public License
along with the DSR PDB Library; see the file /usr/share/common-licenses/LGPL-2.1.
If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
Fifth Floor, Boston, MA 02110-1301, USA.
OpenNL OpenNL
====== ======

View File

@ -1,2 +1,2 @@
usr/share/doc/cgal/demo.tar.gz usr/share/doc/libcgal5 usr/share/doc/cgal/demo.tar.gz usr/share/doc/libcgal6
usr/share/doc/cgal/examples.tar.gz usr/share/doc/libcgal5 usr/share/doc/cgal/examples.tar.gz usr/share/doc/libcgal6

View File

@ -1 +1 @@
# ipe-default-to-version-7.dpatch # currently empty

View File

@ -22,15 +22,13 @@ configure-stamp: patch-stamp
mkdir -p static mkdir -p static
cd static && QTDIR= cmake .. \ cd static && QTDIR= cmake .. \
-DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_SKIP_RPATH=TRUE -DCGAL_CXX_FLAGS=-D_REENTRANT \ -DCMAKE_SKIP_RPATH=TRUE -DBUILD_SHARED_LIBS=FALSE \
-DBUILD_SHARED_LIBS=FALSE -DWITH_demos=OFF -DWITH_examples=OFF \ -DWITH_demos=OFF -DWITH_examples=OFF
-DCGAL_SOVERSION:STRING=5.0.1
mkdir -p shared mkdir -p shared
cd shared && QTDIR= cmake .. \ cd shared && QTDIR= cmake .. \
-DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_SKIP_RPATH=TRUE -DCGAL_CXX_FLAGS=-D_REENTRANT \ -DCMAKE_SKIP_RPATH=TRUE -DBUILD_SHARED_LIBS=TRUE \
-DBUILD_SHARED_LIBS=TRUE -DWITH_demos=OFF -DWITH_examples=OFF \ -DWITH_demos=OFF -DWITH_examples=OFF
-DCGAL_SOVERSION:STRING=5.0.1
touch configure-stamp touch configure-stamp
build: build-stamp build: build-stamp
@ -43,9 +41,7 @@ build-stamp: configure-stamp
mkdir -p shared/demo/CGAL_ipelets mkdir -p shared/demo/CGAL_ipelets
cd shared/demo/CGAL_ipelets && QTDIR= cmake ../../../demo/CGAL_ipelets \ cd shared/demo/CGAL_ipelets && QTDIR= cmake ../../../demo/CGAL_ipelets \
-DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_SKIP_RPATH=TRUE -DCGAL_CXX_FLAGS=-D_REENTRANT \ -DCMAKE_SKIP_RPATH=TRUE -DBUILD_SHARED_LIBS=TRUE -DCGAL_DIR=$(CURDIR)/shared
-DBUILD_SHARED_LIBS=TRUE -DWITH_IPE_7=FALSE -DCGAL_DIR=$(CURDIR)/shared \
-DCGAL_SOVERSION:STRING=5.0.1
$(MAKE) -C shared/demo/CGAL_ipelets $(MAKE) -C shared/demo/CGAL_ipelets
ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
@ -91,14 +87,14 @@ install: build
dh_install --sourcedir=debian/tmp --list-missing dh_install --sourcedir=debian/tmp --list-missing
ln -s libcgal5 debian/libcgal-demo/usr/share/doc/libcgal-demo ln -s libcgal6 debian/libcgal-demo/usr/share/doc/libcgal-demo
mkdir -p debian/libcgal-dev/usr/share/doc mkdir -p debian/libcgal-dev/usr/share/doc
ln -s libcgal5 debian/libcgal-dev/usr/share/doc/libcgal-dev ln -s libcgal6 debian/libcgal-dev/usr/share/doc/libcgal-dev
mkdir -p debian/libcgal5-ipelets/usr/share/doc mkdir -p debian/libcgal-ipelets/usr/share/doc
ln -s libcgal5 debian/libcgal5-ipelets/usr/share/doc/libcgal5-ipelets ln -s libcgal6 debian/libcgal-ipelets/usr/share/doc/libcgal-ipelets
# install -d debian/libcgal5/DEBIAN # install -d debian/libcgal6/DEBIAN
# install -m644 debian/libcgal5.shlibs debian/libcgal5/DEBIAN/shlibs # install -m644 debian/libcgal6.shlibs debian/libcgal6/DEBIAN/shlibs
binary-indep: build install binary-indep: build install
dh_testdir -i dh_testdir -i
@ -114,8 +110,8 @@ binary-indep: build install
binary-arch: build install binary-arch: build install
dh_testdir -a dh_testdir -a
dh_testroot -a dh_testroot -a
dh_installdocs -plibcgal5 debian/copyright dh_installdocs -plibcgal6 debian/copyright
dh_installchangelogs -plibcgal5 dh_installchangelogs -plibcgal6
dh_installman -a dh_installman -a
dh_link -a dh_link -a
dh_strip -a dh_strip -a
@ -123,7 +119,7 @@ binary-arch: build install
dh_fixperms -a dh_fixperms -a
dh_makeshlibs -a dh_makeshlibs -a
dh_installdeb -a dh_installdeb -a
dh_shlibdeps -a -ldebian/libcgal5/usr/lib dh_shlibdeps -a -ldebian/libcgal6/usr/lib
dh_gencontrol -a dh_gencontrol -a
dh_md5sums -a dh_md5sums -a
dh_builddeb -a dh_builddeb -a

View File

@ -1,8 +1,23 @@
cgal (3.7-1) experimental; urgency=low
* New upstream release.
* Rename binary package libcgal5 to libcgal6 to reflect SONAME change.
* Rename binary package libcgal5-ipelets to libcgal-ipelets because it is
not possible to install the ipelets for different SONAMEs in parallel.
* Remove ipe-default-to-version-7.dpatch: the Ipe version is now
auto-detected.
* Remove fix-core-64bit.dpatch (fixed upstream).
* Add qt4-dev-tools to Suggests: of libcgal-demo for qcollectiongenerator.
* Update Standards-Version to 3.9.1 (-D_REENTRANT no longer needed).
-- Joachim Reichel <reichel@debian.org> Sun, 17 Oct 2010 14:27:54 +0200
cgal (3.6.1-2) unstable; urgency=low cgal (3.6.1-2) unstable; urgency=low
* Layout in debian/rules. * Add fix-core-64bit.dpatch: use CORE::CHUNK_BIT instead of hard-coded
constant 14.
-- Joachim Reichel <reichel@debian.org> Sat, 03 Jul 2010 23:10:34 +0200 -- Joachim Reichel <reichel@debian.org> Tue, 24 Aug 2010 19:46:36 +0200
cgal (3.6.1-1) unstable; urgency=low cgal (3.6.1-1) unstable; urgency=low

View File

@ -6,11 +6,11 @@ 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-program-options-dev, libgmp3-dev, libmpfr-dev, libboost-thread-dev, libboost-program-options-dev, libgmp3-dev, libmpfr-dev,
libqt3-mt-dev, libqt4-dev, libqt4-opengl-dev, zlib1g-dev, libipe-dev (>= 7), ipe libqt3-mt-dev, libqt4-dev, libqt4-opengl-dev, zlib1g-dev, libipe-dev (>= 7), ipe
Standards-Version: 3.9.0 Standards-Version: 3.9.1
Homepage: http://www.cgal.org/ Homepage: http://www.cgal.org/
XS-Autobuild: yes XS-Autobuild: yes
Package: libcgal5 Package: libcgal6
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends} Depends: ${shlibs:Depends}, ${misc:Depends}
Description: C++ library for computational geometry Description: C++ library for computational geometry
@ -33,7 +33,7 @@ Description: C++ library for computational geometry
Package: libcgal-dev Package: libcgal-dev
Section: non-free/libdevel Section: non-free/libdevel
Architecture: any Architecture: any
Depends: libcgal5 (= ${binary:Version}), libboost-dev, Depends: libcgal6 (= ${binary:Version}), libboost-dev,
libboost-thread-dev, libboost-program-options-dev, libgmp3-dev, libmpfr-dev, libboost-thread-dev, libboost-program-options-dev, libgmp3-dev, libmpfr-dev,
libqt3-mt-dev, libqt4-dev, zlib1g-dev, ${misc:Depends} libqt3-mt-dev, libqt4-dev, zlib1g-dev, ${misc:Depends}
Description: C++ library for computational geometry (development files) Description: C++ library for computational geometry (development files)
@ -47,11 +47,11 @@ Description: C++ library for computational geometry (development files)
Package: libcgal-demo Package: libcgal-demo
Section: non-free/devel Section: non-free/devel
Architecture: all Architecture: all
Depends: libcgal-dev (>= ${binary:Version}), libcgal5 (>= ${binary:Version}), Depends: libcgal-dev (>= ${binary:Version}), libcgal6 (>= ${binary:Version}),
${misc:Depends} ${misc:Depends}
Suggests: liblapack-dev, libatlas-base-dev | libatlas.so.3gf, gfortran, Suggests: liblapack-dev, libatlas-base-dev | libatlas.so.3gf, gfortran,
geomview, libqglviewer-qt4-dev, libipe1-dev, libglew1.5-dev | libglew-dev, geomview, libqglviewer-qt4-dev, libipe-dev (>= 7), libglew1.5-dev | libglew-dev,
libmagick++-dev | libmagick++9-dev libmagick++-dev | libmagick++9-dev, qt4-dev-tools
Description: C++ library for computational geometry (demos) Description: C++ library for computational geometry (demos)
CGAL (Computational Geometry Algorithms Library) makes the most important CGAL (Computational Geometry Algorithms Library) makes the most important
of the solutions and methods developed in computational geometry available of the solutions and methods developed in computational geometry available
@ -60,9 +60,11 @@ Description: C++ library for computational geometry (demos)
. .
This package contains the demos and examples. This package contains the demos and examples.
Package: libcgal5-ipelets Package: libcgal-ipelets
Architecture: any Architecture: any
Depends: libcgal5 (>= ${binary:Version}), ipe (>= 7), ${shlibs:Depends}, ${misc:Depends} Depends: libcgal6 (>= ${binary:Version}), ipe (>= 7), ${shlibs:Depends}, ${misc:Depends}
Conflicts: libcgal5-ipelets
Replaces: libcgal5-ipelets
Description: C++ library for computational geometry (ipelets) Description: C++ library for computational geometry (ipelets)
CGAL (Computational Geometry Algorithms Library) makes the most important CGAL (Computational Geometry Algorithms Library) makes the most important
of the solutions and methods developed in computational geometry available of the solutions and methods developed in computational geometry available

View File

@ -156,8 +156,8 @@ Copyright (from upstream file LICENSE)
The source code of the CGAL library can be found in the directories The source code of the CGAL library can be found in the directories
"src/CGAL", "src/CGALQt", "src/CGALQt4" and "include/CGAL" (with the "src/CGAL", "src/CGALQt", "src/CGALQt4" and "include/CGAL" (with the
exception of "include/CGAL/CORE", "include/CGAL/OpenNL" and exception of "include/CGAL/CORE", and "include/CGAL/OpenNL").
"include/CGAL/PDB"). It is specified in each file of the CGAL library which It is specified in each file of the CGAL library which
license applies to it. This is either the GNU Lesser General Public License license applies to it. This is either the GNU Lesser General Public License
(as published by the Free Software Foundation; version 2.1 of the License) (as published by the Free Software Foundation; version 2.1 of the License)
or the Q Public License (version 1.0), *depending on each file*. The texts or the Q Public License (version 1.0), *depending on each file*. The texts
@ -171,8 +171,6 @@ Copyright (from upstream file LICENSE)
licensed under the QPL (see LICENSE.QPL). licensed under the QPL (see LICENSE.QPL).
- ImageIO, in the directory "src/CGALimageIO", is licensed under the LGPL - ImageIO, in the directory "src/CGALimageIO", is licensed under the LGPL
(see LICENSE.LGPL). (see LICENSE.LGPL).
- PDB, in the directory "include/CGAL/PDB" and "src/CGALPDB" is licensed
under the LGPL (see LICENSE.LGPL).
- OpenNL, in the directory "include/CGAL/OpenNL", is licensed under the LGPL - OpenNL, in the directory "include/CGAL/OpenNL", is licensed under the LGPL
(see LICENSE.LGPL). (see LICENSE.LGPL).
@ -311,34 +309,6 @@ src/CGALimageIO.
PDB
===
The following copyright statement applies to the PDB library in
include/CGAL/PDB and src/CGALPDB.
Copyright 2004
Stanford University
This file is part of the DSR PDB Library.
The DSR PDB Library is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or (at your
option) any later version.
The DSR PDB Library is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
License for more details.
You should have received a copy of the GNU Lesser General Public License
along with the DSR PDB Library; see the file /usr/share/common-licenses/LGPL-2.1.
If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
Fifth Floor, Boston, MA 02110-1301, USA.
OpenNL OpenNL
====== ======

View File

@ -1,2 +1,2 @@
usr/share/doc/cgal/demo.tar.gz usr/share/doc/libcgal5 usr/share/doc/cgal/demo.tar.gz usr/share/doc/libcgal6
usr/share/doc/cgal/examples.tar.gz usr/share/doc/libcgal5 usr/share/doc/cgal/examples.tar.gz usr/share/doc/libcgal6

View File

@ -1 +1 @@
ipe-default-to-version-7.dpatch # currently empty

View File

@ -22,15 +22,13 @@ configure-stamp: patch-stamp
mkdir -p static mkdir -p static
cd static && QTDIR= cmake .. \ cd static && QTDIR= cmake .. \
-DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_SKIP_RPATH=TRUE -DCGAL_CXX_FLAGS=-D_REENTRANT \ -DCMAKE_SKIP_RPATH=TRUE -DBUILD_SHARED_LIBS=FALSE \
-DBUILD_SHARED_LIBS=FALSE -DWITH_demos=OFF -DWITH_examples=OFF \ -DWITH_demos=OFF -DWITH_examples=OFF
-DCGAL_SOVERSION:STRING=5.0.1
mkdir -p shared mkdir -p shared
cd shared && QTDIR= cmake .. \ cd shared && QTDIR= cmake .. \
-DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_SKIP_RPATH=TRUE -DCGAL_CXX_FLAGS=-D_REENTRANT \ -DCMAKE_SKIP_RPATH=TRUE -DBUILD_SHARED_LIBS=TRUE \
-DBUILD_SHARED_LIBS=TRUE -DWITH_demos=OFF -DWITH_examples=OFF \ -DWITH_demos=OFF -DWITH_examples=OFF
-DCGAL_SOVERSION:STRING=5.0.1
touch configure-stamp touch configure-stamp
build: build-stamp build: build-stamp
@ -43,9 +41,7 @@ build-stamp: configure-stamp
mkdir -p shared/demo/CGAL_ipelets mkdir -p shared/demo/CGAL_ipelets
cd shared/demo/CGAL_ipelets && QTDIR= cmake ../../../demo/CGAL_ipelets \ cd shared/demo/CGAL_ipelets && QTDIR= cmake ../../../demo/CGAL_ipelets \
-DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_SKIP_RPATH=TRUE -DCGAL_CXX_FLAGS=-D_REENTRANT \ -DCMAKE_SKIP_RPATH=TRUE -DBUILD_SHARED_LIBS=TRUE -DCGAL_DIR=$(CURDIR)/shared
-DBUILD_SHARED_LIBS=TRUE -DWITH_IPE_7=TRUE -DCGAL_DIR=$(CURDIR)/shared \
-DCGAL_SOVERSION:STRING=5.0.1
$(MAKE) -C shared/demo/CGAL_ipelets $(MAKE) -C shared/demo/CGAL_ipelets
ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
@ -91,14 +87,14 @@ install: build
dh_install --sourcedir=debian/tmp --list-missing dh_install --sourcedir=debian/tmp --list-missing
ln -s libcgal5 debian/libcgal-demo/usr/share/doc/libcgal-demo ln -s libcgal6 debian/libcgal-demo/usr/share/doc/libcgal-demo
mkdir -p debian/libcgal-dev/usr/share/doc mkdir -p debian/libcgal-dev/usr/share/doc
ln -s libcgal5 debian/libcgal-dev/usr/share/doc/libcgal-dev ln -s libcgal6 debian/libcgal-dev/usr/share/doc/libcgal-dev
mkdir -p debian/libcgal5-ipelets/usr/share/doc mkdir -p debian/libcgal-ipelets/usr/share/doc
ln -s libcgal5 debian/libcgal5-ipelets/usr/share/doc/libcgal5-ipelets ln -s libcgal6 debian/libcgal-ipelets/usr/share/doc/libcgal-ipelets
# install -d debian/libcgal5/DEBIAN # install -d debian/libcgal6/DEBIAN
# install -m644 debian/libcgal5.shlibs debian/libcgal5/DEBIAN/shlibs # install -m644 debian/libcgal6.shlibs debian/libcgal6/DEBIAN/shlibs
binary-indep: build install binary-indep: build install
dh_testdir -i dh_testdir -i
@ -114,8 +110,8 @@ binary-indep: build install
binary-arch: build install binary-arch: build install
dh_testdir -a dh_testdir -a
dh_testroot -a dh_testroot -a
dh_installdocs -plibcgal5 debian/copyright dh_installdocs -plibcgal6 debian/copyright
dh_installchangelogs -plibcgal5 dh_installchangelogs -plibcgal6
dh_installman -a dh_installman -a
dh_link -a dh_link -a
dh_strip -a dh_strip -a
@ -123,7 +119,7 @@ binary-arch: build install
dh_fixperms -a dh_fixperms -a
dh_makeshlibs -a dh_makeshlibs -a
dh_installdeb -a dh_installdeb -a
dh_shlibdeps -a -ldebian/libcgal5/usr/lib dh_shlibdeps -a -ldebian/libcgal6/usr/lib
dh_gencontrol -a dh_gencontrol -a
dh_md5sums -a dh_md5sums -a
dh_builddeb -a dh_builddeb -a

View File

@ -1,8 +1,23 @@
cgal (3.6.1-1~squeeze1) testing; urgency=low cgal (3.7-1~squeeze1) testing; urgency=low
* Backport for squeeze. * New upstream release.
* Rename binary package libcgal5 to libcgal6 to reflect SONAME change.
* Rename binary package libcgal5-ipelets to libcgal-ipelets because it is
not possible to install the ipelets for different SONAMEs in parallel.
* Remove ipe-default-to-version-7.dpatch: the Ipe version is now
auto-detected.
* Remove fix-core-64bit.dpatch (fixed upstream).
* Add qt4-dev-tools to Suggests: of libcgal-demo for qcollectiongenerator.
* Update Standards-Version to 3.9.1 (-D_REENTRANT no longer needed).
-- Joachim Reichel <reichel@debian.org> Sat, 03 Jul 2010 20:39:59 +0200 -- Joachim Reichel <reichel@debian.org> Sun, 17 Oct 2010 14:27:54 +0200
cgal (3.6.1-2) unstable; urgency=low
* Add fix-core-64bit.dpatch: use CORE::CHUNK_BIT instead of hard-coded
constant 14.
-- Joachim Reichel <reichel@debian.org> Tue, 24 Aug 2010 19:46:36 +0200
cgal (3.6.1-1) unstable; urgency=low cgal (3.6.1-1) unstable; urgency=low

View File

@ -6,11 +6,11 @@ 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-program-options-dev, libgmp3-dev, libmpfr-dev, libboost-thread-dev, libboost-program-options-dev, libgmp3-dev, libmpfr-dev,
libqt3-mt-dev, libqt4-dev, libqt4-opengl-dev, zlib1g-dev, libipe-dev (>= 7), ipe libqt3-mt-dev, libqt4-dev, libqt4-opengl-dev, zlib1g-dev, libipe-dev (>= 7), ipe
Standards-Version: 3.8.4 Standards-Version: 3.9.1
Homepage: http://www.cgal.org/ Homepage: http://www.cgal.org/
XS-Autobuild: yes XS-Autobuild: yes
Package: libcgal5 Package: libcgal6
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends} Depends: ${shlibs:Depends}, ${misc:Depends}
Description: C++ library for computational geometry Description: C++ library for computational geometry
@ -33,7 +33,7 @@ Description: C++ library for computational geometry
Package: libcgal-dev Package: libcgal-dev
Section: non-free/libdevel Section: non-free/libdevel
Architecture: any Architecture: any
Depends: libcgal5 (= ${binary:Version}), libboost-dev, Depends: libcgal6 (= ${binary:Version}), libboost-dev,
libboost-thread-dev, libboost-program-options-dev, libgmp3-dev, libmpfr-dev, libboost-thread-dev, libboost-program-options-dev, libgmp3-dev, libmpfr-dev,
libqt3-mt-dev, libqt4-dev, zlib1g-dev, ${misc:Depends} libqt3-mt-dev, libqt4-dev, zlib1g-dev, ${misc:Depends}
Description: C++ library for computational geometry (development files) Description: C++ library for computational geometry (development files)
@ -47,11 +47,11 @@ Description: C++ library for computational geometry (development files)
Package: libcgal-demo Package: libcgal-demo
Section: non-free/devel Section: non-free/devel
Architecture: all Architecture: all
Depends: libcgal-dev (>= ${binary:Version}), libcgal5 (>= ${binary:Version}), Depends: libcgal-dev (>= ${binary:Version}), libcgal6 (>= ${binary:Version}),
${misc:Depends} ${misc:Depends}
Suggests: liblapack-dev, libatlas-base-dev | libatlas.so.3gf, gfortran, Suggests: liblapack-dev, libatlas-base-dev | libatlas.so.3gf, gfortran,
geomview, libqglviewer-qt4-dev, libipe1-dev, libglew1.5-dev | libglew-dev, geomview, libqglviewer-qt4-dev, libipe-dev (>= 7), libglew1.5-dev | libglew-dev,
libmagick++-dev | libmagick++9-dev libmagick++-dev | libmagick++9-dev, qt4-dev-tools
Description: C++ library for computational geometry (demos) Description: C++ library for computational geometry (demos)
CGAL (Computational Geometry Algorithms Library) makes the most important CGAL (Computational Geometry Algorithms Library) makes the most important
of the solutions and methods developed in computational geometry available of the solutions and methods developed in computational geometry available
@ -60,9 +60,11 @@ Description: C++ library for computational geometry (demos)
. .
This package contains the demos and examples. This package contains the demos and examples.
Package: libcgal5-ipelets Package: libcgal-ipelets
Architecture: any Architecture: any
Depends: libcgal5 (>= ${binary:Version}), ipe (>= 7), ${shlibs:Depends}, ${misc:Depends} Depends: libcgal6 (>= ${binary:Version}), ipe (>= 7), ${shlibs:Depends}, ${misc:Depends}
Conflicts: libcgal5-ipelets
Replaces: libcgal5-ipelets
Description: C++ library for computational geometry (ipelets) Description: C++ library for computational geometry (ipelets)
CGAL (Computational Geometry Algorithms Library) makes the most important CGAL (Computational Geometry Algorithms Library) makes the most important
of the solutions and methods developed in computational geometry available of the solutions and methods developed in computational geometry available

View File

@ -156,8 +156,8 @@ Copyright (from upstream file LICENSE)
The source code of the CGAL library can be found in the directories The source code of the CGAL library can be found in the directories
"src/CGAL", "src/CGALQt", "src/CGALQt4" and "include/CGAL" (with the "src/CGAL", "src/CGALQt", "src/CGALQt4" and "include/CGAL" (with the
exception of "include/CGAL/CORE", "include/CGAL/OpenNL" and exception of "include/CGAL/CORE", and "include/CGAL/OpenNL").
"include/CGAL/PDB"). It is specified in each file of the CGAL library which It is specified in each file of the CGAL library which
license applies to it. This is either the GNU Lesser General Public License license applies to it. This is either the GNU Lesser General Public License
(as published by the Free Software Foundation; version 2.1 of the License) (as published by the Free Software Foundation; version 2.1 of the License)
or the Q Public License (version 1.0), *depending on each file*. The texts or the Q Public License (version 1.0), *depending on each file*. The texts
@ -171,8 +171,6 @@ Copyright (from upstream file LICENSE)
licensed under the QPL (see LICENSE.QPL). licensed under the QPL (see LICENSE.QPL).
- ImageIO, in the directory "src/CGALimageIO", is licensed under the LGPL - ImageIO, in the directory "src/CGALimageIO", is licensed under the LGPL
(see LICENSE.LGPL). (see LICENSE.LGPL).
- PDB, in the directory "include/CGAL/PDB" and "src/CGALPDB" is licensed
under the LGPL (see LICENSE.LGPL).
- OpenNL, in the directory "include/CGAL/OpenNL", is licensed under the LGPL - OpenNL, in the directory "include/CGAL/OpenNL", is licensed under the LGPL
(see LICENSE.LGPL). (see LICENSE.LGPL).
@ -311,34 +309,6 @@ src/CGALimageIO.
PDB
===
The following copyright statement applies to the PDB library in
include/CGAL/PDB and src/CGALPDB.
Copyright 2004
Stanford University
This file is part of the DSR PDB Library.
The DSR PDB Library is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or (at your
option) any later version.
The DSR PDB Library is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
License for more details.
You should have received a copy of the GNU Lesser General Public License
along with the DSR PDB Library; see the file /usr/share/common-licenses/LGPL-2.1.
If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
Fifth Floor, Boston, MA 02110-1301, USA.
OpenNL OpenNL
====== ======

View File

@ -1,2 +1,2 @@
usr/share/doc/cgal/demo.tar.gz usr/share/doc/libcgal5 usr/share/doc/cgal/demo.tar.gz usr/share/doc/libcgal6
usr/share/doc/cgal/examples.tar.gz usr/share/doc/libcgal5 usr/share/doc/cgal/examples.tar.gz usr/share/doc/libcgal6

View File

@ -1 +1 @@
ipe-default-to-version-7.dpatch # currently empty

View File

@ -22,15 +22,13 @@ configure-stamp: patch-stamp
mkdir -p static mkdir -p static
cd static && QTDIR= cmake .. \ cd static && QTDIR= cmake .. \
-DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_SKIP_RPATH=TRUE -DCGAL_CXX_FLAGS=-D_REENTRANT \ -DCMAKE_SKIP_RPATH=TRUE -DBUILD_SHARED_LIBS=FALSE \
-DBUILD_SHARED_LIBS=FALSE -DWITH_demos=OFF -DWITH_examples=OFF \ -DWITH_demos=OFF -DWITH_examples=OFF
-DCGAL_SOVERSION:STRING=5.0.1
mkdir -p shared mkdir -p shared
cd shared && QTDIR= cmake .. \ cd shared && QTDIR= cmake .. \
-DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_SKIP_RPATH=TRUE -DCGAL_CXX_FLAGS=-D_REENTRANT \ -DCMAKE_SKIP_RPATH=TRUE -DBUILD_SHARED_LIBS=TRUE \
-DBUILD_SHARED_LIBS=TRUE -DWITH_demos=OFF -DWITH_examples=OFF \ -DWITH_demos=OFF -DWITH_examples=OFF
-DCGAL_SOVERSION:STRING=5.0.1
touch configure-stamp touch configure-stamp
build: build-stamp build: build-stamp
@ -43,9 +41,7 @@ build-stamp: configure-stamp
mkdir -p shared/demo/CGAL_ipelets mkdir -p shared/demo/CGAL_ipelets
cd shared/demo/CGAL_ipelets && QTDIR= cmake ../../../demo/CGAL_ipelets \ cd shared/demo/CGAL_ipelets && QTDIR= cmake ../../../demo/CGAL_ipelets \
-DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_SKIP_RPATH=TRUE -DCGAL_CXX_FLAGS=-D_REENTRANT \ -DCMAKE_SKIP_RPATH=TRUE -DBUILD_SHARED_LIBS=TRUE -DCGAL_DIR=$(CURDIR)/shared
-DBUILD_SHARED_LIBS=TRUE -DWITH_IPE_7=TRUE -DCGAL_DIR=$(CURDIR)/shared \
-DCGAL_SOVERSION:STRING=5.0.1
$(MAKE) -C shared/demo/CGAL_ipelets $(MAKE) -C shared/demo/CGAL_ipelets
ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
@ -91,14 +87,14 @@ install: build
dh_install --sourcedir=debian/tmp --list-missing dh_install --sourcedir=debian/tmp --list-missing
ln -s libcgal5 debian/libcgal-demo/usr/share/doc/libcgal-demo ln -s libcgal6 debian/libcgal-demo/usr/share/doc/libcgal-demo
mkdir -p debian/libcgal-dev/usr/share/doc mkdir -p debian/libcgal-dev/usr/share/doc
ln -s libcgal5 debian/libcgal-dev/usr/share/doc/libcgal-dev ln -s libcgal6 debian/libcgal-dev/usr/share/doc/libcgal-dev
mkdir -p debian/libcgal5-ipelets/usr/share/doc mkdir -p debian/libcgal-ipelets/usr/share/doc
ln -s libcgal5 debian/libcgal5-ipelets/usr/share/doc/libcgal5-ipelets ln -s libcgal6 debian/libcgal-ipelets/usr/share/doc/libcgal-ipelets
# install -d debian/libcgal5/DEBIAN # install -d debian/libcgal6/DEBIAN
# install -m644 debian/libcgal5.shlibs debian/libcgal5/DEBIAN/shlibs # install -m644 debian/libcgal6.shlibs debian/libcgal6/DEBIAN/shlibs
binary-indep: build install binary-indep: build install
dh_testdir -i dh_testdir -i
@ -114,8 +110,8 @@ binary-indep: build install
binary-arch: build install binary-arch: build install
dh_testdir -a dh_testdir -a
dh_testroot -a dh_testroot -a
dh_installdocs -plibcgal5 debian/copyright dh_installdocs -plibcgal6 debian/copyright
dh_installchangelogs -plibcgal5 dh_installchangelogs -plibcgal6
dh_installman -a dh_installman -a
dh_link -a dh_link -a
dh_strip -a dh_strip -a
@ -123,7 +119,7 @@ binary-arch: build install
dh_fixperms -a dh_fixperms -a
dh_makeshlibs -a dh_makeshlibs -a
dh_installdeb -a dh_installdeb -a
dh_shlibdeps -a -ldebian/libcgal5/usr/lib dh_shlibdeps -a -ldebian/libcgal6/usr/lib
dh_gencontrol -a dh_gencontrol -a
dh_md5sums -a dh_md5sums -a
dh_builddeb -a dh_builddeb -a