aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Documentation/pbuilder-doc.xml9
-rw-r--r--debian/changelog4
-rw-r--r--pbuilder-modules2
-rw-r--r--pdebuild2
5 files changed, 16 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index eb8eb82..322322e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2006-04-22 Junichi Uekawa <dancer@debian.org>
+ * Documentation/pbuilder-doc.xml: update docs on user-mode-linux usage.
+ add reference to PDF version.
+
* pdebuild: give --uid/--gid options to pdebuild-internal
2006-04-01 Junichi Uekawa <dancer@debian.org>
diff --git a/Documentation/pbuilder-doc.xml b/Documentation/pbuilder-doc.xml
index da89dc3..6cf4cf7 100644
--- a/Documentation/pbuilder-doc.xml
+++ b/Documentation/pbuilder-doc.xml
@@ -461,6 +461,11 @@ export DEBIAN_BUILDGCCVER=3.2
<chapter id="pbuilder-uml">
<title>Using User-mode-linux with pbuilder</title>
<para>
+ NOTE that since October 2004, pbuilder for user-mode-linux is
+ not distributed, since user-mode-linux itself is broken in
+ Debian. It will hopefully be fixed before Debian etch release.
+ </para>
+ <para>
It is possible to use user-mode-linux
by invoking <command>pbuilder-uml</command>
instead of <command>pbuilder</command>.
@@ -1039,7 +1044,8 @@ $ sudo pbuilder update --hookdir ~/loginhooks/E10shell
</para>
<para>
<screen>
-<command>pbuilder create --distribution sid --debootstrapopts --arch --debootstrapopts i386 --basetgz /var/cache/pbuilder/base-i386.tgz --mirror http://ftp.jp.debian.org/debian</command>
+<command>pbuilder create --distribution sid --debootstrapopts --arch --debootstrapopts i386 \
+ --basetgz /var/cache/pbuilder/base-i386.tgz --mirror http://ftp.jp.debian.org/debian</command>
<command>linux32 pbuilder build --basetgz /var/cache/pbuilder/base-i386.tgz</command>
</screen>
</para>
@@ -1375,6 +1381,7 @@ cvs -z3 -d:pserver:anonymous@cvs.alioth.debian.org:/cvsroot/pbuilder co pbuilder
and from the CVS repository of pbuilder (web-based access is possible).
A copy of this documentation can be found on the
<ulink url="http://pbuilder.alioth.debian.org/pbuilder-doc.html">Alioth project page for pbuilder</ulink>.
+ <ulink url="http://pbuilder.alioth.debian.org/pbuilder-doc.pdf">There is also a PDF version</ulink>.
The homepage for pbuilder is
<ulink url="http://www.netfort.gr.jp/~dancer/software/pbuilder.html">
http://www.netfort.gr.jp/~dancer/software/pbuilder.html
diff --git a/debian/changelog b/debian/changelog
index 03e4285..83fedb8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
pbuilder (0.152) UNRELEASED; urgency=low
* fix pdebuild-internal, pass --uid/--gid options.
+ partially address some of #361362
+ * documentation update
- -- Junichi Uekawa <dancer@debian.org> Sat, 22 Apr 2006 11:12:27 +0900
+ -- Junichi Uekawa <dancer@debian.org> Sat, 22 Apr 2006 13:20:58 +0900
pbuilder (0.151) unstable; urgency=low
diff --git a/pbuilder-modules b/pbuilder-modules
index cb2d94d..3650cd6 100644
--- a/pbuilder-modules
+++ b/pbuilder-modules
@@ -1,7 +1,7 @@
#! /bin/bash
# common modules for pbuilder.
# pbuilder -- personal Debian package builder
-# Copyright (C) 2001-2005 Junichi Uekawa
+# Copyright (C) 2001-2006 Junichi Uekawa
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/pdebuild b/pdebuild
index c579045..ad38cfa 100644
--- a/pdebuild
+++ b/pdebuild
@@ -1,6 +1,6 @@
#! /bin/bash
# pbuilder -- personal Debian package builder
-# Copyright (C) 2001-2005 Junichi Uekawa
+# Copyright (C) 2001-2006 Junichi Uekawa
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by