copy changes from 3.3 branch until r38960

This commit is contained in:
Joachim Reichel 2007-06-04 20:48:24 +00:00
parent b9947ed224
commit 157551683b
12 changed files with 36 additions and 30 deletions

View File

@ -5,9 +5,15 @@ backport for etch:
- debian/changelog: - debian/changelog:
* adjust version suffix from -X to -X~etch1 * adjust version suffix from -X to -X~etch1
* adjust suite from unstable to stable * adjust suite from unstable to stable
* maintain other differences - debian/patches/boost-library-name.dpatch
* remove
- debian/patches/00list
* adjust
backport for sarge: backport for sarge:
- debian/changelog:
* adjust version suffix from -X to -Ysarge1 (with Y=X-1)
* adjust suite from unstable to oldstable
- debian/control: - debian/control:
* adjust Standards-Version: to 3.6.1 * adjust Standards-Version: to 3.6.1
* adjust debhelper dependency from >= 5 to >= 4 * adjust debhelper dependency from >= 5 to >= 4
@ -16,11 +22,12 @@ backport for sarge:
* replace binary: by Source- * replace binary: by Source-
- debian/compat: - debian/compat:
* adjust debhelper compatibility level from 5 to 4 * adjust debhelper compatibility level from 5 to 4
- debian/changelog: - debian/patches/boost-library-name.dpatch
* adjust version suffix from -X to -Ysarge1 (with Y=X-1) * remove
* adjust suite from unstable to oldstable - debian/patches/00list
* maintain other differences * adjust
tagging: tagging:
svn copy $SVNROOT/trunk/Maintenance/deb/sid/debian $SVNROOT/tags/debian/3.2.1-1 svn copy $SVNROOT/trunk/Maintenance/deb/sid/debian $SVNROOT/tags/debian/3.3-1
svn copy $SVNROOT/trunk/Maintenance/deb/sarge/debian $SVNROOT/tags/debian/3.2.1-0sarge1 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

View File

@ -1,5 +1,3 @@
TODO TODO
==== ====
- update list of authors in debian/copyright
- adjust date in manpage

View File

@ -20,11 +20,11 @@ CGAL_MAKEFILE
The CGAL documentation asks you to set the environment variable CGAL_MAKEFILE The CGAL documentation asks you to set the environment variable CGAL_MAKEFILE
to the makefile template that was generated during the configuration. This to the makefile template that was generated during the configuration. This
makefile template is located at /usr/share/cgal/cgal.mk. The examples and makefile template is located at /usr/share/cgal/makefile. The examples and
demos as well as the script cgal_create_makefile have been modified to use demos as well as the script cgal_create_makefile have been modified to use
/usr/share/cgal/cgal.mk as default. Therefore, it is *not* necessary to set /usr/share/cgal/makefile as default. Therefore, it is *not* necessary to set
CGAL_MAKEFILE (but it does not hurt). If you want to modify the template, then CGAL_MAKEFILE (but it does not hurt). If you want to modify the template, then
you should point CGAL_MAKEFILE to the modified copy of the template. you should point CGAL_MAKEFILE to the modified copy of the template.
-- Joachim Reichel <joachim.reichel@gmx.de> Thu, 03 May 2007 22:33:05 +0200 -- Joachim Reichel <joachim.reichel@gmx.de> Mon, 22 May 2006 20:46:24 +0200

View File

@ -1,8 +1,8 @@
cgal (3.3~I-311-0~etch1) stable; urgency=low cgal (3.3-1~etch1) stable; urgency=low
* New upstream release * New upstream release.
-- Joachim Reichel <joachim.reichel@gmx.de> Fri, 27 Apr 2007 21:46:52 +0200 -- Joachim Reichel <joachim.reichel@gmx.de> Sun, 3 Jun 2007 09:36:36 +0200
cgal (3.2.1-2) unstable; urgency=low cgal (3.2.1-2) unstable; urgency=low

View File

@ -1,4 +1,4 @@
.TH CGAL_CREATE_MAKEFILE "1" "May 2006" "CGAL 3.3" "User Commands" .TH CGAL_CREATE_MAKEFILE "1" "May 2007" "CGAL 3.3" "User Commands"
.SH NAME .SH NAME
cgal_create_makefile \- create makefiles for applications using CGAL cgal_create_makefile \- create makefiles for applications using CGAL
.SH SYNOPSIS .SH SYNOPSIS

View File

@ -20,11 +20,11 @@ CGAL_MAKEFILE
The CGAL documentation asks you to set the environment variable CGAL_MAKEFILE The CGAL documentation asks you to set the environment variable CGAL_MAKEFILE
to the makefile template that was generated during the configuration. This to the makefile template that was generated during the configuration. This
makefile template is located at /usr/share/cgal/cgal.mk. The examples and makefile template is located at /usr/share/cgal/makefile. The examples and
demos as well as the script cgal_create_makefile have been modified to use demos as well as the script cgal_create_makefile have been modified to use
/usr/share/cgal/cgal.mk as default. Therefore, it is *not* necessary to set /usr/share/cgal/makefile as default. Therefore, it is *not* necessary to set
CGAL_MAKEFILE (but it does not hurt). If you want to modify the template, then CGAL_MAKEFILE (but it does not hurt). If you want to modify the template, then
you should point CGAL_MAKEFILE to the modified copy of the template. you should point CGAL_MAKEFILE to the modified copy of the template.
-- Joachim Reichel <joachim.reichel@gmx.de> Thu, 03 May 2007 22:33:05 +0200 -- Joachim Reichel <joachim.reichel@gmx.de> Mon, 22 May 2006 20:46:24 +0200

View File

@ -1,8 +1,8 @@
cgal (3.2.99.311-0sarge1) oldstable; urgency=low cgal (3.3-0sarge1) oldstable; urgency=low
* New upstream release * New upstream release.
-- Joachim Reichel <joachim.reichel@gmx.de> Fri, 27 Apr 2007 21:46:52 +0200 -- Joachim Reichel <joachim.reichel@gmx.de> Sun, 3 Jun 2007 09:36:36 +0200
cgal (3.2.1-2) unstable; urgency=low cgal (3.2.1-2) unstable; urgency=low

View File

@ -1,4 +1,4 @@
.TH CGAL_CREATE_MAKEFILE "1" "May 2006" "CGAL 3.3" "User Commands" .TH CGAL_CREATE_MAKEFILE "1" "May 2007" "CGAL 3.3" "User Commands"
.SH NAME .SH NAME
cgal_create_makefile \- create makefiles for applications using CGAL cgal_create_makefile \- create makefiles for applications using CGAL
.SH SYNOPSIS .SH SYNOPSIS

View File

@ -20,11 +20,11 @@ CGAL_MAKEFILE
The CGAL documentation asks you to set the environment variable CGAL_MAKEFILE The CGAL documentation asks you to set the environment variable CGAL_MAKEFILE
to the makefile template that was generated during the configuration. This to the makefile template that was generated during the configuration. This
makefile template is located at /usr/share/cgal/cgal.mk. The examples and makefile template is located at /usr/share/cgal/makefile. The examples and
demos as well as the script cgal_create_makefile have been modified to use demos as well as the script cgal_create_makefile have been modified to use
/usr/share/cgal/cgal.mk as default. Therefore, it is *not* necessary to set /usr/share/cgal/makefile as default. Therefore, it is *not* necessary to set
CGAL_MAKEFILE (but it does not hurt). If you want to modify the template, then CGAL_MAKEFILE (but it does not hurt). If you want to modify the template, then
you should point CGAL_MAKEFILE to the modified copy of the template. you should point CGAL_MAKEFILE to the modified copy of the template.
-- Joachim Reichel <joachim.reichel@gmx.de> Thu, 03 May 2007 22:33:05 +0200 -- Joachim Reichel <joachim.reichel@gmx.de> Mon, 22 May 2006 20:46:24 +0200

View File

@ -1,8 +1,8 @@
cgal (3.3~I-311-1) unstable; urgency=low cgal (3.3-1) unstable; urgency=low
* New upstream release * New upstream release.
-- Joachim Reichel <joachim.reichel@gmx.de> Fri, 27 Apr 2007 21:46:52 +0200 -- Joachim Reichel <joachim.reichel@gmx.de> Sun, 3 Jun 2007 09:36:36 +0200
cgal (3.2.1-2) unstable; urgency=low cgal (3.2.1-2) unstable; urgency=low

View File

@ -1,4 +1,4 @@
.TH CGAL_CREATE_MAKEFILE "1" "May 2006" "CGAL 3.3" "User Commands" .TH CGAL_CREATE_MAKEFILE "1" "May 2007" "CGAL 3.3" "User Commands"
.SH NAME .SH NAME
cgal_create_makefile \- create makefiles for applications using CGAL cgal_create_makefile \- create makefiles for applications using CGAL
.SH SYNOPSIS .SH SYNOPSIS

View File

@ -1,2 +1,3 @@
build-library.dpatch build-library.dpatch
cgal-create-makefile.dpatch cgal-create-makefile.dpatch
boost-library-name.dpatch