From 9046dee07371abe268193e9c5e3df478a9f5794d Mon Sep 17 00:00:00 2001 From: Junichi Uekawa Date: Tue, 10 Apr 2007 08:50:56 +0900 Subject: minor documentation update for etch release --- ChangeLog | 8 +++++++ Documentation/pbuilder-doc.xml | 47 +++++++++++++++++++++++------------------- debian/changelog | 7 ++++--- pbuilder-modules | 6 +++--- pbuilder.8 | 8 +++---- pbuilderrc | 2 +- 6 files changed, 46 insertions(+), 32 deletions(-) diff --git a/ChangeLog b/ChangeLog index d0f1424..66bb237 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2007-04-10 Junichi Uekawa + * Documentation/pbuilder-doc.xml: update documentation + + * pbuilder-modules: say lenny instead of sarge + + * pbuilder.8: lenny is supported architecture, not sarge + + * pbuilderrc: make lenny default + * testsuite/run-test.sh: add lenny 2007-04-03 Junichi Uekawa diff --git a/Documentation/pbuilder-doc.xml b/Documentation/pbuilder-doc.xml index ff3d418..a367127 100644 --- a/Documentation/pbuilder-doc.xml +++ b/Documentation/pbuilder-doc.xml @@ -1,14 +1,14 @@ + and the latest version is found in git repository. --> - 2006-5-24 + 2007-4-10 pbuilder User's Manual pbuilder-doc Usage and operations - documentation in progress ($Id$) + documentation in progress Junichi @@ -18,7 +18,7 @@ - + Introducing pbuilder Aims of pbuilder @@ -106,7 +106,7 @@ See the pbuilderrc.5 manual page for details. - + Updating the base chroot image pbuilder update will update the chroot image. @@ -390,7 +390,7 @@ - + Auto-backporting scripts There are some people who use pbuilder to automatically back-port @@ -721,7 +721,7 @@ read documented. This portion was initially available in README.Debian file, but moved here. - + pbuilder create fails It often happens that pbuilder cannot create the latest chroot. @@ -810,11 +810,11 @@ $ sudo pbuilder update --hookdir ~/loginhooks/E10shell with scripts that reduce the amount of typing. An example script pbuilder-distribution.sh is provided as an example. Invoking the script as - pbuilder-sarge will invoke - pbuilder with a sarge chroot. + pbuilder-etch will invoke + pbuilder with a etch chroot. - + Using special apt sources lists, and local packages If you have some very specialised requirements on your @@ -856,7 +856,7 @@ cd /var/cache/pbuilder/result/ This way, you can use deb file:/var/cache/pbuilder/result - + How to get pbuilder to run apt-get update before trying to satisfy build-dependency You can use hook scripts for this. @@ -868,7 +868,7 @@ cd /var/cache/pbuilder/result/ - + Different bash prompts inside pbuilder login To make distinguishing bash prompts inside @@ -895,7 +895,7 @@ cd /var/cache/pbuilder/result/ export PS1="pbuild chroot 32165 # " - + Using /var/cache/apt/archives for the package cache For the help of low-bandwidth systems, it is possible to use @@ -949,7 +949,7 @@ cd /var/cache/pbuilder/result/ on people building the package. - + Avoiding the "ln: Invalid cross-device link" message By default, pbuilder uses hard links to @@ -960,7 +960,7 @@ cd /var/cache/pbuilder/result/ pbuilderrc file. - + Using fakechroot It is possible to use fakechroot instead of @@ -1185,7 +1185,7 @@ git-clone ssh://git.debian.org/git/pbuilder/pbuilder.git which puts the result in run-test-regression.log. Currently, run-test.sh is ran automatically daily to ensure that pbuilder is working. - +
Directory structure of the testsuite @@ -1291,7 +1291,7 @@ git-clone ssh://git.debian.org/git/pbuilder/pbuilder.git and mounting file systems inside it is considered harmful. - + Running little programs inside the chroot To facilitate using pbuilder for other uses, @@ -1362,10 +1362,15 @@ $ pdebuild --pbuilder cowbuilder Using cowdancer for sarge + + This section is mostly obsolete now that etch is released, + but left for reference, and will be removed after lenny + release. + - cowdancer was introduced after the release of sarge; if you want to - build packages for sarge with cowbuilder, you will need to workaround - its unavailability. + cowdancer was introduced after the release of Debian sarge; + if you want to build packages for sarge with cowbuilder, you + will need to workaround its unavailability. One way to workaround the problem is to set APTCONFDIR in pbuilderrc @@ -1416,8 +1421,8 @@ Pin-Priority: 950 It should be possible to create chroot images for dchroot with the following commands: -# pbuilder create --distribution sarge --no-targz --basetgz /chroot/sarge # pbuilder create --distribution etch --no-targz --basetgz /chroot/etch +# pbuilder create --distribution lenny --no-targz --basetgz /chroot/lenny # pbuilder create --distribution sid --no-targz --basetgz /chroot/sid diff --git a/debian/changelog b/debian/changelog index d28facb..11833d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,12 +6,13 @@ pbuilder (0.166) UNRELEASED; urgency=low * Bug fix: "pbuilder-uml: --uml-ip broken", thanks to Paul TBBle Hampson (Closes: #416920). * Manual page SEE ALSO fix, '.RI'->'.BR' (closes: #409135) - + * minor update to documentation. + [ Loic Minier ] * New pbuilder-satisfydepends-aptitude resolver based on aptitude; based on an idea by Mike Hommey; closes: #337015. - - -- Junichi Uekawa Mon, 2 Apr 2007 08:42:59 +0900 + + -- Junichi Uekawa Tue, 10 Apr 2007 08:50:37 +0900 pbuilder (0.165) unstable; urgency=low diff --git a/pbuilder-modules b/pbuilder-modules index c42de9b..04a97d1 100644 --- a/pbuilder-modules +++ b/pbuilder-modules @@ -28,10 +28,10 @@ pbuilder [operation] [pbuilder-options] pdebuild [pdebuild-options] -- [pbuilder-options] command lines: -pbuilder create [--basetgz base.tgz-path] [--distribution sarge|etch|sid|experimental] +pbuilder create [--basetgz base.tgz-path] [--distribution etch|lenny|sid|experimental] Creates a base.tgz -pbuilder update [--basetgz base.tgz-path] [--distribution sarge|etch|sid|experimental] +pbuilder update [--basetgz base.tgz-path] [--distribution etch|lenny|sid|experimental] Updates a base.tgz pbuilder build [--basetgz base.tgz-path] pbuilder_2.2.0-1.dsc @@ -53,7 +53,7 @@ pbuilder-options: --mirror [mirror location] --othermirror [other mirror location in apt deb-line format, delimited with | signs] --http-proxy [proxy] - --distribution [distribution(sarge|sid|etch|experimental)] + --distribution [distribution(sid|etch|lenny|experimental)] --buildresult [location-to-copy-build-result] --aptcache [location of retrieved package files] --removepackages [packages-to-remove on pbuilder create] diff --git a/pbuilder.8 b/pbuilder.8 index 0382b94..3bd4aa9 100644 --- a/pbuilder.8 +++ b/pbuilder.8 @@ -1,4 +1,4 @@ -.TH "pbuilder" 8 "2005 Jul 10" "Debian" "pbuilder" +.TH "pbuilder" 8 "2007 Apr 10" "Debian" "pbuilder" .SH NAME pbuilder \- personal package builder .SH SYNOPSIS @@ -39,8 +39,8 @@ the given options and settings in the configuration file for the base.tgz. For example, to switch the distribution of an existing -base.tgz to etch, specify the -.B "\-\-distribution etch \-\-override\-config" +base.tgz to lenny, specify the +.B "\-\-distribution lenny \-\-override\-config" options to update. .TP @@ -194,8 +194,8 @@ should do. .BI "\-\-distribution [" "distribution" "]" Specifies the distribution used. Currently the supported values are .B "sid" -.B "sarge" .B "etch" +.B "lenny" and .B "experimental". diff --git a/pbuilderrc b/pbuilderrc index 1b8da3b..bab2ff3 100755 --- a/pbuilderrc +++ b/pbuilderrc @@ -17,7 +17,7 @@ USEDEVFS=no BUILDRESULT=/var/cache/pbuilder/result/ # specifying the distribution forces the distribution on "pbuilder update" -#DISTRIBUTION=sarge +#DISTRIBUTION=lenny #specify the cache for APT APTCACHE="/var/cache/pbuilder/aptcache/" APTCACHEHARDLINK="yes" -- cgit v1.2.3