From 157551683b553362ae765e7c24d459a0f5a3b02c Mon Sep 17 00:00:00 2001 From: Joachim Reichel Date: Mon, 4 Jun 2007 20:48:24 +0000 Subject: [PATCH] copy changes from 3.3 branch until r38960 --- Maintenance/deb/README | 21 ++++++++++++------- Maintenance/deb/TODO | 2 -- Maintenance/deb/etch/debian/README.Debian | 6 +++--- Maintenance/deb/etch/debian/changelog | 6 +++--- .../etch/debian/misc/cgal_create_makefile.1 | 2 +- Maintenance/deb/sarge/debian/README.Debian | 6 +++--- Maintenance/deb/sarge/debian/changelog | 6 +++--- .../sarge/debian/misc/cgal_create_makefile.1 | 2 +- Maintenance/deb/sid/debian/README.Debian | 6 +++--- Maintenance/deb/sid/debian/changelog | 6 +++--- .../sid/debian/misc/cgal_create_makefile.1 | 2 +- Maintenance/deb/sid/debian/patches/00list | 1 + 12 files changed, 36 insertions(+), 30 deletions(-) diff --git a/Maintenance/deb/README b/Maintenance/deb/README index 95754616f2d..5abb438529e 100644 --- a/Maintenance/deb/README +++ b/Maintenance/deb/README @@ -5,9 +5,15 @@ backport for etch: - debian/changelog: * adjust version suffix from -X to -X~etch1 * adjust suite from unstable to stable - * maintain other differences +- debian/patches/boost-library-name.dpatch + * remove +- debian/patches/00list + * adjust backport for sarge: +- debian/changelog: + * adjust version suffix from -X to -Ysarge1 (with Y=X-1) + * adjust suite from unstable to oldstable - debian/control: * adjust Standards-Version: to 3.6.1 * adjust debhelper dependency from >= 5 to >= 4 @@ -16,11 +22,12 @@ backport for sarge: * replace binary: by Source- - debian/compat: * adjust debhelper compatibility level from 5 to 4 -- debian/changelog: - * adjust version suffix from -X to -Ysarge1 (with Y=X-1) - * adjust suite from unstable to oldstable - * maintain other differences +- debian/patches/boost-library-name.dpatch + * remove +- debian/patches/00list + * adjust tagging: -svn copy $SVNROOT/trunk/Maintenance/deb/sid/debian $SVNROOT/tags/debian/3.2.1-1 -svn copy $SVNROOT/trunk/Maintenance/deb/sarge/debian $SVNROOT/tags/debian/3.2.1-0sarge1 +svn copy $SVNROOT/trunk/Maintenance/deb/sid/debian $SVNROOT/tags/debian/3.3-1 +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 diff --git a/Maintenance/deb/TODO b/Maintenance/deb/TODO index d48d5f583d2..d82dbbb34ce 100644 --- a/Maintenance/deb/TODO +++ b/Maintenance/deb/TODO @@ -1,5 +1,3 @@ TODO ==== -- update list of authors in debian/copyright -- adjust date in manpage diff --git a/Maintenance/deb/etch/debian/README.Debian b/Maintenance/deb/etch/debian/README.Debian index 8ecc9adb0cc..74ab94e8e15 100644 --- a/Maintenance/deb/etch/debian/README.Debian +++ b/Maintenance/deb/etch/debian/README.Debian @@ -20,11 +20,11 @@ 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 -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 -/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 you should point CGAL_MAKEFILE to the modified copy of the template. - -- Joachim Reichel Thu, 03 May 2007 22:33:05 +0200 + -- Joachim Reichel Mon, 22 May 2006 20:46:24 +0200 diff --git a/Maintenance/deb/etch/debian/changelog b/Maintenance/deb/etch/debian/changelog index 001d8486fbc..bb624c51e31 100644 --- a/Maintenance/deb/etch/debian/changelog +++ b/Maintenance/deb/etch/debian/changelog @@ -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 Fri, 27 Apr 2007 21:46:52 +0200 + -- Joachim Reichel Sun, 3 Jun 2007 09:36:36 +0200 cgal (3.2.1-2) unstable; urgency=low diff --git a/Maintenance/deb/etch/debian/misc/cgal_create_makefile.1 b/Maintenance/deb/etch/debian/misc/cgal_create_makefile.1 index 5ec45b637dd..914d5b94c3e 100644 --- a/Maintenance/deb/etch/debian/misc/cgal_create_makefile.1 +++ b/Maintenance/deb/etch/debian/misc/cgal_create_makefile.1 @@ -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 cgal_create_makefile \- create makefiles for applications using CGAL .SH SYNOPSIS diff --git a/Maintenance/deb/sarge/debian/README.Debian b/Maintenance/deb/sarge/debian/README.Debian index 8ecc9adb0cc..74ab94e8e15 100644 --- a/Maintenance/deb/sarge/debian/README.Debian +++ b/Maintenance/deb/sarge/debian/README.Debian @@ -20,11 +20,11 @@ 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 -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 -/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 you should point CGAL_MAKEFILE to the modified copy of the template. - -- Joachim Reichel Thu, 03 May 2007 22:33:05 +0200 + -- Joachim Reichel Mon, 22 May 2006 20:46:24 +0200 diff --git a/Maintenance/deb/sarge/debian/changelog b/Maintenance/deb/sarge/debian/changelog index 647b3f3eb51..50e8974219d 100644 --- a/Maintenance/deb/sarge/debian/changelog +++ b/Maintenance/deb/sarge/debian/changelog @@ -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 Fri, 27 Apr 2007 21:46:52 +0200 + -- Joachim Reichel Sun, 3 Jun 2007 09:36:36 +0200 cgal (3.2.1-2) unstable; urgency=low diff --git a/Maintenance/deb/sarge/debian/misc/cgal_create_makefile.1 b/Maintenance/deb/sarge/debian/misc/cgal_create_makefile.1 index 5ec45b637dd..914d5b94c3e 100644 --- a/Maintenance/deb/sarge/debian/misc/cgal_create_makefile.1 +++ b/Maintenance/deb/sarge/debian/misc/cgal_create_makefile.1 @@ -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 cgal_create_makefile \- create makefiles for applications using CGAL .SH SYNOPSIS diff --git a/Maintenance/deb/sid/debian/README.Debian b/Maintenance/deb/sid/debian/README.Debian index 8ecc9adb0cc..74ab94e8e15 100644 --- a/Maintenance/deb/sid/debian/README.Debian +++ b/Maintenance/deb/sid/debian/README.Debian @@ -20,11 +20,11 @@ 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 -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 -/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 you should point CGAL_MAKEFILE to the modified copy of the template. - -- Joachim Reichel Thu, 03 May 2007 22:33:05 +0200 + -- Joachim Reichel Mon, 22 May 2006 20:46:24 +0200 diff --git a/Maintenance/deb/sid/debian/changelog b/Maintenance/deb/sid/debian/changelog index 8e238f93977..e60b75c2678 100644 --- a/Maintenance/deb/sid/debian/changelog +++ b/Maintenance/deb/sid/debian/changelog @@ -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 Fri, 27 Apr 2007 21:46:52 +0200 + -- Joachim Reichel Sun, 3 Jun 2007 09:36:36 +0200 cgal (3.2.1-2) unstable; urgency=low diff --git a/Maintenance/deb/sid/debian/misc/cgal_create_makefile.1 b/Maintenance/deb/sid/debian/misc/cgal_create_makefile.1 index 5ec45b637dd..914d5b94c3e 100644 --- a/Maintenance/deb/sid/debian/misc/cgal_create_makefile.1 +++ b/Maintenance/deb/sid/debian/misc/cgal_create_makefile.1 @@ -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 cgal_create_makefile \- create makefiles for applications using CGAL .SH SYNOPSIS diff --git a/Maintenance/deb/sid/debian/patches/00list b/Maintenance/deb/sid/debian/patches/00list index 3a987ce29a4..46bec00d8ef 100644 --- a/Maintenance/deb/sid/debian/patches/00list +++ b/Maintenance/deb/sid/debian/patches/00list @@ -1,2 +1,3 @@ build-library.dpatch cgal-create-makefile.dpatch +boost-library-name.dpatch