diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Documentation/pbuilder-doc.xml | 47 | ||||
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | pbuilder-modules | 6 | ||||
| -rw-r--r-- | pbuilder.8 | 8 | ||||
| -rwxr-xr-x | pbuilderrc | 2 |
6 files changed, 46 insertions, 32 deletions
@@ -1,5 +1,13 @@ 2007-04-10 Junichi Uekawa <dancer@debian.org> + * 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 <dancer@debian.org> 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 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "/usr/share/sgml/docbook/dtd/xml/4.2/docbookx.dtd"> <!-- the original of this documentation is in pbuilder source tar-ball, - and the latest version is found in CVS repository. --> + and the latest version is found in git repository. --> <book xml:lang="en"> <bookinfo> - <date>2006-5-24</date> + <date>2007-4-10</date> <title>pbuilder User's Manual</title> <abbrev>pbuilder-doc</abbrev> <subtitle>Usage and operations</subtitle> - <releaseinfo>documentation in progress ($Id$)</releaseinfo> + <releaseinfo>documentation in progress</releaseinfo> <authorgroup> <author> <firstname>Junichi</firstname> @@ -18,7 +18,7 @@ </bookinfo> <!-- FIXME: consistent markup of commands, files, and variables --> - <chapter> + <chapter id="introduction"> <title>Introducing pbuilder</title> <sect1 id="aim"> <title>Aims of pbuilder</title> @@ -106,7 +106,7 @@ See the pbuilderrc.5 manual page for details. </para> </sect1> - <sect1> + <sect1 id="basechroot"> <title>Updating the base chroot image</title> <para><command>pbuilder update</command> will update the chroot image. @@ -390,7 +390,7 @@ </listitem> </itemizedlist> </sect1> - <sect1> + <sect1 id="autobackport"> <title>Auto-backporting scripts</title> <para> There are some people who use <command>pbuilder</command> to automatically back-port @@ -721,7 +721,7 @@ read documented. This portion was initially available in README.Debian file, but moved here. </para> - <sect1> + <sect1 id="pbuildercreatefail"> <title>pbuilder create fails</title> <para> It often happens that <command>pbuilder</command> 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 <filename>pbuilder-distribution.sh</filename> is provided as an example. Invoking the script as - <filename>pbuilder-sarge</filename> will invoke - <command>pbuilder</command> with a sarge chroot. + <filename>pbuilder-etch</filename> will invoke + <command>pbuilder</command> with a etch chroot. </para> </sect1> - <sect1> + <sect1 id="usingspecialaptsources"> <title>Using special apt sources lists, and local packages</title> <para> If you have some very specialised requirements on your @@ -856,7 +856,7 @@ cd /var/cache/pbuilder/result/ This way, you can use <filename>deb file:/var/cache/pbuilder/result</filename> </para> </sect1> - <sect1> + <sect1 id="apt-getupdateonbuild-depend"> <title>How to get pbuilder to run apt-get update before trying to satisfy build-dependency</title> <para> You can use hook scripts for this. @@ -868,7 +868,7 @@ cd /var/cache/pbuilder/result/ </ulink> </para> </sect1> - <sect1> + <sect1 id="bashprompt"> <title>Different bash prompts inside pbuilder login</title> <para> To make distinguishing bash prompts inside @@ -895,7 +895,7 @@ cd /var/cache/pbuilder/result/ export PS1="pbuild chroot 32165 # " </screen> </sect1> - <sect1> + <sect1 id="packagecachearchives"> <title>Using /var/cache/apt/archives for the package cache</title> <para> 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. </para> </sect1> - <sect1> + <sect1 id="lninvalidcrossdevicelink"> <title>Avoiding the "ln: Invalid cross-device link" message</title> <para> By default, <command>pbuilder</command> uses hard links to @@ -960,7 +960,7 @@ cd /var/cache/pbuilder/result/ pbuilderrc file. </para> </sect1> - <sect1> + <sect1 id="fakechroot"> <title>Using fakechroot</title> <para> It is possible to use <command>fakechroot</command> instead of @@ -1185,7 +1185,7 @@ git-clone ssh://git.debian.org/git/pbuilder/pbuilder.git which puts the result in <filename>run-test-regression.log</filename>. Currently, run-test.sh is ran automatically daily to ensure that pbuilder is working. </para> - <table> + <table id="dirtestsuites"> <title>Directory structure of the testsuite</title> <tgroup cols="2"> <colspec colnum="1" colname="c1" colwidth="1*" align="left" /> @@ -1291,7 +1291,7 @@ git-clone ssh://git.debian.org/git/pbuilder/pbuilder.git and mounting file systems inside it is considered harmful. </para> </sect1> - <sect1> + <sect1 id="runningprograms"> <title>Running little programs inside the chroot</title> <para> To facilitate using <command>pbuilder</command> for other uses, @@ -1362,10 +1362,15 @@ $ pdebuild --pbuilder cowbuilder </para> <sect2 id="sargecowdancer"> <title>Using cowdancer for sarge</title> + <para> + This section is mostly obsolete now that etch is released, + but left for reference, and will be removed after lenny + release. + </para> <para> - 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. </para> <para> 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 <command>dchroot</command> with the following commands: <screen> -# 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 </screen> </para> 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 <dancer@debian.org> Mon, 2 Apr 2007 08:42:59 +0900 + + -- Junichi Uekawa <dancer@debian.org> 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] @@ -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". @@ -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" |