Bug#398404: merged with Loic Minier's changes
Junichi Uekawa
dancer at netfort.gr.jp
Tue Aug 5 02:37:24 UTC 2008
Hi,
It's quite hard to review your patch this way; what's the cumulative
diff against HEAD?
I've added you to the pbuilder group on alioth; however I am worried
that your patch may be adding too much complexity to pbuilder
codebase. If I incorporate this patch to pbuilder, I'd like to do the
same for cowbuilder, and I want to keep the implementation as clean as
possible.
> I merged with Loic Minier's changes.
>
> Osamu
>
> [2 0001-update-japanese-po-translation.patch <text/x-diff; iso-2022-jp (7bit)>]
> >From 5f9e81fb63dbad9e2c954af93bbe1c0e0de2ac12 Mon Sep 17 00:00:00 2001
> From: Junichi Uekawa <dancer at netfort.gr.jp>
> Date: Fri, 27 Jun 2008 15:36:31 +0900
> Subject: [PATCH] update japanese po translation.
>
> ---
> Documentation/pbuilder-doc.ja.po | 950 ++++++++++++++++++++++++--------------
> 1 files changed, 596 insertions(+), 354 deletions(-)
>
> diff --git a/Documentation/pbuilder-doc.ja.po b/Documentation/pbuilder-doc.ja.po
> index f0b9fc9..cc72153 100644
> --- a/Documentation/pbuilder-doc.ja.po
> +++ b/Documentation/pbuilder-doc.ja.po
> @@ -7,8 +7,8 @@
> msgid ""
> msgstr ""
> "Project-Id-Version: xxx\n"
> -"POT-Creation-Date: 2008-03-07 09:25+0900\n"
> -"PO-Revision-Date: 2008-01-04 20:06+0900\n"
> +"POT-Creation-Date: 2008-05-09 00:50+0900\n"
> +"PO-Revision-Date: 2008-06-27 15:35+0900\n"
> "Last-Translator: Junichi Uekawa <dancer at debian.org>\n"
> "Language-Team: Junichi Uekawa <dancer at debian.org>\n"
> "MIME-Version: 1.0\n"
> @@ -171,6 +171,11 @@ msgstr "--distribution"
> msgid "</command> command-line option."
> msgstr "</command>コマンドラインオプションで指定する必要があります。"
>
> +# type: Content of: <book><chapter><sect1><para><footnote>
> +#: pbuilder-doc.xml:93
> +msgid "<command>debootstrap</command> <footnote>"
> +msgstr ""
> +
> # type: Content of: <book><chapter><sect1><para><footnote><para>
> #: pbuilder-doc.xml:94
> msgid "debootstrap or cdebootstrap can be chosen"
> @@ -271,6 +276,11 @@ msgstr ""
> "ていません（現時点では？）。"
>
> # type: Content of: <book><chapter><sect1><para>
> +#: pbuilder-doc.xml:137 pbuilder-doc.xml:1227
> +msgid "</footnote>"
> +msgstr ""
> +
> +# type: Content of: <book><chapter><sect1><para>
> #: pbuilder-doc.xml:140 pbuilder-doc.xml:172
> msgid ""
> "For fuller documentation of command-line options, see the pbuilder.8 manual "
> @@ -313,7 +323,7 @@ msgid "--buildresult"
> msgstr "--buildresult"
>
> # type: Content of: <book><chapter><sect1><para><command>
> -#: pbuilder-doc.xml:160 pbuilder-doc.xml:1523
> +#: pbuilder-doc.xml:160 pbuilder-doc.xml:1504
> msgid "The <command>"
> msgstr "<command>"
>
> @@ -396,7 +406,7 @@ msgid ""
> "There is a slightly different mode of operation available in "
> "<command>pdebuild</command> since version 0.97. <command>pdebuild</command> "
> "usually runs <command>debian/rules clean</command> outside of the chroot; "
> -"however, it is possible to change the behaviour to run it inside the chroot "
> +"however, it is possible to change the behavior to run it inside the chroot "
> "with the <command>"
> msgstr ""
> " <command>pdebuild</command> 0.97 から一つ違う実行モードが追加されていま"
> @@ -405,7 +415,7 @@ msgstr ""
> "外部で実行するのですが、chroot内部で実行するように <command>"
>
> # type: Content of: <book><chapter><sect1><para><option>
> -#: pbuilder-doc.xml:205 pbuilder-doc.xml:1177
> +#: pbuilder-doc.xml:205 pbuilder-doc.xml:1166
> msgid "--use-pdebuild-internal"
> msgstr "--use-pdebuild-internal"
>
> @@ -502,7 +512,7 @@ msgid "It is useful to use"
> msgstr "別のディストリビューション向けに複数の設定ファイルを活用するためには"
>
> # type: Content of: <book><chapter><sect1><itemizedlist><listitem><para><command><option>
> -#: pbuilder-doc.xml:257 pbuilder-doc.xml:674
> +#: pbuilder-doc.xml:257 pbuilder-doc.xml:670
> msgid "--configfile"
> msgstr "--configfile"
>
> @@ -703,7 +713,6 @@ msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> #: pbuilder-doc.xml:366
> -#, fuzzy
> msgid ""
> "A script that was used by Junichi Uekawa in the initial run is now included "
> "in the <command>pbuilder</command> distribution, as <command>pbuildd.sh</"
> @@ -714,14 +723,7 @@ msgid ""
> "while, and it should be possible to set the application up on your system "
> "also. This version of the code is not the most tested, but should function "
> "as a starter."
> -msgstr ""
> -"上川が利用したスクリプトは今 <command>pbuilder</command> ディストリビューショ"
> -"ンに含まれています。<filename>/usr/share/doc/pbuilder/examples/pbuildd/</"
> -"filename> にあり、設定は、 <filename>/etc/pbuilder/pbuildd-config.sh</"
> -"command> が設定ファイルです。<command>pbuilder</command> になれている人であれ"
> -"ば簡単に設定することができるはずです。しばらく実行されていたため、自分のシス"
> -"テムでも実行できるでしょう。ただ、まだ新しいので問題があれば Debian BTS に登"
> -"録してください。"
> +msgstr "上川が利用したスクリプトは今 <command>pbuilder</command> ディストリビューションに含まれています。<filename>/usr/share/doc/pbuilder/examples/pbuildd/</filename> にあり、設定は、 <filename>/etc/pbuilder/pbuildd-config.sh</filename> が設定ファイルです。<command>pbuilder</command> になれている人であれば簡単に設定することができるはずです。しばらく実行されていたため、自分のシステムでも実行できるでしょう。ただ、まだ新しいので問題があれば Debian BTS に登録してください。"
>
> # type: Content of: <book><chapter><sect1><para>
> #: pbuilder-doc.xml:376
> @@ -761,7 +763,7 @@ msgstr ""
> msgid ""
> "Because not all builds are guaranteed to finish in a finite time, setting a "
> "timeout is probably necessary, or pbuildd may stall with a bad build."
> -msgstr ""
> +msgstr "すべてのビルドが有限時間で完了することが保証されているわけではありません、そのためタイムアウトを準備しておくことが必要かもしれません。そうしないとpbuilddは悪いビルドでずっと待ち状態になる可能性もあります。"
>
> # type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
> #: pbuilder-doc.xml:398
> @@ -769,7 +771,7 @@ msgid ""
> "Some packages require a lot of disk space, around 2GB seems to be sufficient "
> "for the largest packages for the time being. If you find otherwise, please "
> "inform the maintainer of this documentation."
> -msgstr ""
> +msgstr "一部のパッケージは大量のディスク領域を必要とします、現時点では最大のパッケージであっても2GBくらいが十分なようです。もしそうでないという状況を発見した場合はこの文書のメンテナに連絡してください。"
>
> # type: Content of: <book><chapter><sect1><title>
> #: pbuilder-doc.xml:406
> @@ -790,7 +792,7 @@ msgstr ""
> msgid ""
> "I would like some information on how people are doing it, I would appreciate "
> "any feedback or information on how you are doing, or any examples."
> -msgstr ""
> +msgstr "どのように実際にやっているのか情報をください、フィードバックや情報や例を歓迎します。"
>
> # type: Content of: <book><chapter><sect1><title>
> #: pbuilder-doc.xml:418
> @@ -825,13 +827,10 @@ msgstr ""
>
> # type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
> #: pbuilder-doc.xml:433
> -#, fuzzy
> msgid ""
> "Automatically running lintian (distributed as an example in <filename>/usr/"
> "share/doc/pbuilder/examples/B90lintian</filename>)."
> -msgstr ""
> -"自動的にlintian/lindaを実行する (例として <filename>/usr/share/doc/pbuilder/"
> -"examples/B90linda</filename>が配布されている)。"
> +msgstr "自動的にlintianを実行する (例として <filename>/usr/share/doc/pbuilder/examples/B90lintian</filename>が配布されている)。"
>
> # type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
> #: pbuilder-doc.xml:437
> @@ -840,20 +839,20 @@ msgid ""
> "removed from Debian. A <command>pbuilder</command> implementation can be "
> "found as debian/pbuilder-test directory, implemented through B92test-pkg "
> "script."
> -msgstr ""
> +msgstr "自動的にパッケージの debian-test を行う? debian-test パッケージは Debian から削除されました。 <command>pbuilder</command> での代替は debian/pbuilder-test ディレクトリにあります。B92test-pkgスクリプトで実装されています。"
>
> # type: Content of: <book><chapter><sect1><para><footnote>
> #: pbuilder-doc.xml:444
> msgid ""
> "To use B92test-pkg script, first, add it to your hook directory. <footnote>"
> -msgstr ""
> +msgstr "B92test-pkg を利用するためには、まずB92test-pkg スクリプトをフックディレクトリに追加してください。 <footnote>"
>
> # type: Content of: <book><chapter><sect1><para><footnote><para>
> #: pbuilder-doc.xml:446
> msgid ""
> "It is possible to specify <command>--hookdir /usr/share/doc/pbuilder/"
> "examples</command> command-line option to include all example hooks as well."
> -msgstr ""
> +msgstr "<command>--hookdir /usr/share/doc/pbuilder/examples</command> コマンドラインオプションを指定することですべてのサンプルフックを利用することが可能です。"
>
> # type: Content of: <book><chapter><sect1><para><footnote>
> #: pbuilder-doc.xml:449
> @@ -862,6 +861,8 @@ msgid ""
> "pbuilder-test/NN_name</filename> (where NN is number) following run-parts "
> "standard<footnote>"
> msgstr ""
> +"</footnote>。\n"
> +"テストファイルは <filename>debian/pbuilder-test/NN_name</filename> (NN: 番号)に配置されたシェルスクリプトです。ファイル名規則は run-parts の標準にしたがいます。<footnote>"
>
> # type: Content of: <book><chapter><sect1><para><footnote><para>
> #: pbuilder-doc.xml:454
> @@ -911,19 +912,21 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para><screen>
> -#: pbuilder-doc.xml:486
> +#: pbuilder-doc.xml:485
> #, no-wrap
> msgid ""
> +"\n"
> "EXTRAPACKAGES=\"pentium-builder gcc-3.2 g++-3.2\"\n"
> "export DEBIAN_BUILDARCH=athlon\n"
> "export DEBIAN_BUILDGCCVER=3.2"
> msgstr ""
> +"\n"
> "EXTRAPACKAGES=\"pentium-builder gcc-3.2 g++-3.2\"\n"
> "export DEBIAN_BUILDARCH=athlon\n"
> "export DEBIAN_BUILDGCCVER=3.2"
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:492
> +#: pbuilder-doc.xml:491
> msgid ""
> "It will instruct <command>pbuilder</command> to install the <command>pentium-"
> "builder</command> package and also the GCC 3.2 compiler packages inside the "
> @@ -932,12 +935,12 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><title>
> -#: pbuilder-doc.xml:500
> +#: pbuilder-doc.xml:499
> msgid "Using User-mode-linux with pbuilder"
> msgstr "user-mode-linux を pbuilder で利用する"
>
> # type: Content of: <book><chapter><para>
> -#: pbuilder-doc.xml:502
> +#: pbuilder-doc.xml:501
> msgid ""
> "It is possible to use user-mode-linux by invoking <command>pbuilder-user-"
> "mode-linux</command> instead of <command>pbuilder</command>. "
> @@ -948,7 +951,7 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><para>
> -#: pbuilder-doc.xml:512
> +#: pbuilder-doc.xml:511
> msgid ""
> "<command>User-mode-linux</command> is a somewhat less proven platform than "
> "the standard Unix tools which <command>pbuilder</command> relies on "
> @@ -959,34 +962,34 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><para>
> -#: pbuilder-doc.xml:523
> +#: pbuilder-doc.xml:522
> msgid ""
> "The configuration of <command>pbuilder-user-mode-linux</command> goes in "
> "three steps:"
> msgstr ""
>
> # type: Content of: <book><chapter><para><itemizedlist><listitem><para>
> -#: pbuilder-doc.xml:527
> +#: pbuilder-doc.xml:526
> msgid "Configuration of user-mode-linux"
> msgstr "user-mode-linux の設定"
>
> # type: Content of: <book><chapter><para><itemizedlist><listitem><para>
> -#: pbuilder-doc.xml:530
> +#: pbuilder-doc.xml:529
> msgid "Configuration of rootstrap"
> msgstr "rootstrap の設定"
>
> # type: Content of: <book><chapter><para><itemizedlist><listitem><para>
> -#: pbuilder-doc.xml:533
> +#: pbuilder-doc.xml:532
> msgid "Configuration of pbuilder-uml"
> msgstr "pbuilder-uml の設定"
>
> # type: Content of: <book><chapter><sect1><title>
> -#: pbuilder-doc.xml:538
> +#: pbuilder-doc.xml:537
> msgid "Configuring user-mode-linux"
> msgstr "user-mode-linux の設定"
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:540
> +#: pbuilder-doc.xml:539
> msgid ""
> "user-mode-linux isn't completely trivial to set up. It would probably be "
> "useful to acquaint yourself with it a bit before attempting to use "
> @@ -997,26 +1000,26 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:550
> +#: pbuilder-doc.xml:549
> msgid ""
> "<command>user-mode-linux</command> requires the user to be in the uml-net "
> "group in order to configure the network unless you are using slirp."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:555
> +#: pbuilder-doc.xml:554
> msgid ""
> "If you compile your own kernel, you may want to verify that you enable TUN/"
> "TAP support, and you might want to consider the SKAS patch."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><title>
> -#: pbuilder-doc.xml:561
> +#: pbuilder-doc.xml:560
> msgid "Configuring rootstrap"
> msgstr "rootstrap の設定"
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:563
> +#: pbuilder-doc.xml:562
> msgid ""
> "<command>rootstrap</command> is a wrapper around debootstrap. It creates a "
> "Debian disk image for use with UML. To configure rootstrap, there are "
> @@ -1024,12 +1027,12 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
> -#: pbuilder-doc.xml:570
> +#: pbuilder-doc.xml:569
> msgid "Install the rootstrap package."
> msgstr "rootstrap パッケージをインストールします。"
>
> # type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
> -#: pbuilder-doc.xml:574
> +#: pbuilder-doc.xml:573
> msgid ""
> "TUN/TAP only: add the user to the uml-net group to allow access to the "
> "network"
> @@ -1038,13 +1041,13 @@ msgstr ""
> "用できるようにします"
>
> # type: Content of: <book><chapter><sect1><itemizedlist><listitem><para><screen>
> -#: pbuilder-doc.xml:577
> +#: pbuilder-doc.xml:575
> #, no-wrap
> msgid "adduser dancer uml-net"
> msgstr "adduser dancer uml-net"
>
> # type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
> -#: pbuilder-doc.xml:581
> +#: pbuilder-doc.xml:579
> msgid ""
> "TUN/TAP only: Check that the kernel supports the TUN/TAP interface, or "
> "recompile the kernel if necessary."
> @@ -1053,7 +1056,7 @@ msgstr ""
> "ることを確認してください。必要であればカーネルをリビルドしてください。"
>
> # type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
> -#: pbuilder-doc.xml:587
> +#: pbuilder-doc.xml:585
> msgid ""
> "Set up <filename>/etc/rootstrap/rootstrap.conf</filename>. For example, if "
> "the current host is 192.168.1.2, changing following entries to something "
> @@ -1061,9 +1064,10 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><itemizedlist><listitem><para><screen>
> -#: pbuilder-doc.xml:592
> +#: pbuilder-doc.xml:589
> #, no-wrap
> msgid ""
> +"\n"
> "transport=tuntap\n"
> "interface=eth0\n"
> "gateway=192.168.1.1\n"
> @@ -1072,6 +1076,7 @@ msgid ""
> "uml=192.168.1.199\n"
> "netmask=255.255.255.0"
> msgstr ""
> +"\n"
> "transport=tuntap\n"
> "interface=eth0\n"
> "gateway=192.168.1.1\n"
> @@ -1081,45 +1086,46 @@ msgstr ""
> "netmask=255.255.255.0"
>
> # type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
> -#: pbuilder-doc.xml:600
> +#: pbuilder-doc.xml:597
> msgid ""
> "Some experimentation with configuration and running <command>rootstrap ~/"
> "test.uml</command> to actually test it would be handy."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
> -#: pbuilder-doc.xml:605
> +#: pbuilder-doc.xml:602
> msgid ""
> "Using slirp requires less configuration. The default configuration comes "
> "with a working example."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><title>
> -#: pbuilder-doc.xml:612
> +#: pbuilder-doc.xml:609
> msgid "Configuring pbuilder-uml"
> msgstr "pbuilder-uml の設定"
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:614
> +#: pbuilder-doc.xml:611
> msgid "The following needs to happen:"
> msgstr "以下の設定が必要です:"
>
> # type: Content of: <book><chapter><sect1><para><itemizedlist><listitem><para>
> -#: pbuilder-doc.xml:617
> +#: pbuilder-doc.xml:614
> msgid "Install the pbuilder-uml package."
> msgstr "pbuilder-uml をインストールする"
>
> # type: Content of: <book><chapter><sect1><para><itemizedlist><listitem><para>
> -#: pbuilder-doc.xml:621
> +#: pbuilder-doc.xml:618
> msgid ""
> "Set up the configuration file <filename>/etc/pbuilder/pbuilder-uml.conf</"
> "filename> in the following manner. It will be different for slirp."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para><itemizedlist><listitem><para><screen>
> -#: pbuilder-doc.xml:625
> +#: pbuilder-doc.xml:621
> #, no-wrap
> msgid ""
> +"\n"
> "MY_ETH0=tuntap,,,192.168.1.198\n"
> "UML_IP=192.168.1.199\n"
> "UML_NETMASK=255.255.255.0\n"
> @@ -1128,6 +1134,7 @@ msgid ""
> "UML_GATEWAY=192.168.1.1\n"
> "PBUILDER_UML_IMAGE=\"/home/dancer/uml-image\""
> msgstr ""
> +"\n"
> "MY_ETH0=tuntap,,,192.168.1.198\n"
> "UML_IP=192.168.1.199\n"
> "UML_NETMASK=255.255.255.0\n"
> @@ -1137,51 +1144,51 @@ msgstr ""
> "PBUILDER_UML_IMAGE=\"/home/dancer/uml-image\""
>
> # type: Content of: <book><chapter><sect1><para><itemizedlist><listitem><para>
> -#: pbuilder-doc.xml:633
> +#: pbuilder-doc.xml:629
> msgid "Also, it needs to match the rootstrap configuration."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para><itemizedlist><listitem><para>
> -#: pbuilder-doc.xml:638
> +#: pbuilder-doc.xml:634
> msgid ""
> "Make sure BUILDPLACE is writable by the user. Change BUILDPLACE in the "
> "configuration file to a place where the user has access."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para><itemizedlist><listitem><para><command>
> -#: pbuilder-doc.xml:644
> +#: pbuilder-doc.xml:640
> msgid "Run <command>pbuilder-user-mode-linux"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para><itemizedlist><listitem><para><command><option>
> -#: pbuilder-doc.xml:644
> +#: pbuilder-doc.xml:640
> msgid "create --distribution sid"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para><itemizedlist><listitem><para>
> -#: pbuilder-doc.xml:644
> +#: pbuilder-doc.xml:640
> msgid "</command> to create the image."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para><itemizedlist><listitem><para>
> -#: pbuilder-doc.xml:647
> +#: pbuilder-doc.xml:643
> msgid "Try running <command>pbuilder-user-mode-linux build</command>."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><title>
> -#: pbuilder-doc.xml:653
> +#: pbuilder-doc.xml:649
> msgid "Considerations for running pbuilder-user-mode-linux"
> msgstr "pbuilder-user-mode-linuxを実行する場合の検討項目"
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:655
> +#: pbuilder-doc.xml:651
> msgid ""
> "<command>pbuilder-user-mode-linux</command> emulates most of "
> "<command>pbuilder</command>, but there are some differences."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
> -#: pbuilder-doc.xml:661
> +#: pbuilder-doc.xml:657
> msgid ""
> "<command>pbuilder-user-mode-linux</command> does not support all options of "
> "<command>pbuilder</command> properly yet. This is a problem, and will be "
> @@ -1189,7 +1196,7 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><itemizedlist><listitem><para><command>
> -#: pbuilder-doc.xml:668
> +#: pbuilder-doc.xml:664
> msgid ""
> "/tmp is handled differently inside <command>pbuilder-user-mode-linux</"
> "command>. In <command>pbuilder-user-mode-linux</command>, <filename>/tmp</"
> @@ -1199,33 +1206,33 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
> -#: pbuilder-doc.xml:674
> +#: pbuilder-doc.xml:670
> msgid ""
> "</command>, and when trying to build packages placed under <filename>/tmp</"
> "filename>."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><title>
> -#: pbuilder-doc.xml:682
> +#: pbuilder-doc.xml:678
> msgid "Parallel running of pbuilder-user-mode-linux"
> -msgstr ""
> +msgstr "pbuilder-user-mode-linux を複数同時に実行させる"
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:684
> +#: pbuilder-doc.xml:680
> msgid ""
> "To run <command>pbuilder-user-mode-linux</command> in parallel on a system, "
> "there are a few things to bear in mind."
> -msgstr ""
> +msgstr "<command>pbuilder-user-mode-linux</command> を同一システム上で同時に複数実行させるにはいくつか注意するべき点があります。\n"
>
> # type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
> -#: pbuilder-doc.xml:689
> +#: pbuilder-doc.xml:685
> msgid ""
> "The create and update methods must not be run when a build is in progress, "
> "or the COW file will be invalidated."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
> -#: pbuilder-doc.xml:694
> +#: pbuilder-doc.xml:690
> msgid ""
> "If you are not using slirp, user-mode-linux processes which are running in "
> "parallel need to have different IP addresses. Just trying to run the "
> @@ -1234,65 +1241,71 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><itemizedlist><listitem><para><screen>
> -#: pbuilder-doc.xml:700
> +#: pbuilder-doc.xml:695
> #, no-wrap
> msgid ""
> +"\n"
> "for IP in 102 103 104 105; do\n"
> " xterm -e pbuilder-user-mode-linux build --uml-ip 192.168.0.$IP \\\n"
> " 20030107/whizzytex_1.1.1-1.dsc &\n"
> "done"
> msgstr ""
> +"\n"
> +"for IP in 102 103 104 105; do\n"
> +" xterm -e pbuilder-user-mode-linux build --uml-ip 192.168.0.$IP \\\n"
> +" 20030107/whizzytex_1.1.1-1.dsc &\n"
> +"done"
>
> # type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
> -#: pbuilder-doc.xml:705
> +#: pbuilder-doc.xml:700
> msgid "When using slirp, this problem does not exist."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><title>
> -#: pbuilder-doc.xml:711
> +#: pbuilder-doc.xml:706
> msgid ""
> "Using pbuilder-user-mode-linux as a wrapper script to start up a virtual "
> "machine"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para><command>
> -#: pbuilder-doc.xml:713
> +#: pbuilder-doc.xml:708
> msgid ""
> "It is possible to use <command>pbuilder-user-mode-linux</command> for other "
> "uses than just building Debian packages. <command>pbuilder-user-mode-linux"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para><command><option>
> -#: pbuilder-doc.xml:717 pbuilder-doc.xml:825
> +#: pbuilder-doc.xml:712 pbuilder-doc.xml:818
> msgid "login"
> -msgstr ""
> +msgstr "login"
>
> # type: Content of: <book><chapter><sect1><para><command>
> -#: pbuilder-doc.xml:717
> +#: pbuilder-doc.xml:712
> msgid ""
> "</command> will let a user use a shell inside the user-mode-linux "
> "<command>pbuilder</command> base image, and <command>pbuilder-user-mode-linux"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para><command><option>
> -#: pbuilder-doc.xml:720
> +#: pbuilder-doc.xml:715
> msgid "execute"
> -msgstr ""
> +msgstr "execute"
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:720
> +#: pbuilder-doc.xml:715
> msgid "</command> will allow the user to execute a script inside the image."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:724
> +#: pbuilder-doc.xml:719
> msgid ""
> "You can use the script to install ssh and add a new user, so that it is "
> "possible to access inside the user-mode-linux through ssh."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:728
> +#: pbuilder-doc.xml:723
> msgid ""
> "Note that it is not possible to use a script from <filename>/tmp</filename> "
> "due to the way <command>pbuilder-user-mode-linux</command> mounts a tmpfs at "
> @@ -1300,16 +1313,17 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:734
> +#: pbuilder-doc.xml:729
> msgid ""
> "The following example script may be useful in starting a sshd inside user-"
> "mode-linux."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><screen>
> -#: pbuilder-doc.xml:738
> +#: pbuilder-doc.xml:732
> #, no-wrap
> msgid ""
> +"\n"
> "#!/bin/bash\n"
> "\n"
> "apt-get install -y ssh xbase-clients xterm\n"
> @@ -1325,24 +1339,24 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><title>
> -#: pbuilder-doc.xml:754
> +#: pbuilder-doc.xml:748
> msgid "Frequently asked questions"
> msgstr "FAQ （よくある質問）"
>
> # type: Content of: <book><chapter><para>
> -#: pbuilder-doc.xml:757
> +#: pbuilder-doc.xml:751
> msgid ""
> "Here, known problems and frequently asked questions are documented. This "
> "portion was initially available in README.Debian file, but moved here."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><title>
> -#: pbuilder-doc.xml:762
> +#: pbuilder-doc.xml:756
> msgid "pbuilder create fails"
> msgstr "pbuilder create が失敗する"
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:764
> +#: pbuilder-doc.xml:758
> msgid ""
> "It often happens that <command>pbuilder</command> cannot create the latest "
> "chroot. Try upgrading <command>pbuilder</command> and debootstrap. It is "
> @@ -1352,14 +1366,14 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:771
> +#: pbuilder-doc.xml:765
> msgid ""
> "There are people who occasionally back port debootstrap to stable versions; "
> "hunt for them."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:775
> +#: pbuilder-doc.xml:769
> msgid ""
> "When there are errors with the debootstrap phase, the debootstrap script "
> "needs to be fixed. <command>pbuilder</command> does not provide a way to "
> @@ -1367,12 +1381,12 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><title>
> -#: pbuilder-doc.xml:781
> +#: pbuilder-doc.xml:775
> msgid "Directories that cannot be bind-mounted"
> -msgstr ""
> +msgstr "bind mount できないディレクトリ"
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:783
> +#: pbuilder-doc.xml:777
> msgid ""
> "Because of the way <command>pbuilder</command> works, there are several "
> "directories which cannot be bind-mounted when running <command>pbuilder</"
> @@ -1383,12 +1397,12 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><title>
> -#: pbuilder-doc.xml:794
> +#: pbuilder-doc.xml:788
> msgid "Logging in to pbuilder to investigate build failure"
> -msgstr ""
> +msgstr "ビルド失敗の調査のために pbuilder 環境にログインする"
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:796
> +#: pbuilder-doc.xml:790
> msgid ""
> "It is possible to invoke a shell session after a build failure. Example "
> "hook script are provided as <filename>C10shell</filename> and "
> @@ -1397,12 +1411,12 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><title>
> -#: pbuilder-doc.xml:805
> +#: pbuilder-doc.xml:799
> msgid "Logging in to pbuilder to modify the environment"
> -msgstr ""
> +msgstr "環境を変更するために pbuilder 環境にログインする"
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:807
> +#: pbuilder-doc.xml:801
> msgid ""
> "It is sometimes necessary to modify the chroot environment. <command>login</"
> "command> will remove the contents of the chroot after logout. It is "
> @@ -1412,36 +1426,37 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><screen>
> -#: pbuilder-doc.xml:815
> +#: pbuilder-doc.xml:808
> #, no-wrap
> msgid ""
> +"\n"
> "$ mkdir ~/loginhooks\n"
> "$ cp C10shell ~/loginhooks/E10shell\n"
> "$ sudo pbuilder update --hookdir ~/loginhooks/E10shell"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:820
> +#: pbuilder-doc.xml:813
> msgid "It is also possible to add"
> -msgstr ""
> +msgstr "また別の方法としては"
>
> # type: Content of: <book><chapter><sect1><para><option>
> -#: pbuilder-doc.xml:820
> +#: pbuilder-doc.xml:813
> msgid "--save-after-exec"
> msgstr "--save-after-exec"
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:821
> +#: pbuilder-doc.xml:814
> msgid "and/or"
> msgstr "もしくは"
>
> # type: Content of: <book><chapter><sect1><para><option>
> -#: pbuilder-doc.xml:821
> +#: pbuilder-doc.xml:814
> msgid "--save-after-login"
> msgstr "--save-after-login"
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:821
> +#: pbuilder-doc.xml:814
> msgid ""
> "options to the <command>pbuilder login</command> session to accomplish the "
> "goal. It is possible to add the"
> @@ -1450,38 +1465,38 @@ msgstr ""
> "成することができます。"
>
> # type: Content of: <book><chapter><sect1><para><option>
> -#: pbuilder-doc.xml:824
> +#: pbuilder-doc.xml:817
> msgid "--uml-login-nocow"
> msgstr "--uml-login-nocow"
>
> # type: Content of: <book><chapter><sect1><para><command>
> -#: pbuilder-doc.xml:824
> +#: pbuilder-doc.xml:817
> msgid "option to <command>pbuilder-user-mode-linux"
> msgstr "オプションを <command>pbuilder-user-mode-linux"
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:825
> +#: pbuilder-doc.xml:818
> msgid "</command> session as well."
> msgstr "</command> セッションに追加することも可能です。"
>
> # type: Content of: <book><chapter><sect1><title>
> -#: pbuilder-doc.xml:830
> +#: pbuilder-doc.xml:823
> msgid "Setting BUILDRESULTUID for sudo sessions"
> msgstr "BUILDRESULTUID を sudo のセッションに追加する"
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:832
> +#: pbuilder-doc.xml:825
> msgid "It is possible to set"
> msgstr "pbuilderrc で"
>
> # type: Content of: <book><chapter><sect1><para><screen>
> -#: pbuilder-doc.xml:833
> +#: pbuilder-doc.xml:826
> #, no-wrap
> msgid "BUILDRESULTUID=$SUDO_UID"
> msgstr "BUILDRESULTUID=$SUDO_UID"
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:833
> +#: pbuilder-doc.xml:826
> msgid ""
> "in pbuilderrc to set the proper BUILDRESULTUID when using <command>sudo</"
> "command>."
> @@ -1490,12 +1505,12 @@ msgstr ""
> "ることが可能です。"
>
> # type: Content of: <book><chapter><sect1><title>
> -#: pbuilder-doc.xml:838
> +#: pbuilder-doc.xml:831
> msgid "Notes on usage of $TMPDIR"
> msgstr "$TMPDIRの使い方について"
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:840
> +#: pbuilder-doc.xml:833
> msgid ""
> "If you are setting $TMPDIR to an unusual value, of other than <filename>/"
> "tmp</filename>, you will find that some errors may occur inside the chroot, "
> @@ -1503,39 +1518,39 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:844
> +#: pbuilder-doc.xml:837
> msgid ""
> "There are two options, you may install a hook to create that directory, or "
> "set"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para><screen>
> -#: pbuilder-doc.xml:846
> +#: pbuilder-doc.xml:839
> #, no-wrap
> msgid "export TMPDIR=/tmp"
> msgstr "export TMPDIR=/tmp"
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:847
> +#: pbuilder-doc.xml:840
> msgid "in pbuilderrc. Take your pick."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:850
> +#: pbuilder-doc.xml:843
> msgid ""
> "An example script is provided as <filename>examples/D10tmp</filename> with "
> "<command>pbuilder</command>."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><title>
> -#: pbuilder-doc.xml:855
> +#: pbuilder-doc.xml:848
> msgid ""
> "Creating a shortcut for running <command>pbuilder</command> with a specific "
> "distribution"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:857
> +#: pbuilder-doc.xml:850
> msgid ""
> "When working with multiple chroots, it would be nice to work with scripts "
> "that reduce the amount of typing. An example script <filename>pbuilder-"
> @@ -1545,31 +1560,31 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><title>
> -#: pbuilder-doc.xml:866
> +#: pbuilder-doc.xml:859
> msgid ""
> "Using environmental variables for running <command>pbuilder</command> for "
> "specific distribution"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para><footnote>
> -#: pbuilder-doc.xml:869
> +#: pbuilder-doc.xml:862
> msgid "This section<footnote>"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para><footnote><para>
> -#: pbuilder-doc.xml:870
> +#: pbuilder-doc.xml:863
> msgid "This part of the documentation contributed by Andres Mejia"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para><footnote><para>
> -#: pbuilder-doc.xml:872
> +#: pbuilder-doc.xml:865
> msgid ""
> "This example was taken from a wiki (<ulink url=\"https://wiki.ubuntu.com/"
> "PbuilderHowto\">https://wiki.ubuntu.com/PbuilderHowto</ulink>)."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:875
> +#: pbuilder-doc.xml:868
> msgid ""
> "</footnote> describes briefly a way to setup and use multiple pbuilder "
> "setups by creating a pbuilderrc configuration in your home path (<filename>"
> @@ -1578,24 +1593,25 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:880
> +#: pbuilder-doc.xml:873
> msgid "First, setup <filename>$HOME/.pbuilderrc</filename> to look like:"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para><screen>
> -#: pbuilder-doc.xml:883
> +#: pbuilder-doc.xml:875
> #, no-wrap
> msgid ""
> +"\n"
> "if [ -n \"${DIST}\" ]; then\n"
> " BASETGZ=\"`dirname $BASETGZ`/$DIST-base.tgz\"\n"
> " DISTRIBUTION=\"$DIST\"\n"
> " BUILDRESULT=\"/var/cache/pbuilder/$DIST/result/\"\n"
> " APTCACHE=\"/var/cache/pbuilder/$DIST/aptcache/\"\n"
> -"fi"
> +"fi\n"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:890
> +#: pbuilder-doc.xml:883
> msgid ""
> "Then, whenever you wish to use pbuilder for a particular distro, assign a "
> "value to \"DIST\" that is one of the distros available for Debian or any "
> @@ -1604,14 +1620,15 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:896
> +#: pbuilder-doc.xml:889
> msgid "Here's some examples on running pbuilder or pdebuild:"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para><screen>
> -#: pbuilder-doc.xml:899
> +#: pbuilder-doc.xml:891
> #, no-wrap
> msgid ""
> +"\n"
> "DIST=gutsy sudo pbuilder create\n"
> "\n"
> "DIST=sid sudo pbuilder create --mirror http://http.us.debian.org/debian\n"
> @@ -1626,58 +1643,63 @@ msgid ""
> "http://http.us.debian.org/debian \\\n"
> "--othermirror \"deb http://http.us.debian.org/debian sid contrib non-free\"\n"
> "\n"
> -"DIST=gutsy pdebuild"
> +"DIST=gutsy pdebuild\n"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><title>
> -#: pbuilder-doc.xml:917
> +#: pbuilder-doc.xml:910
> msgid "Using special apt sources lists, and local packages"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para><command>
> -#: pbuilder-doc.xml:919
> +#: pbuilder-doc.xml:912
> msgid ""
> -"If you have some very specialised requirements on your apt setup inside "
> +"If you have some very specialized requirements on your apt setup inside "
> "<command>pbuilder</command>, it is possible to specify that through the "
> "<command>"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para><command><option>
> -#: pbuilder-doc.xml:922
> +#: pbuilder-doc.xml:915
> msgid "--othermirror"
> msgstr "--othermirror"
>
> # type: Content of: <book><chapter><sect1><para><command>
> -#: pbuilder-doc.xml:922
> +#: pbuilder-doc.xml:915
> msgid "</command> option. Try something like: <command>"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para><command><option>
> -#: pbuilder-doc.xml:925
> +#: pbuilder-doc.xml:918
> msgid ""
> "--othermirror \"deb http://local/mirror stable main|deb-src http://local/"
> "source/repository ./\""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para><command>
> -#: pbuilder-doc.xml:928
> +#: pbuilder-doc.xml:918
> +msgid "</command>"
> +msgstr "</command>"
> +
> +# type: Content of: <book><chapter><sect1><para><command>
> +#: pbuilder-doc.xml:921
> msgid ""
> "To use the local file system instead of HTTP, it is necessary to do bind-"
> "mounting. <command>"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para><command><option>
> -#: pbuilder-doc.xml:930
> +#: pbuilder-doc.xml:923
> msgid "--bindmounts"
> msgstr "--bindmounts"
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:930
> +#: pbuilder-doc.xml:923
> msgid "</command> is a command-line option useful for such cases."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:934
> +#: pbuilder-doc.xml:927
> msgid ""
> "It might be convenient to use your built packages from inside the chroot. "
> "It is possible to automate the task with the following configuration. "
> @@ -1685,26 +1707,28 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para><screen>
> -#: pbuilder-doc.xml:939
> +#: pbuilder-doc.xml:932
> #, no-wrap
> msgid "BINDMOUNTS=\"/var/cache/pbuilder/result\""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:943
> +#: pbuilder-doc.xml:935
> msgid "Then, add the following hook"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para><screen>
> -#: pbuilder-doc.xml:947
> +#: pbuilder-doc.xml:938
> #, no-wrap
> msgid ""
> +"\n"
> "# cat /var/cache/pbuilder/hooks/D70results\n"
> "#!/bin/sh\n"
> "cd /var/cache/pbuilder/result/\n"
> "/usr/bin/dpkg-scanpackages . /dev/null > /var/cache/pbuilder/result/Packages\n"
> "/usr/bin/apt-get update"
> msgstr ""
> +"\n"
> "# cat /var/cache/pbuilder/hooks/D70results\n"
> "#!/bin/sh\n"
> "cd /var/cache/pbuilder/result/\n"
> @@ -1712,33 +1736,40 @@ msgstr ""
> "/usr/bin/apt-get update"
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:955
> +#: pbuilder-doc.xml:946
> msgid ""
> "This way, you can use <filename>deb file:/var/cache/pbuilder/result</"
> "filename>"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><title>
> -#: pbuilder-doc.xml:959
> +#: pbuilder-doc.xml:950
> msgid ""
> "How to get pbuilder to run apt-get update before trying to satisfy build-"
> "dependency"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:961
> +#: pbuilder-doc.xml:952
> msgid ""
> "You can use hook scripts for this. D scripts are run before satisfying "
> "build-dependency."
> msgstr ""
>
> +# type: Content of: <book><chapter><sect1><para>
> +#: pbuilder-doc.xml:956
> +msgid ""
> +"<ulink url=\"http://lists.debian.org/debian-devel/2006/05/msg00550.html\"> "
> +"This snippet comes from Ondrej Sury. </ulink>"
> +msgstr ""
> +
> # type: Content of: <book><chapter><sect1><title>
> -#: pbuilder-doc.xml:971
> +#: pbuilder-doc.xml:962
> msgid "Different bash prompts inside pbuilder login"
> msgstr "pbuilder login で bash のプロンプトを変更する"
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:973
> +#: pbuilder-doc.xml:964
> msgid ""
> "To make distinguishing bash prompts inside <command>pbuilder</command> "
> "easier, it is possible to set environment variables such as PS1 inside "
> @@ -1746,7 +1777,7 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para><footnote>
> -#: pbuilder-doc.xml:979
> +#: pbuilder-doc.xml:970
> msgid ""
> "With versions of bash more recent than 2.05b-2-15, the value of the "
> "debian_chroot variable, if set, is included in the value of PS1 (the Bash "
> @@ -1754,44 +1785,48 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para><footnote><para>
> -#: pbuilder-doc.xml:984
> +#: pbuilder-doc.xml:975
> msgid "Versions of bash from and before Debian 3.0"
> msgstr "Debian 3.0 以前のbash "
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:985
> +#: pbuilder-doc.xml:976
> msgid "</footnote> setting PS1 in pbuilderrc worked."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:988
> +#: pbuilder-doc.xml:979
> msgid "example of debian_chroot"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><screen>
> -#: pbuilder-doc.xml:990
> +#: pbuilder-doc.xml:980
> #, no-wrap
> -msgid "export debian_chroot=\"pbuild$$\""
> -msgstr "export debian_chroot=\"pbuild$$\""
> +msgid ""
> +"\n"
> +"\texport debian_chroot=\"pbuild$$\""
> +msgstr "\n export debian_chroot=\"pbuild$$\""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:992
> +#: pbuilder-doc.xml:982
> msgid "example of PS1"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><screen>
> -#: pbuilder-doc.xml:994
> +#: pbuilder-doc.xml:983
> #, no-wrap
> -msgid "export PS1=\"pbuild chroot 32165 # \""
> +msgid ""
> +"\n"
> +"\texport PS1=\"pbuild chroot 32165 # \""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><title>
> -#: pbuilder-doc.xml:998
> +#: pbuilder-doc.xml:987
> msgid "Creating a chroot reminder"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1000
> +#: pbuilder-doc.xml:989
> msgid ""
> "Bash prompts will help you remember that you are inside a chroot. There are "
> "other cases where you may want other signs of being inside a chroot. Check "
> @@ -1800,12 +1835,12 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><title>
> -#: pbuilder-doc.xml:1009
> +#: pbuilder-doc.xml:998
> msgid "Using /var/cache/apt/archives for the package cache"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1011
> +#: pbuilder-doc.xml:1000
> msgid ""
> "For the help of low-bandwidth systems, it is possible to use <filename>/var/"
> "cache/apt/archives</filename> as the package cache. Just specify it instead "
> @@ -1813,7 +1848,7 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1017
> +#: pbuilder-doc.xml:1006
> msgid ""
> "It is however not possible to do so currently with the user-mode-linux "
> "version of <command>pbuilder</command>, because <filename>/var/cache/apt/"
> @@ -1821,7 +1856,7 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1023
> +#: pbuilder-doc.xml:1012
> msgid ""
> "Use of dedicated tools such as apt-proxy is recommended, since caching of "
> "packages would benefit the system outside the scope of <command>pbuilder</"
> @@ -1829,35 +1864,37 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><title>
> -#: pbuilder-doc.xml:1029
> +#: pbuilder-doc.xml:1018
> msgid "pbuilder back ported to stable Debian releases"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1031
> -msgid "Currently stable back port of pbuilder is avialable at backports.org."
> +#: pbuilder-doc.xml:1020
> +msgid "Currently stable back port of pbuilder is available at backports.org."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><title>
> -#: pbuilder-doc.xml:1035
> +#: pbuilder-doc.xml:1024
> msgid "Warning about LOGNAME not being defined"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1037
> +#: pbuilder-doc.xml:1026
> msgid ""
> "You might see a lot of warning messages when running <command>pbuilder</"
> "command>."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para><screen>
> -#: pbuilder-doc.xml:1041
> +#: pbuilder-doc.xml:1029
> #, no-wrap
> -msgid "dpkg-genchanges: warning: no utmp entry available and LOGNAME not defined; using uid of process (1234)"
> +msgid ""
> +"\n"
> +"\tdpkg-genchanges: warning: no utmp entry available and LOGNAME not defined; using uid of process (1234)"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1045
> +#: pbuilder-doc.xml:1033
> msgid ""
> "It is currently safe to ignore this warning message. Please report back if "
> "you find any problem with having LOGNAME unset. Setting LOGNAME caused a "
> @@ -1867,12 +1904,12 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><title>
> -#: pbuilder-doc.xml:1054
> +#: pbuilder-doc.xml:1042
> msgid "Cannot Build-conflict against an essential package"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1056
> +#: pbuilder-doc.xml:1044
> msgid ""
> "<command>pbuilder</command> does not currently allow Build-Conflicts against "
> "essential packages. It should be obvious that essential packages should not "
> @@ -1881,12 +1918,12 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><title>
> -#: pbuilder-doc.xml:1065
> +#: pbuilder-doc.xml:1053
> msgid "Avoiding the \"ln: Invalid cross-device link\" message"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1067
> +#: pbuilder-doc.xml:1055
> msgid ""
> "By default, <command>pbuilder</command> uses hard links to manage the "
> "<command>pbuilder</command> package cache. It is not possible to make hard "
> @@ -1895,23 +1932,26 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para><screen>
> -#: pbuilder-doc.xml:1071 pbuilder-doc.xml:1228
> +#: pbuilder-doc.xml:1059 pbuilder-doc.xml:1215
> #, no-wrap
> msgid "APTCACHEHARDLINK=no"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1071
> -msgid "in your pbuilderrc file."
> +#: pbuilder-doc.xml:1059
> +msgid ""
> +"in your pbuilderrc file. Note that packages in <command>APTCACHE</command> "
> +"will be copied into chroot local cache, so plan for enough space on "
> +"<command>BUILDPLACE</command> device."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><title>
> -#: pbuilder-doc.xml:1076
> +#: pbuilder-doc.xml:1067
> msgid "Using fakechroot"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1078
> +#: pbuilder-doc.xml:1069
> msgid ""
> "It is possible to use <command>fakechroot</command> instead of being root to "
> "run <command>pbuilder</command>; however, several things make this "
> @@ -1921,38 +1961,38 @@ msgid ""
> "function, or override the overriding provided by <command>fakechroot</"
> "command>. One example is <command>ldd</command>. Inside "
> "<command>fakechroot</command>, <command>ldd</command> will check the library "
> -"dependency outside of the chroot, which is not the expected behaviour."
> +"dependency outside of the chroot, which is not the expected behavior."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1092
> +#: pbuilder-doc.xml:1083
> msgid "To work around the problem, debootstrap has a"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para><option>
> -#: pbuilder-doc.xml:1093
> +#: pbuilder-doc.xml:1084
> msgid "--variant fakechroot"
> msgstr "--variant fakechroot"
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1093
> +#: pbuilder-doc.xml:1084
> msgid "option. Use that, so that ldd and ldconfig are overridden."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1097
> +#: pbuilder-doc.xml:1088
> msgid ""
> "Make sure you have set your LD_PRELOAD path correctly, as described in the "
> "fakechroot manpage."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><title>
> -#: pbuilder-doc.xml:1102
> +#: pbuilder-doc.xml:1093
> msgid "Using debconf inside pbuilder sessions"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1104
> +#: pbuilder-doc.xml:1095
> msgid ""
> "To use debconf inside <command>pbuilder</command>, setting DEBIAN_FRONTEND "
> "to <quote>readline</quote> in <filename>pbuilderrc</filename> should work. "
> @@ -1961,25 +2001,27 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><title>
> -#: pbuilder-doc.xml:1111
> +#: pbuilder-doc.xml:1102
> msgid "nodev mount options hinder pbuilder activity"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1113
> +#: pbuilder-doc.xml:1104
> msgid ""
> "If you see messages such as this when building a chroot, you are mounting "
> "the file system with the nodev option."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><screen>
> -#: pbuilder-doc.xml:1117
> +#: pbuilder-doc.xml:1107
> #, no-wrap
> -msgid "/var/lib/dpkg/info/base-files.postinst: /dev/null: Permission denied"
> +msgid ""
> +"\n"
> +"\t/var/lib/dpkg/info/base-files.postinst: /dev/null: Permission denied"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1120
> +#: pbuilder-doc.xml:1110
> msgid ""
> "You will also have problems if you mount the file system with the noexec "
> "option, or nosuid. Make sure you do not have these flags set when mounting "
> @@ -1987,24 +2029,24 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1126
> +#: pbuilder-doc.xml:1116
> msgid "This is not a problem when using <command>user-mode-linux</command>."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1129
> +#: pbuilder-doc.xml:1119
> msgid ""
> "See <ulink url=\"http://bugs.debian.org/316135\"> 316135 </ulink> for "
> "example."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><title>
> -#: pbuilder-doc.xml:1135
> +#: pbuilder-doc.xml:1125
> msgid "pbuilder is slow"
> msgstr "pbuilder が遅い"
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1137
> +#: pbuilder-doc.xml:1127
> msgid ""
> "<command>pbuilder</command> is often slow. The slowest part of "
> "<command>pbuilder</command> is extracting the tar.gz every time "
> @@ -2015,7 +2057,7 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1146
> +#: pbuilder-doc.xml:1136
> msgid ""
> "<command>pbuilder-user-mode-linux</command> is slower in executing the "
> "actual build system, due to the usual <command>user-mode-linux</command> "
> @@ -2023,50 +2065,61 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1152
> +#: pbuilder-doc.xml:1142
> msgid ""
> "<command>pbuilder</command> with cowdancer is also an alternative that "
> "improves speed of pbuilder startup."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><title>
> -#: pbuilder-doc.xml:1157
> +#: pbuilder-doc.xml:1147
> msgid "Using pdebuild to sponsor package"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para><command>
> -#: pbuilder-doc.xml:1159
> +#: pbuilder-doc.xml:1149
> msgid ""
> "To sign a package marking for sponsorship, it is possible to use<command>"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><screen><command><option>
> -#: pbuilder-doc.xml:1160 pbuilder-doc.xml:1165
> +#: pbuilder-doc.xml:1150 pbuilder-doc.xml:1155
> msgid "--auto-debsign"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para><command>
> -#: pbuilder-doc.xml:1160
> +#: pbuilder-doc.xml:1150
> msgid "</command> and <command>"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><screen><command><option>
> -#: pbuilder-doc.xml:1161 pbuilder-doc.xml:1165
> +#: pbuilder-doc.xml:1151 pbuilder-doc.xml:1155
> msgid "--debsign-k"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1161
> +#: pbuilder-doc.xml:1151
> msgid "</command> options of <command>pdebuild</command>."
> msgstr ""
>
> +# type: Content of: <book><chapter><sect1><para><command>
> +#: pbuilder-doc.xml:1155
> +msgid "<command>pdebuild"
> +msgstr "<command>pdebuild"
> +
> +# type: Content of: <book><chapter><sect1><screen>
> +#: pbuilder-doc.xml:1155
> +#, no-wrap
> +msgid "<parameter>XXXXXXXX</parameter></command>"
> +msgstr ""
> +
> # type: Content of: <book><chapter><sect1><title>
> -#: pbuilder-doc.xml:1169
> +#: pbuilder-doc.xml:1158
> msgid "Why is there a source.changes file in ../?"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1171
> +#: pbuilder-doc.xml:1160
> msgid ""
> "When running <command>pdebuild</command>, <command>pbuilder</command> will "
> "run dpkg-buildpackage to create a Debian source package to pass it on to "
> @@ -2076,17 +2129,17 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1177
> -msgid "This behaviour is different when running through"
> +#: pbuilder-doc.xml:1166
> +msgid "This behavior is different when running through"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><title>
> -#: pbuilder-doc.xml:1181
> +#: pbuilder-doc.xml:1170
> msgid "amd64 and i386-mode"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para><command>
> -#: pbuilder-doc.xml:1183
> +#: pbuilder-doc.xml:1172
> msgid ""
> "amd64 architectures are capable of running binaries in i386 mode. It is "
> "possible to use <command>pbuilder</command> to run packages, using "
> @@ -2094,51 +2147,62 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para><command><option>
> -#: pbuilder-doc.xml:1186
> +#: pbuilder-doc.xml:1175
> msgid "--arch"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1186
> +#: pbuilder-doc.xml:1175
> msgid ""
> "</command> option. Specifically, a command-line option like the following "
> "will work."
> msgstr ""
>
> +# type: Content of: <book><chapter><sect1><para><screen>
> +#: pbuilder-doc.xml:1180
> +#, no-wrap
> +msgid ""
> +"\n"
> +"<command>pbuilder create --distribution sid --debootstrapopts --arch --debootstrapopts i386 \\\n"
> +" --basetgz /var/cache/pbuilder/base-i386.tgz --mirror http://ftp.jp.debian.org/debian</command>\n"
> +"<command>linux32 pbuilder build --basetgz /var/cache/pbuilder/base-i386.tgz</command>"
> +msgstr ""
> +
> # type: Content of: <book><chapter><sect1><title>
> -#: pbuilder-doc.xml:1199
> +#: pbuilder-doc.xml:1187
> msgid "How to use ccache"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1201
> +#: pbuilder-doc.xml:1189
> msgid ""
> "To use <command>ccache</command> with <command>pbuilder</command>, use the "
> -"following for configuration. Note that the directory used for CCACHE_DIR "
> -"needs to exist, and be writable by user within <command>chroot</command>. "
> -"The default user within <command>chroot</command> is"
> +"following configuration. Note that the directory used for CCACHE_DIR needs "
> +"to exist, and be writable by user within <command>chroot</command>. The "
> +"default user within <command>chroot</command> is"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para><screen>
> -#: pbuilder-doc.xml:1205
> +#: pbuilder-doc.xml:1193
> #, no-wrap
> msgid "uid=1234"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1205 pbuilder-doc.xml:1228
> +#: pbuilder-doc.xml:1193 pbuilder-doc.xml:1215
> msgid "."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1208
> +#: pbuilder-doc.xml:1196
> msgid "Example is provided as pbuilderrc.ccache."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><screen>
> -#: pbuilder-doc.xml:1211
> +#: pbuilder-doc.xml:1198
> #, no-wrap
> msgid ""
> +"\n"
> "export CCACHE_DIR=\"/var/cache/pbuilder/ccache\"\n"
> "export PATH=\"/usr/lib/ccache:${PATH}\"\n"
> "\n"
> @@ -2146,13 +2210,20 @@ msgid ""
> "BINDMOUNTS=\"${CCACHE_DIR}\""
> msgstr ""
>
> +# type: Content of: <book><chapter><sect1><para>
> +#: pbuilder-doc.xml:1205
> +msgid ""
> +"<ulink url=\"http://web.glandium.org/blog/?p=55\">This entry created thanks "
> +"to a blog posting. </ulink>"
> +msgstr ""
> +
> # type: Content of: <book><chapter><sect1><title>
> -#: pbuilder-doc.xml:1223
> +#: pbuilder-doc.xml:1210
> msgid "Using tmpfs for buildplace"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1225
> +#: pbuilder-doc.xml:1212
> msgid ""
> "To improve speed of operation, it is possible to use tmpfs for pbuilder "
> "build location. Mount tmpfs to <filename>/var/cache/pbuilder/build</"
> @@ -2160,47 +2231,56 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><title>
> -#: pbuilder-doc.xml:1232
> +#: pbuilder-doc.xml:1219
> msgid "Using svn-buildpackage together with pbuilder"
> msgstr "svn-buildpackage を pbuilder で利用する"
>
> # type: Content of: <book><chapter><sect1><para><footnote>
> -#: pbuilder-doc.xml:1234
> +#: pbuilder-doc.xml:1221
> msgid ""
> "pdebuild command can be used with svn-buildpackage --svn-builder command-"
> "line option. <footnote>"
> msgstr ""
>
> +# type: Content of: <book><chapter><sect1><para><footnote><para>
> +#: pbuilder-doc.xml:1224
> +msgid ""
> +"<ulink url=\"http://upsilon.cc/~zack/blog/posts/2007/09/svn-cowbuilder/\"> "
> +"Zack has posted an example on his blog. </ulink>"
> +msgstr ""
> +
> # type: Content of: <book><chapter><sect1><screen>
> -#: pbuilder-doc.xml:1243
> +#: pbuilder-doc.xml:1229
> #, no-wrap
> -msgid "alias svn-cowbuilder=\"svn-buildpackage --svn-builder='pdebuild --pbuilder cowbuilder\""
> +msgid ""
> +"\n"
> +"alias svn-cowbuilder=\"svn-buildpackage --svn-builder='pdebuild --pbuilder cowbuilder\""
> msgstr ""
>
> # type: Content of: <book><chapter><title>
> -#: pbuilder-doc.xml:1251
> +#: pbuilder-doc.xml:1237
> msgid "Troubleshooting and development"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><title>
> -#: pbuilder-doc.xml:1253
> +#: pbuilder-doc.xml:1239
> msgid "Reporting bugs"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para><command>
> -#: pbuilder-doc.xml:1255
> +#: pbuilder-doc.xml:1241
> msgid ""
> "To report bugs, it would be important to have a log of what's going wrong. "
> "Most of the time, adding a <command>"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para><command><option>
> -#: pbuilder-doc.xml:1257
> +#: pbuilder-doc.xml:1243
> msgid "--debug"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1257
> +#: pbuilder-doc.xml:1243
> msgid ""
> "</command> option and re-running the session should do the trick. Please "
> "send the log of such session along with your problem to ease the debugging "
> @@ -2208,12 +2288,12 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><title>
> -#: pbuilder-doc.xml:1264
> +#: pbuilder-doc.xml:1250
> msgid "Mailing list"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1266
> +#: pbuilder-doc.xml:1252
> msgid ""
> "There is a mailing list for <command>pbuilder</command> on alioth (pbuilder-"
> "maint at lists.alioth.debian.org). You can subscribe through the alioth web "
> @@ -2222,12 +2302,12 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><title>
> -#: pbuilder-doc.xml:1274
> +#: pbuilder-doc.xml:1260
> msgid "IRC Channel"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1276
> +#: pbuilder-doc.xml:1262
> msgid ""
> "For coordination and communication, IRC channel #pbuilder on irc.oftc.net is "
> "used. Please log your intent there when you are going to start doing some "
> @@ -2235,19 +2315,19 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><title>
> -#: pbuilder-doc.xml:1283
> +#: pbuilder-doc.xml:1269
> msgid "Information for pbuilder developers"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1285
> +#: pbuilder-doc.xml:1271
> msgid ""
> "This section tries to document current development practices and how things "
> "generally operate in development."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1289
> +#: pbuilder-doc.xml:1275
> msgid ""
> "<command>pbuilder</command> is co-maintained with resources provided by "
> "Alioth. There is an Alioth project page at <ulink url=\"http://alioth."
> @@ -2259,16 +2339,17 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><screen>
> -#: pbuilder-doc.xml:1303
> +#: pbuilder-doc.xml:1288
> #, no-wrap
> msgid ""
> +"\n"
> "git-clone git://git.debian.org/git/pbuilder/pbuilder.git\n"
> "git-clone http://git.debian.org/git/pbuilder/pbuilder.git\n"
> "git-clone ssh://git.debian.org/git/pbuilder/pbuilder.git"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1308
> +#: pbuilder-doc.xml:1293
> msgid ""
> "Test-suites are available in <filename>./testsuite/</filename> directory. "
> "Changes are expected not to break the test-suites. <filename>./run-test.sh</"
> @@ -2281,78 +2362,128 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><table><title>
> -#: pbuilder-doc.xml:1317
> +#: pbuilder-doc.xml:1302
> msgid "Directory structure of the testsuite"
> -msgstr ""
> +msgstr "テストスイートのディレクトリ構造"
>
> # type: Content of: <book><chapter><sect1><table><tgroup><thead><row><entry>
> -#: pbuilder-doc.xml:1323 pbuilder-doc.xml:1568 pbuilder-doc.xml:1632
> +#: pbuilder-doc.xml:1308 pbuilder-doc.xml:1548 pbuilder-doc.xml:1612
> msgid "Directory"
> -msgstr ""
> +msgstr "ディレクトリ"
>
> # type: Content of: <book><chapter><sect1><table><tgroup><thead><row><entry>
> -#: pbuilder-doc.xml:1324 pbuilder-doc.xml:1569 pbuilder-doc.xml:1633
> +#: pbuilder-doc.xml:1309 pbuilder-doc.xml:1549 pbuilder-doc.xml:1613
> msgid "Meaning"
> -msgstr ""
> +msgstr "意味"
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> -#: pbuilder-doc.xml:1330
> +#: pbuilder-doc.xml:1314
> +msgid "<filename>./testsuite/</filename>"
> +msgstr "<filename>./testsuite/</filename>"
> +
> +# type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> +#: pbuilder-doc.xml:1315
> msgid "Directory for testsuite"
> -msgstr ""
> +msgstr "テストスイートへのディレクトリ"
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> -#: pbuilder-doc.xml:1334
> +#: pbuilder-doc.xml:1318
> +msgid "<filename>./testsuite/run-test.sh</filename>"
> +msgstr "<filename>./testsuite/run-test.sh</filename>"
> +
> +# type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> +#: pbuilder-doc.xml:1319
> msgid ""
> "Daily regression test to test against Debian Archive changes breaking "
> "pbuilder."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> -#: pbuilder-doc.xml:1338
> +#: pbuilder-doc.xml:1322
> +msgid "<filename>./testsuite/run-test.log</filename>"
> +msgstr "<filename>./testsuite/run-test.log</filename>"
> +
> +# type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> +#: pbuilder-doc.xml:1323
> msgid "A summary of testsuite"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> -#: pbuilder-doc.xml:1342
> +#: pbuilder-doc.xml:1326
> +msgid "<filename>./testsuite/normal/</filename>"
> +msgstr ""
> +
> +# type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> +#: pbuilder-doc.xml:1327
> msgid "Directory for testsuite results of running pbuilder with debootstrap"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> -#: pbuilder-doc.xml:1346
> +#: pbuilder-doc.xml:1330
> +msgid "<filename>./testsuite/cdebootstrap/</filename>"
> +msgstr ""
> +
> +# type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> +#: pbuilder-doc.xml:1331
> msgid "Directory for testsuite results of running pbuilder with cdebootstrap"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> -#: pbuilder-doc.xml:1350
> +#: pbuilder-doc.xml:1334
> +msgid "<filename>./testsuite/run-regression.sh</filename>"
> +msgstr ""
> +
> +# type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> +#: pbuilder-doc.xml:1335
> msgid ""
> "Regression testsuite, ran every time change is made to pbuilder to make sure "
> "there is no regression."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> -#: pbuilder-doc.xml:1354
> +#: pbuilder-doc.xml:1338
> +msgid "<filename>./testsuite/run-regression.log</filename>"
> +msgstr ""
> +
> +# type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> +#: pbuilder-doc.xml:1339
> msgid "Summary of test result"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> -#: pbuilder-doc.xml:1358
> +#: pbuilder-doc.xml:1342
> +msgid "<filename>./testsuite/regression/BugID-*.sh</filename>"
> +msgstr ""
> +
> +# type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> +#: pbuilder-doc.xml:1343
> msgid "Regression tests, exit 0 for success, exit 1 for failure"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> -#: pbuilder-doc.xml:1362
> -msgid "Files used for the regression testsuite."
> +#: pbuilder-doc.xml:1346
> +msgid "<filename>./testsuite/regression/BugID-*</filename>"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> -#: pbuilder-doc.xml:1366
> +#: pbuilder-doc.xml:1347
> +msgid "Files used for the regression testsuite."
> +msgstr "回帰テストスイートに利用されるファイル"
> +
> +# type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> +#: pbuilder-doc.xml:1350
> +msgid "<filename>./testsuite/regression/log/BugID-*.sh.log</filename>"
> +msgstr "<filename>./testsuite/regression/log/BugID-*.sh.log</filename>"
> +
> +# type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> +#: pbuilder-doc.xml:1351
> msgid ""
> "Output of the regression test, output from the script is redirected by run-"
> "regression.sh"
> -msgstr ""
> +msgstr "回帰テストの出力、 run-regression.sh によりスクリプトの出力がリダイレクトされる"
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1372
> +#: pbuilder-doc.xml:1357
> msgid ""
> "When making changes, changes should be documented in the Git commit log. "
> "git-dch will generate debian/changelog from the commit log. Make the first "
> @@ -2361,7 +2492,7 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1378
> +#: pbuilder-doc.xml:1363
> msgid ""
> "A TODO file is available in <filename>debian/TODO</filename>. It's mostly "
> "not well-maintained, but hopefully it will be more up-to-date when people "
> @@ -2369,7 +2500,7 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1384
> +#: pbuilder-doc.xml:1369
> msgid ""
> "When releasing a new version of <command>pbuilder</command>, the version is "
> "tagged with the git tag X.XXX (version number). This is done with "
> @@ -2377,17 +2508,17 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><title>
> -#: pbuilder-doc.xml:1392
> +#: pbuilder-doc.xml:1377
> msgid "Other uses of pbuilder"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><title>
> -#: pbuilder-doc.xml:1394
> +#: pbuilder-doc.xml:1379
> msgid "Using pbuilder for small experiments"
> -msgstr ""
> +msgstr "pbuilder を小規模な実験のために活用する"
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1396
> +#: pbuilder-doc.xml:1381
> msgid ""
> "There are cases when some small experimenting is required, and you do not "
> "want to damage the main system, like when installing experimental library "
> @@ -2396,7 +2527,7 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1403
> +#: pbuilder-doc.xml:1388
> msgid ""
> "<command>pbuilder login </command> is a debugging feature for "
> "<command>pbuilder</command> itself, but it also allows users to have a "
> @@ -2404,19 +2535,19 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1407
> +#: pbuilder-doc.xml:1392
> msgid ""
> "Note that the chroot is cleaned after logging out of the shell, and mounting "
> "file systems inside it is considered harmful."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><title>
> -#: pbuilder-doc.xml:1412
> +#: pbuilder-doc.xml:1397
> msgid "Running little programs inside the chroot"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1414
> +#: pbuilder-doc.xml:1399
> msgid ""
> "To facilitate using <command>pbuilder</command> for other uses, "
> "<command>pbuilder execute</command> is available. <command>pbuilder execute "
> @@ -2425,31 +2556,31 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1421
> +#: pbuilder-doc.xml:1406
> msgid ""
> "The script can be useful for sequences of operations such as installing ssh "
> "and adding a new user inside the chroot."
> msgstr ""
>
> # type: Content of: <book><chapter><title>
> -#: pbuilder-doc.xml:1427
> +#: pbuilder-doc.xml:1412
> msgid "Experimental or wish-list features of pbuilder"
> -msgstr ""
> +msgstr "実験的な pbuilder の wish-list 的な機能"
>
> # type: Content of: <book><chapter><para>
> -#: pbuilder-doc.xml:1429
> +#: pbuilder-doc.xml:1414
> msgid ""
> "There are some advanced features, above that of the basic feature of "
> "<command>pbuilder</command>, for some specific purposes."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><title>
> -#: pbuilder-doc.xml:1433
> +#: pbuilder-doc.xml:1418
> msgid "Using LVM"
> -msgstr ""
> +msgstr "LVMの活用"
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1435
> +#: pbuilder-doc.xml:1420
> msgid ""
> "LVM2 has a useful snapshot function that features Copy-on-write images. "
> "That could be used for <command>pbuilder</command> just as it can be used "
> @@ -2460,12 +2591,12 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><title>
> -#: pbuilder-doc.xml:1444
> +#: pbuilder-doc.xml:1429
> msgid "Using cowdancer"
> -msgstr ""
> +msgstr "cowdancer の活用"
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1446
> +#: pbuilder-doc.xml:1431
> msgid ""
> "<command>cowdancer</command> allows copy-on-write semantics on file system "
> "using hard links and hard-link-breaking-on-write tricks. <command>pbuilder</"
> @@ -2476,56 +2607,63 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1457
> +#: pbuilder-doc.xml:1442
> msgid "Example command-lines for cowbuilder look like the following."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para><screen>
> -#: pbuilder-doc.xml:1461
> +#: pbuilder-doc.xml:1445
> #, no-wrap
> msgid ""
> +"\n"
> "# cowbuilder --create --distribution sid\n"
> "# cowbuilder --update --distribution sid\n"
> "# cowbuilder --build XXX.dsc"
> msgstr ""
> +"\n"
> +"# cowbuilder --create --distribution sid\n"
> +"# cowbuilder --update --distribution sid\n"
> +"# cowbuilder --build XXX.dsc"
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1467
> +#: pbuilder-doc.xml:1451
> msgid ""
> "It is also possible to use cowdancer with pdebuild command. Specify with "
> "command-line option"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para><option>
> -#: pbuilder-doc.xml:1468
> +#: pbuilder-doc.xml:1452
> msgid "--pbuilder"
> -msgstr ""
> +msgstr "--pbuilder"
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1469
> +#: pbuilder-doc.xml:1453
> msgid "or set it in PDEBUILD_PBUILDER configuration option."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para><screen>
> -#: pbuilder-doc.xml:1473
> +#: pbuilder-doc.xml:1456
> #, no-wrap
> -msgid "$ pdebuild --pbuilder cowbuilder"
> -msgstr ""
> +msgid ""
> +"\n"
> +"$ pdebuild --pbuilder cowbuilder"
> +msgstr "\n$ pdebuild --pbuilder cowbuilder"
>
> # type: Content of: <book><chapter><sect1><sect2><title>
> -#: pbuilder-doc.xml:1477
> +#: pbuilder-doc.xml:1460
> msgid "Using cowdancer for sarge"
> -msgstr ""
> +msgstr "sarge 向けに cowdancer を利用する"
>
> # type: Content of: <book><chapter><sect1><sect2><para>
> -#: pbuilder-doc.xml:1479
> +#: pbuilder-doc.xml:1462
> msgid ""
> "This section is mostly obsolete now that etch is released, but left for "
> "reference, and will be removed after lenny release."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><sect2><para>
> -#: pbuilder-doc.xml:1484
> +#: pbuilder-doc.xml:1467
> msgid ""
> "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 "
> @@ -2533,7 +2671,7 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><sect2><para>
> -#: pbuilder-doc.xml:1489
> +#: pbuilder-doc.xml:1472
> msgid ""
> "One way to workaround the problem is to set APTCONFDIR in pbuilderrc to "
> "point to a directory with a list of sources for APT which has both sarge and "
> @@ -2541,9 +2679,10 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><sect2><para><screen>
> -#: pbuilder-doc.xml:1495
> +#: pbuilder-doc.xml:1477
> #, no-wrap
> msgid ""
> +"\n"
> "$ cat sources.list\n"
> "# sarge-backports\n"
> "deb http://www.backports.org/debian sarge-backports main\n"
> @@ -2553,37 +2692,53 @@ msgid ""
> "deb http://ftp.de.debian.org/debian sarge main\n"
> "deb-src http://ftp.de.debian.org/debian sarge main"
> msgstr ""
> +"\n"
> +"$ cat sources.list\n"
> +"# sarge-backports\n"
> +"deb http://www.backports.org/debian sarge-backports main\n"
> +"deb-src http://www.backports.org/debian sarge-backports main\n"
> +"\n"
> +"# sarge\n"
> +"deb http://ftp.de.debian.org/debian sarge main\n"
> +"deb-src http://ftp.de.debian.org/debian sarge main"
>
> # type: Content of: <book><chapter><sect1><sect2><para>
> -#: pbuilder-doc.xml:1506
> +#: pbuilder-doc.xml:1488
> msgid ""
> "It is recommended to \"Pin\" the cowdancer package appropriately in this "
> "case, via the APT preferences mechanism."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><sect2><para><screen>
> -#: pbuilder-doc.xml:1511
> +#: pbuilder-doc.xml:1492
> #, no-wrap
> msgid ""
> +"\n"
> "$ cat preferences\n"
> "Explanation: use cowdancer from backports\n"
> "Package: cowdancer\n"
> "Pin: release a=sarge-backports\n"
> "Pin-Priority: 950"
> msgstr ""
> +"\n"
> +"$ cat preferences\n"
> +"Explanation: use cowdancer from backports\n"
> +"Package: cowdancer\n"
> +"Pin: release a=sarge-backports\n"
> +"Pin-Priority: 950"
>
> # type: Content of: <book><chapter><sect1><title>
> -#: pbuilder-doc.xml:1521
> +#: pbuilder-doc.xml:1502
> msgid "Using pbuilder without tar.gz"
> msgstr "tar.gz を利用しないで pbuilder を利用する"
>
> # type: Content of: <book><chapter><sect1><para><command><option>
> -#: pbuilder-doc.xml:1523
> +#: pbuilder-doc.xml:1504
> msgid "--no-targz"
> msgstr "--no-targz"
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1523
> +#: pbuilder-doc.xml:1504
> msgid ""
> "</command> option of <command>pbuilder</command> will allow usage of "
> "<command>pbuilder</command> in a different way from conventional usage. It "
> @@ -2592,31 +2747,33 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1534
> +#: pbuilder-doc.xml:1515
> msgid ""
> "It should be possible to create base chroot images for <command>dchroot</"
> "command> with the following commands:"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para><screen>
> -#: pbuilder-doc.xml:1537
> +#: pbuilder-doc.xml:1517
> #, no-wrap
> msgid ""
> +"\n"
> "# pbuilder create --distribution etch --no-targz --basetgz /chroot/etch\n"
> "# pbuilder create --distribution lenny --no-targz --basetgz /chroot/lenny\n"
> "# pbuilder create --distribution sid --no-targz --basetgz /chroot/sid"
> msgstr ""
> +"\n"
> "# pbuilder create --distribution etch --no-targz --basetgz /chroot/etch\n"
> "# pbuilder create --distribution lenny --no-targz --basetgz /chroot/lenny\n"
> "# pbuilder create --distribution sid --no-targz --basetgz /chroot/sid"
>
> # type: Content of: <book><chapter><sect1><title>
> -#: pbuilder-doc.xml:1544
> +#: pbuilder-doc.xml:1524
> msgid "Using pbuilder in a vserver"
> msgstr "pbuilder を vserver で利用する"
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1546
> +#: pbuilder-doc.xml:1526
> msgid ""
> "It is possible to use <command>pbuilder</command> in a vserver environment. "
> "This requires either vserver-patches in version 2.1.1-rc14 or higher, or a "
> @@ -2624,7 +2781,7 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1551
> +#: pbuilder-doc.xml:1531
> msgid ""
> "To use <command>pbuilder</command> in a vserver, you need to set the "
> "<command>secure_mount</command> <command>CAPS</command> in the "
> @@ -2632,106 +2789,171 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><title>
> -#: pbuilder-doc.xml:1558
> +#: pbuilder-doc.xml:1538
> msgid "Reference materials"
> msgstr "参考文献"
>
> # type: Content of: <book><chapter><sect1><title>
> -#: pbuilder-doc.xml:1560
> +#: pbuilder-doc.xml:1540
> msgid "Directory structure outside the chroot"
> msgstr "chroot 外部のディレクトリ構造"
>
> # type: Content of: <book><chapter><sect1><table><title>
> -#: pbuilder-doc.xml:1562
> +#: pbuilder-doc.xml:1542
> msgid "Directory Structure outside the chroot"
> msgstr "chroot 内部のディレクトリ構造"
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> -#: pbuilder-doc.xml:1575
> +#: pbuilder-doc.xml:1554
> +msgid "<filename>/etc/pbuilderrc</filename>"
> +msgstr "<filename>/etc/pbuilderrc</filename>"
> +
> +# type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> +#: pbuilder-doc.xml:1555
> msgid "configuration file"
> msgstr "設定ファイル"
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> -#: pbuilder-doc.xml:1579
> +#: pbuilder-doc.xml:1558
> +msgid "<filename>/usr/share/pbuilder/pbuilderrc</filename>"
> +msgstr ""
> +
> +# type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> +#: pbuilder-doc.xml:1559
> msgid "Default configuration"
> msgstr "デフォルト設定"
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> -#: pbuilder-doc.xml:1583
> +#: pbuilder-doc.xml:1562
> +msgid "<filename>/var/cache/pbuilder/base.tgz</filename>"
> +msgstr ""
> +
> +# type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> +#: pbuilder-doc.xml:1563
> msgid ""
> "Default location pbuilder uses for base.tgz, the tar-ball containing a basic "
> "Debian installation with only the build-essential packages."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> -#: pbuilder-doc.xml:1589
> +#: pbuilder-doc.xml:1568
> +msgid "<filename>/var/cache/pbuilder/build/PID/</filename>"
> +msgstr ""
> +
> +# type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> +#: pbuilder-doc.xml:1569
> msgid "Default location pbuilder uses for chroot"
> msgstr "pbuilder がデフォルトでchroot のために利用する場所"
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> -#: pbuilder-doc.xml:1593
> +#: pbuilder-doc.xml:1572
> +msgid "<filename>/var/cache/pbuilder/aptcache</filename>"
> +msgstr ""
> +
> +# type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> +#: pbuilder-doc.xml:1573
> msgid ""
> "Default location <command>pbuilder</command> will use as apt cache, to store "
> "deb packages required during <command>pbuilder</command> build."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> -#: pbuilder-doc.xml:1597
> +#: pbuilder-doc.xml:1576
> +msgid "<filename>/var/cache/pbuilder/result</filename>"
> +msgstr ""
> +
> +# type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> +#: pbuilder-doc.xml:1577
> msgid ""
> "Default location <command>pbuilder</command> puts the deb files and other "
> "files created after build"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> -#: pbuilder-doc.xml:1601
> +#: pbuilder-doc.xml:1580
> +msgid "<filename>/var/cache/pbuilder/pbuilder-umlresult</filename>"
> +msgstr ""
> +
> +# type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> +#: pbuilder-doc.xml:1581
> msgid ""
> "Default location <command>pbuilder-user-mode-linux</command> puts the deb "
> "files and other files created after build"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> -#: pbuilder-doc.xml:1605
> +#: pbuilder-doc.xml:1584
> +msgid "<filename>/var/cache/pbuilder/pbuilder-mnt</filename>"
> +msgstr ""
> +
> +# type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> +#: pbuilder-doc.xml:1585
> msgid ""
> "Default location <command>pbuilder-user-mode-linux</command> uses for "
> "mounting the COW file system, for chrooting."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> -#: pbuilder-doc.xml:1609
> +#: pbuilder-doc.xml:1588
> +msgid "<filename>/tmp</filename>"
> +msgstr "<filename>/tmp</filename>"
> +
> +# type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> +#: pbuilder-doc.xml:1589
> msgid "<command>pbuilder-user-mode-linux</command> will mount tmpfs for work."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> -#: pbuilder-doc.xml:1613
> +#: pbuilder-doc.xml:1592
> +msgid "<filename>${HOME}/tmp/PID.cow</filename>"
> +msgstr ""
> +
> +# type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> +#: pbuilder-doc.xml:1593
> msgid ""
> "<command>pbuilder-user-mode-linux</command> use this directory for location "
> "of COW file system."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> -#: pbuilder-doc.xml:1617
> +#: pbuilder-doc.xml:1596
> +msgid "<filename>${HOME}/uml-image</filename>"
> +msgstr ""
> +
> +# type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> +#: pbuilder-doc.xml:1597
> msgid ""
> "<command>pbuilder-user-mode-linux</command> use this directory for user-mode-"
> "linux full disk image."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><title>
> -#: pbuilder-doc.xml:1624
> +#: pbuilder-doc.xml:1604
> msgid "Directory structure inside the chroot"
> msgstr "chroot 内部のディレクトリ構造"
>
> # type: Content of: <book><chapter><sect1><table><title>
> -#: pbuilder-doc.xml:1626
> +#: pbuilder-doc.xml:1606
> msgid "Directory Structure inside the chroot"
> msgstr "chroot 内部のディレクトリ構造"
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> -#: pbuilder-doc.xml:1640
> +#: pbuilder-doc.xml:1618
> +msgid "<filename>/etc/mtab</filename>"
> +msgstr "<filename>/etc/mtab</filename>"
> +
> +# type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> +#: pbuilder-doc.xml:1620
> msgid "symlink to <filename>/proc/mounts</filename>."
> msgstr " <filename>/proc/mounts</filename>へのシンボリックリンク。"
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> -#: pbuilder-doc.xml:1645
> +#: pbuilder-doc.xml:1624
> +msgid "<filename>/tmp/buildd</filename>"
> +msgstr "<filename>/tmp/buildd</filename>"
> +
> +# type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> +#: pbuilder-doc.xml:1625
> msgid ""
> "Default place used in <command>pbuilder</command> to place the Debian "
> "package to be processed. <filename>/tmp/buildd/packagename-version/</"
> @@ -2741,19 +2963,34 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> -#: pbuilder-doc.xml:1655
> +#: pbuilder-doc.xml:1634
> +msgid "<filename>/run</filename>"
> +msgstr "<filename>/run</filename>"
> +
> +# type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> +#: pbuilder-doc.xml:1635
> msgid ""
> "The script passed as an argument to <command>pbuilder</command> execute is "
> "passed on."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> -#: pbuilder-doc.xml:1663
> +#: pbuilder-doc.xml:1641
> +msgid "<filename>/tmp/hooks</filename>"
> +msgstr "<filename>/tmp/hooks</filename>"
> +
> +# type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> +#: pbuilder-doc.xml:1643
> msgid "The location of hooks."
> msgstr "フックの場所。"
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> -#: pbuilder-doc.xml:1669
> +#: pbuilder-doc.xml:1647
> +msgid "<filename>/var/cache/apt/archives</filename>"
> +msgstr "<filename>/var/cache/apt/archives</filename>"
> +
> +# type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> +#: pbuilder-doc.xml:1649
> msgid ""
> "<command>pbuilder</command> copies the content of this directory to and from "
> "the aptcache directory of outside chroot."
> @@ -2762,7 +2999,12 @@ msgstr ""
> "してきたり、chroot 外部の aptcache ディレクトリへコピーしたりします。"
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> -#: pbuilder-doc.xml:1675
> +#: pbuilder-doc.xml:1654
> +msgid "<filename>/tmp/XXXX</filename>"
> +msgstr "<filename>/tmp/XXXX</filename>"
> +
> +# type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> +#: pbuilder-doc.xml:1655
> msgid ""
> "<command>pbuilder-user-mode-linux</command> uses a script in <filename>/tmp</"
> "filename> to bootstrap into user-mode-linux"
> @@ -2771,24 +3013,24 @@ msgstr ""
> "クリプトを利用して user-mode-linux にブートストラップします。"
>
> # type: Content of: <book><chapter><title>
> -#: pbuilder-doc.xml:1685
> +#: pbuilder-doc.xml:1665
> msgid "Minor archaeological details"
> msgstr "些細な過去の経緯の詳細"
>
> # type: Content of: <book><chapter><sect1><title>
> -#: pbuilder-doc.xml:1687
> +#: pbuilder-doc.xml:1667
> msgid "Documentation history"
> msgstr "マニュアルの履歴"
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1689
> +#: pbuilder-doc.xml:1669
> msgid ""
> "This document was started on 28 Dec 2002 by Junichi Uekawa, trying to "
> "document what is known about <command>pbuilder</command>."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1694
> +#: pbuilder-doc.xml:1674
> msgid ""
> "This documentation is available from the <command>pbuilder</command> source "
> "tar-ball, and from the git repository of <command>pbuilder</command> (web-"
> @@ -2802,19 +3044,19 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1705
> +#: pbuilder-doc.xml:1685
> msgid ""
> "Documentation is written using DocBook XML, with emacs PSGML mode, and using "
> "wysidocbookxml for live previewing."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><title>
> -#: pbuilder-doc.xml:1711
> +#: pbuilder-doc.xml:1691
> msgid "Possibly inaccurate Background History of pbuilder"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> -#: pbuilder-doc.xml:1713
> +#: pbuilder-doc.xml:1693
> msgid ""
> "The following is a most possibly inaccurate account of how "
> "<command>pbuilder</command> came to happen, and other attempts to make "
> @@ -2824,12 +3066,12 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><sect2><title>
> -#: pbuilder-doc.xml:1720
> +#: pbuilder-doc.xml:1700
> msgid "The Time Before pbuilder"
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><sect2><para>
> -#: pbuilder-doc.xml:1722
> +#: pbuilder-doc.xml:1702
> msgid ""
> "There was once dbuild, which was a shell script to build Debian packages "
> "from source. Lars Wirzenius wrote that script, and it was good, short, and "
> @@ -2839,7 +3081,7 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><sect2><para>
> -#: pbuilder-doc.xml:1729
> +#: pbuilder-doc.xml:1709
> msgid ""
> "debbuild was probably written by James Troup. I don't know it because I have "
> "never seen the actual code, I could only find some references to it on the "
> @@ -2847,7 +3089,7 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><sect2><para>
> -#: pbuilder-doc.xml:1734
> +#: pbuilder-doc.xml:1714
> msgid ""
> "sbuild is a perl script to build Debian packages from source. It parses "
> "Build-Depends, and performs other miscellaneous checks, and has a lot of "
> @@ -2861,12 +3103,12 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><sect2><title>
> -#: pbuilder-doc.xml:1748
> +#: pbuilder-doc.xml:1728
> msgid "Birth of pbuilder"
> msgstr "pbuilder の誕生"
>
> # type: Content of: <book><chapter><sect1><sect2><para>
> -#: pbuilder-doc.xml:1750
> +#: pbuilder-doc.xml:1730
> msgid ""
> "wanna-build (sbuild) was (at the time of year 2001) quite difficult to set "
> "up, and it was never a Debian package. dbuild was something that predated "
> @@ -2874,7 +3116,7 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><sect2><para>
> -#: pbuilder-doc.xml:1755
> +#: pbuilder-doc.xml:1735
> msgid ""
> "Building packages from source using Build-Depends information within a "
> "chroot sounded trivial; and <command>pbuilder</command> was born. It was "
> @@ -2884,21 +3126,21 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><sect2><para>
> -#: pbuilder-doc.xml:1763
> +#: pbuilder-doc.xml:1743
> msgid ""
> "Yes, and it took almost an year to get things somewhat right, and in the "
> "middle of the process, Debian 3.0 was released. Yay. Debian 3.0 wasn't "
> "completely buildable with <command>pbuilder</command>, but the amount of "
> -"packages which are not buildable is steadily decreasing. (I hope)"
> +"packages which are not buildable is steadily decreasing (I hope)."
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><sect2><title>
> -#: pbuilder-doc.xml:1772
> +#: pbuilder-doc.xml:1752
> msgid "And the second year of its life"
> -msgstr ""
> +msgstr "そして二年目の人生"
>
> # type: Content of: <book><chapter><sect1><sect2><para>
> -#: pbuilder-doc.xml:1774
> +#: pbuilder-doc.xml:1754
> msgid ""
> "Someone wanted <command>pbuilder</command> to not run as root, and as User-"
> "mode-linux has become more useful as time passed, I've started experimenting "
> @@ -2910,12 +3152,12 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><sect2><title>
> -#: pbuilder-doc.xml:1787
> +#: pbuilder-doc.xml:1767
> msgid "Fifth year of pbuilder"
> msgstr "pbuilder の5年目"
>
> # type: Content of: <book><chapter><sect1><sect2><para>
> -#: pbuilder-doc.xml:1789
> +#: pbuilder-doc.xml:1769
> msgid ""
> "<command>pbuilder</command> is now widely adopted as a 'almost standard' "
> "tool for testing packages, and building packages in a pristine environment. "
> @@ -2925,7 +3167,7 @@ msgid ""
> msgstr ""
>
> # type: Content of: <book><chapter><sect1><sect2><para>
> -#: pbuilder-doc.xml:1797
> +#: pbuilder-doc.xml:1777
> msgid ""
> "<command>sbuild</command> is now a well-maintained Debian package within "
> "Debian, and with <command>pbuilder</command> being such a slow monster, some "
> --
> 1.5.6.3
>
> [3 0002-UNRELEASED-snapshot-banner.patch <text/x-diff; iso-8859-1 (quoted-printable)>]
> From 0978c835dd6f623a9a972a23e73ffd0a8940c9ac Mon Sep 17 00:00:00 2001
> From: =?utf-8?q?Lo=C3=AFc=20Minier?= <lool at dooz.org>
> Date: Fri, 27 Jun 2008 19:11:51 +0200
> Subject: [PATCH] UNRELEASED snapshot banner
>
> ---
> debian/changelog | 6 ++++++
> 1 files changed, 6 insertions(+), 0 deletions(-)
>
> diff --git a/debian/changelog b/debian/changelog
> index f7aa97f..56639e3 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -1,3 +1,9 @@
> +pbuilder (0.182) UNRELEASED; urgency=low
> +
> + * UNRELEASED snapshot banner
> +
> + -- Loic Minier <lool at dooz.org> Fri, 27 Jun 2008 19:11:12 +0200
> +
> pbuilder (0.181) unstable; urgency=low
>
> [ Esko Arajärvi ]
> --
> 1.5.6.3
>
> [4 0003-pbuilder-satisfydepends-gdebi-add-force-yes-to.patch <text/x-diff; us-ascii (7bit)>]
> >From 9018a81cbd68dd2eb9467bf75f7a45d612b33e54 Mon Sep 17 00:00:00 2001
> From: =?utf-8?q?Lo=C3=AFc=20Minier?= <lool at dooz.org>
> Date: Fri, 27 Jun 2008 19:18:04 +0200
> Subject: [PATCH] pbuilder-satisfydepends-gdebi: add "--force-yes" to apt-get call
>
> Add "--force-yes" to generated apt-get call, consistent with other apt-get
> calls; thanks Michael Vogt; Launchpad #123068.
> ---
> pbuilder-satisfydepends-gdebi | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/pbuilder-satisfydepends-gdebi b/pbuilder-satisfydepends-gdebi
> index 8bd9d5f..5dbe433 100644
> --- a/pbuilder-satisfydepends-gdebi
> +++ b/pbuilder-satisfydepends-gdebi
> @@ -25,7 +25,7 @@ set -e
> function checkbuilddep_internal () {
> $CHROOTEXEC apt-get -y --force-yes install gdebi-core
> INSTALL=$($CHROOTEXEC /usr/bin/gdebi --quiet --apt-line $DEBIAN_CONTROL)
> - $CHROOTEXEC /usr/bin/apt-get install -y $INSTALL
> + $CHROOTEXEC /usr/bin/apt-get install -y --force-yes $INSTALL
> }
>
> . /usr/lib/pbuilder/pbuilder-satisfydepends-checkparams
> --
> 1.5.6.3
>
> [5 0004-pdebuild-Move-to-end-of-arg-chain-for-PDEBUI.patch <text/x-diff; us-ascii (7bit)>]
> >From 5f7293bd5d0e7f3c90090a96d366122e9bec8a66 Mon Sep 17 00:00:00 2001
> From: =?utf-8?q?Lo=C3=AFc=20Minier?= <lool at dooz.org>
> Date: Fri, 27 Jun 2008 19:22:03 +0200
> Subject: [PATCH] pdebuild: Move "$@" to end of "arg chain" for PDEBUILD_BUILDER calls
>
> Move "$@" to end of "arg chain" for PDEBUILD_BUILDER calls as to allow
> a "--buildresult" flag to override the one passed to pbuilder; thanks
> Michael Vogt; Launchpad #129586.
> ---
> pdebuild | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/pdebuild b/pdebuild
> index d83df04..4609431 100644
> --- a/pdebuild
> +++ b/pdebuild
> @@ -45,7 +45,7 @@ export BUILDRESULTUID=$(id -u)
> export BUILDRESULTGID=$(id -g)
>
> if [ "${USE_PDEBUILD_INTERNAL}" = 'yes' ]; then
> - ${PBUILDERROOTCMD} ${PDEBUILD_PBUILDER} --execute "$@" ${EXTRA_CONFIGFILE[@]/#/--configfile } --bindmounts $(readlink -f ..) -- /usr/lib/pbuilder/pdebuild-internal ${PWD} --debbuildopts "${DEBBUILDOPTS}" --uid "${BUILDRESULTUID}" --gid "${BUILDRESULTGID}" --pbuildersatisfydepends "$PBUILDERSATISFYDEPENDSCMD"
> + ${PBUILDERROOTCMD} ${PDEBUILD_PBUILDER} --execute ${EXTRA_CONFIGFILE[@]/#/--configfile } --bindmounts $(readlink -f ..) "$@" -- /usr/lib/pbuilder/pdebuild-internal ${PWD} --debbuildopts "${DEBBUILDOPTS}" --uid "${BUILDRESULTUID}" --gid "${BUILDRESULTGID}" --pbuildersatisfydepends "$PBUILDERSATISFYDEPENDSCMD"
> if [ -d "${BUILDRESULT}" ]; then
> for files in $(sed -rn '/^Files:/,${s/^ .* ([^ ]+)$/\1/p}' ../${CHANGES}); do
> cp -a ../"$files" "${BUILDRESULT}"
> @@ -60,7 +60,7 @@ else
> echo "W: Unmet build-dependency in source" >&2
> fi
> echo "dpkg-buildpackage -S -us -uc -r${BUILDSOURCEROOTCMD} $DEBBUILDOPTS" | perl -pe 's/(^|\s)-[bB](\s|$)/$1$2/g' | /bin/bash
> - ${PBUILDERROOTCMD} ${PDEBUILD_PBUILDER} --build "$@" ${EXTRA_CONFIGFILE[@]/#/--configfile } --buildresult "${BUILDRESULT}" --debbuildopts "${DEBBUILDOPTS}" ../"${PKG_SOURCENAME}_${PKG_VERSION}".dsc
> + ${PBUILDERROOTCMD} ${PDEBUILD_PBUILDER} --build ${EXTRA_CONFIGFILE[@]/#/--configfile } --buildresult "${BUILDRESULT}" --debbuildopts "${DEBBUILDOPTS}" "$@" ../"${PKG_SOURCENAME}_${PKG_VERSION}".dsc
> fi
>
> # do signing with optional key specifier
> --
> 1.5.6.3
>
> [6 0005-Drop-build-dep-on-rootstrap-only-used-at-runtime.patch <text/x-diff; us-ascii (7bit)>]
> >From 9a94c54afb62261451480e750bdc53d862a4f598 Mon Sep 17 00:00:00 2001
> From: =?utf-8?q?Lo=C3=AFc=20Minier?= <lool at dooz.org>
> Date: Fri, 27 Jun 2008 19:25:29 +0200
> Subject: [PATCH] Drop build-dep on rootstrap; only used at runtime
>
> ---
> debian/control | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/debian/control b/debian/control
> index 567d0b8..f7cb298 100644
> --- a/debian/control
> +++ b/debian/control
> @@ -3,7 +3,7 @@ Section: devel
> Priority: extra
> Maintainer: Debian pbuilder maintenance team <pbuilder-maint at lists.alioth.debian.org>
> Uploaders: Junichi Uekawa <dancer at debian.org>, Matt Kraai <kraai at debian.org>
> -Build-Depends: debhelper (>= 4.1.16), docbook-xsl, ldp-docbook-xsl (>= 0.0.20040321-0.1), xsltproc, dpkg-dev (>= 1.13.19), dblatex, rootstrap [i386 amd64], debconf|debconf-2.0, po-debconf, po4a
> +Build-Depends: debhelper (>= 4.1.16), docbook-xsl, ldp-docbook-xsl (>= 0.0.20040321-0.1), xsltproc, dpkg-dev (>= 1.13.19), dblatex, debconf|debconf-2.0, po-debconf, po4a
> Standards-Version: 3.7.2
> Vcs-Git: git://git.debian.org/git/pbuilder/pbuilder.git
> Vcs-Browser: http://git.debian.org/?p=pbuilder/pbuilder.git
> --
> 1.5.6.3
>
> [7 0006-pbuilder-buildpackage-funcs-always-pass-chroot-to-s.patch <text/x-diff; us-ascii (7bit)>]
> >From d0f80e0b3b556c529f577b9614dfffab55b38024 Mon Sep 17 00:00:00 2001
> From: =?utf-8?q?Lo=C3=AFc=20Minier?= <lool at dooz.org>
> Date: Fri, 27 Jun 2008 19:30:13 +0200
> Subject: [PATCH] pbuilder-buildpackage-funcs: always pass chroot to satisfydepends
>
> Always pass --chroot to the pbuilder-satisfydepends; particulary useful
> for pbuilder-satisfydepends-aptitude and -gdebi.
> ---
> pbuilder-buildpackage-funcs | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/pbuilder-buildpackage-funcs b/pbuilder-buildpackage-funcs
> index a36fcb4..780ff21 100644
> --- a/pbuilder-buildpackage-funcs
> +++ b/pbuilder-buildpackage-funcs
> @@ -37,7 +37,7 @@ function checkbuilddep () {
> yes) BUILDOPT="--binary-arch";;
> *) ;;
> esac
> - if "$PBUILDERSATISFYDEPENDSCMD" --control "$1" --internal-chrootexec "${CHROOTEXEC}" "${BUILDOPT}" ; then
> + if "$PBUILDERSATISFYDEPENDSCMD" --control "$1" --internal-chrootexec "${CHROOTEXEC}" --chroot "${BUILDPLACE}" "${BUILDOPT}" ; then
> :
> else
> # If asked to preserve the build place, and pbuilder-satisfydepends
> --
> 1.5.6.3
>
> [8 0007-Cleanup-rules.patch <text/x-diff; us-ascii (7bit)>]
> >From b277dbae37b8e2c89d935fd18f7808794565135d Mon Sep 17 00:00:00 2001
> From: =?utf-8?q?Lo=C3=AFc=20Minier?= <lool at dooz.org>
> Date: Fri, 27 Jun 2008 19:36:12 +0200
> Subject: [PATCH] Cleanup rules
>
> ---
> debian/rules | 29 ++++-------------------------
> 1 files changed, 4 insertions(+), 25 deletions(-)
>
> diff --git a/debian/rules b/debian/rules
> index 40d082e..b309f07 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -1,34 +1,18 @@
> #!/usr/bin/make -f
> -# Sample debian/rules that uses debhelper.
> -# GNU copyright 1997 to 1999 by Joey Hess.
> -
> -# Uncomment this to turn on verbose mode.
> -#export DH_VERBOSE=1
>
> # This is the debhelper compatability version to use.
> ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
>
> -configure: configure-stamp
> -configure-stamp:
> - dh_testdir
> - # Add here commands to configure the package.
> -
> - touch configure-stamp
> -
> -build: configure-stamp build-stamp
> +build: build-stamp
> build-stamp:
> dh_testdir
> -
> - touch build-stamp
> + touch $@
>
> clean:
> dh_testdir
> dh_testroot
> - rm -f build-stamp configure-stamp
> -
> - # Add here commands to clean up after the build process.
> + rm -f build-stamp
> -$(MAKE) clean
> -
> dh_clean
>
> install: build
> @@ -36,13 +20,10 @@ install: build
> dh_testroot
> dh_clean -k
> dh_installdirs
> -
> - # Add here commands to install the package into debian/build-package.
> $(MAKE) check
> $(MAKE) install DESTDIR=$(CURDIR)/debian/pbuilder
> dh_movefiles -ppbuilder-uml --sourcedir=debian/pbuilder
>
> -# Build architecture-independent files here.
> binary-indep: build install
> dh_testdir -i
> dh_testroot -i
> @@ -58,7 +39,6 @@ binary-indep: build install
> dh_md5sums -i
> dh_builddeb -i
>
> -# Build architecture-dependent files here.
> binary-arch: build install
> ifneq (,$(findstring ${ARCH},i386 amd64))
> dh_testdir -a
> @@ -75,6 +55,5 @@ ifneq (,$(findstring ${ARCH},i386 amd64))
> dh_builddeb -a
> endif
>
> -
> binary: binary-indep binary-arch
> -.PHONY: build clean binary-indep binary-arch binary install configure
> +.PHONY: build clean binary-indep binary-arch binary install
> --
> 1.5.6.3
>
> [9 0008-Pass-s-to-dh_-instead-of-checking-dpkg-architectur.patch <text/x-diff; us-ascii (7bit)>]
> >From d077e45e45ec1713b1baefdab522e7e98825cb9f Mon Sep 17 00:00:00 2001
> From: =?utf-8?q?Lo=C3=AFc=20Minier?= <lool at dooz.org>
> Date: Fri, 27 Jun 2008 19:37:48 +0200
> Subject: [PATCH] Pass -s to dh_* instead of checking dpkg-architecture and using -a
>
> ---
> debian/rules | 27 +++++++++++----------------
> 1 files changed, 11 insertions(+), 16 deletions(-)
>
> diff --git a/debian/rules b/debian/rules
> index b309f07..acecdef 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -1,8 +1,5 @@
> #!/usr/bin/make -f
>
> -# This is the debhelper compatability version to use.
> -ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
> -
> build: build-stamp
> build-stamp:
> dh_testdir
> @@ -40,20 +37,18 @@ binary-indep: build install
> dh_builddeb -i
>
> binary-arch: build install
> -ifneq (,$(findstring ${ARCH},i386 amd64))
> - dh_testdir -a
> - dh_testroot -a
> - dh_installdocs -a
> + dh_testdir -s
> + dh_testroot -s
> + dh_installdocs -s
> dh_installman -ppbuilder-uml pbuilder-user-mode-linux.1 pbuilder-uml.conf.5 pdebuild-user-mode-linux.1
> - dh_installchangelogs -a
> - dh_link -a
> - dh_compress -a -X.pdf
> - dh_fixperms -a
> - dh_installdeb -a
> - dh_gencontrol -a
> - dh_md5sums -a
> - dh_builddeb -a
> -endif
> + dh_installchangelogs -s
> + dh_link -s
> + dh_compress -s -X.pdf
> + dh_fixperms -s
> + dh_installdeb -s
> + dh_gencontrol -s
> + dh_md5sums -s
> + dh_builddeb -s
>
> binary: binary-indep binary-arch
> .PHONY: build clean binary-indep binary-arch binary install
> --
> 1.5.6.3
>
> [10 0009-Suggest-gdebi-closes-488314.patch <text/x-diff; us-ascii (7bit)>]
> >From 603fc4d3e8d6138146e73ad6d61c4af16429b57a Mon Sep 17 00:00:00 2001
> From: =?utf-8?q?Lo=C3=AFc=20Minier?= <lool at dooz.org>
> Date: Fri, 27 Jun 2008 23:06:54 +0200
> Subject: [PATCH] Suggest gdebi; closes: #488314.
>
> ---
> debian/control | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/debian/control b/debian/control
> index f7cb298..c9640b9 100644
> --- a/debian/control
> +++ b/debian/control
> @@ -12,7 +12,8 @@ Package: pbuilder
> Architecture: all
> Depends: cdebootstrap|debootstrap, wget, gcc, debianutils (>= 1.13.1), coreutils (>= 4.5.8-1), ${misc:Depends}
> Recommends: fakeroot, sudo, devscripts, cowdancer
> -Suggests: pbuilder-uml
> +Suggests: pbuilder-uml,
> + gdebi
> Description: personal package builder for Debian packages
> pbuilder constructs a chroot system, and builds a package inside the
> chroot.
> --
> 1.5.6.3
>
> [11 0010-Wrap-build-deps-deps-and-uploaders-to-get-cleaner.patch <text/x-diff; us-ascii (7bit)>]
> >From e542876b1ca3ca248b5fff817248c2233b1c3f3f Mon Sep 17 00:00:00 2001
> From: =?utf-8?q?Lo=C3=AFc=20Minier?= <lool at dooz.org>
> Date: Fri, 27 Jun 2008 23:07:52 +0200
> Subject: [PATCH] Wrap build-deps, deps, and uploaders to get cleaner diffs.
>
> ---
> debian/control | 29 ++++++++++++++++++++++++-----
> 1 files changed, 24 insertions(+), 5 deletions(-)
>
> diff --git a/debian/control b/debian/control
> index c9640b9..4124285 100644
> --- a/debian/control
> +++ b/debian/control
> @@ -2,16 +2,33 @@ Source: pbuilder
> Section: devel
> Priority: extra
> Maintainer: Debian pbuilder maintenance team <pbuilder-maint at lists.alioth.debian.org>
> -Uploaders: Junichi Uekawa <dancer at debian.org>, Matt Kraai <kraai at debian.org>
> -Build-Depends: debhelper (>= 4.1.16), docbook-xsl, ldp-docbook-xsl (>= 0.0.20040321-0.1), xsltproc, dpkg-dev (>= 1.13.19), dblatex, debconf|debconf-2.0, po-debconf, po4a
> +Uploaders: Junichi Uekawa <dancer at debian.org>,
> + Matt Kraai <kraai at debian.org>
> +Build-Depends: debhelper (>= 4.1.16),
> + docbook-xsl,
> + ldp-docbook-xsl (>= 0.0.20040321-0.1),
> + xsltproc,
> + dpkg-dev (>= 1.13.19),
> + dblatex,
> + debconf|debconf-2.0,
> + po-debconf,
> + po4a
> Standards-Version: 3.7.2
> Vcs-Git: git://git.debian.org/git/pbuilder/pbuilder.git
> Vcs-Browser: http://git.debian.org/?p=pbuilder/pbuilder.git
>
> Package: pbuilder
> Architecture: all
> -Depends: cdebootstrap|debootstrap, wget, gcc, debianutils (>= 1.13.1), coreutils (>= 4.5.8-1), ${misc:Depends}
> -Recommends: fakeroot, sudo, devscripts, cowdancer
> +Depends: cdebootstrap | debootstrap,
> + wget,
> + gcc,
> + debianutils (>= 1.13.1),
> + coreutils (>= 4.5.8-1),
> + ${misc:Depends}
> +Recommends: fakeroot,
> + sudo,
> + devscripts,
> + cowdancer
> Suggests: pbuilder-uml,
> gdebi
> Description: personal package builder for Debian packages
> @@ -35,7 +52,9 @@ Description: personal package builder for Debian packages
>
> Package: pbuilder-uml
> Architecture: i386 amd64
> -Depends: rootstrap (>= 0.3.9-1), user-mode-linux, pbuilder (= ${source:Version})
> +Depends: rootstrap (>= 0.3.9-1),
> + user-mode-linux,
> + pbuilder (= ${source:Version})
> Description: user-mode-linux version of pbuilder
> pbuilder-uml uses a User-mode-linux system, and builds Debian packages
> inside the UML image. It is an ideal system to use to check
> --
> 1.5.6.3
>
> [12 0011-Pass-APT-Install-Recommends-false-to-gdebi-when-pos.patch <text/x-diff; us-ascii (7bit)>]
> >From 02c30150041e8c2b002135ed588c6aa027956fbd Mon Sep 17 00:00:00 2001
> From: =?utf-8?q?Lo=C3=AFc=20Minier?= <lool at dooz.org>
> Date: Fri, 27 Jun 2008 23:21:56 +0200
> Subject: [PATCH] Pass APT::Install-Recommends=false to gdebi when possible
>
> Check whether gdebi support the --version flag and that the version is
> >= 0.3.9 in which case pass -o APT::Install-Recommends=false to gdebi.
> ---
> pbuilder-satisfydepends-gdebi | 9 ++++++++-
> 1 files changed, 8 insertions(+), 1 deletions(-)
>
> diff --git a/pbuilder-satisfydepends-gdebi b/pbuilder-satisfydepends-gdebi
> index 5dbe433..6e3ae06 100644
> --- a/pbuilder-satisfydepends-gdebi
> +++ b/pbuilder-satisfydepends-gdebi
> @@ -24,7 +24,14 @@ set -e
>
> function checkbuilddep_internal () {
> $CHROOTEXEC apt-get -y --force-yes install gdebi-core
> - INSTALL=$($CHROOTEXEC /usr/bin/gdebi --quiet --apt-line $DEBIAN_CONTROL)
> + NO_RECOMMENDS=""
> + if VERSION=$($CHROOTEXEC /usr/bin/gdebi --version 2>/dev/null); then
> + if dpkg --compare-versions $VERSION ge 0.3.9; then
> + NO_RECOMMENDS="-o APT::Install-Recommends=false"
> + fi
> + fi
> +
> + INSTALL=$($CHROOTEXEC /usr/bin/gdebi --quiet --apt-line $NO_RECOMMENDS $DEBIAN_CONTROL)
> $CHROOTEXEC /usr/bin/apt-get install -y --force-yes $INSTALL
> }
>
> --
> 1.5.6.3
>
> [13 0012-updated-japanese-documentation-ja.po.patch <text/x-diff; iso-2022-jp (7bit)>]
> >From 517a8f8faff418bfcf85f1111c746d41412efcff Mon Sep 17 00:00:00 2001
> From: Junichi Uekawa <dancer at netfort.gr.jp>
> Date: Tue, 1 Jul 2008 21:41:13 +0900
> Subject: [PATCH] updated japanese documentation ja.po
>
> fix commit broken by merge.
> ---
> Documentation/pbuilder-doc.ja.po | 162 ++++++++++++++++++++------------------
> 1 files changed, 84 insertions(+), 78 deletions(-)
>
> diff --git a/Documentation/pbuilder-doc.ja.po b/Documentation/pbuilder-doc.ja.po
> index 2bdb7ba..cc72153 100644
> --- a/Documentation/pbuilder-doc.ja.po
> +++ b/Documentation/pbuilder-doc.ja.po
> @@ -7,8 +7,8 @@
> msgid ""
> msgstr ""
> "Project-Id-Version: xxx\n"
> -"POT-Creation-Date: 2008-05-09 00:49+0900\n"
> -"PO-Revision-Date: 2008-01-04 20:06+0900\n"
> +"POT-Creation-Date: 2008-05-09 00:50+0900\n"
> +"PO-Revision-Date: 2008-06-27 15:35+0900\n"
> "Last-Translator: Junichi Uekawa <dancer at debian.org>\n"
> "Language-Team: Junichi Uekawa <dancer at debian.org>\n"
> "MIME-Version: 1.0\n"
> @@ -402,7 +402,6 @@ msgstr "詳細は pdebuild.1 マニュアルページを参照してください
>
> # type: Content of: <book><chapter><sect1><para><command>
> #: pbuilder-doc.xml:200
> -#, fuzzy
> msgid ""
> "There is a slightly different mode of operation available in "
> "<command>pdebuild</command> since version 0.97. <command>pdebuild</command> "
> @@ -714,7 +713,6 @@ msgstr ""
>
> # type: Content of: <book><chapter><sect1><para>
> #: pbuilder-doc.xml:366
> -#, fuzzy
> msgid ""
> "A script that was used by Junichi Uekawa in the initial run is now included "
> "in the <command>pbuilder</command> distribution, as <command>pbuildd.sh</"
> @@ -725,14 +723,7 @@ msgid ""
> "while, and it should be possible to set the application up on your system "
> "also. This version of the code is not the most tested, but should function "
> "as a starter."
> -msgstr ""
> -"上川が利用したスクリプトは今 <command>pbuilder</command> ディストリビューショ"
> -"ンに含まれています。<filename>/usr/share/doc/pbuilder/examples/pbuildd/</"
> -"filename> にあり、設定は、 <filename>/etc/pbuilder/pbuildd-config.sh</"
> -"command> が設定ファイルです。<command>pbuilder</command> になれている人であれ"
> -"ば簡単に設定することができるはずです。しばらく実行されていたため、自分のシス"
> -"テムでも実行できるでしょう。ただ、まだ新しいので問題があれば Debian BTS に登"
> -"録してください。"
> +msgstr "上川が利用したスクリプトは今 <command>pbuilder</command> ディストリビューションに含まれています。<filename>/usr/share/doc/pbuilder/examples/pbuildd/</filename> にあり、設定は、 <filename>/etc/pbuilder/pbuildd-config.sh</filename> が設定ファイルです。<command>pbuilder</command> になれている人であれば簡単に設定することができるはずです。しばらく実行されていたため、自分のシステムでも実行できるでしょう。ただ、まだ新しいので問題があれば Debian BTS に登録してください。"
>
> # type: Content of: <book><chapter><sect1><para>
> #: pbuilder-doc.xml:376
> @@ -772,7 +763,7 @@ msgstr ""
> msgid ""
> "Because not all builds are guaranteed to finish in a finite time, setting a "
> "timeout is probably necessary, or pbuildd may stall with a bad build."
> -msgstr ""
> +msgstr "すべてのビルドが有限時間で完了することが保証されているわけではありません、そのためタイムアウトを準備しておくことが必要かもしれません。そうしないとpbuilddは悪いビルドでずっと待ち状態になる可能性もあります。"
>
> # type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
> #: pbuilder-doc.xml:398
> @@ -780,7 +771,7 @@ msgid ""
> "Some packages require a lot of disk space, around 2GB seems to be sufficient "
> "for the largest packages for the time being. If you find otherwise, please "
> "inform the maintainer of this documentation."
> -msgstr ""
> +msgstr "一部のパッケージは大量のディスク領域を必要とします、現時点では最大のパッケージであっても2GBくらいが十分なようです。もしそうでないという状況を発見した場合はこの文書のメンテナに連絡してください。"
>
> # type: Content of: <book><chapter><sect1><title>
> #: pbuilder-doc.xml:406
> @@ -801,7 +792,7 @@ msgstr ""
> msgid ""
> "I would like some information on how people are doing it, I would appreciate "
> "any feedback or information on how you are doing, or any examples."
> -msgstr ""
> +msgstr "どのように実際にやっているのか情報をください、フィードバックや情報や例を歓迎します。"
>
> # type: Content of: <book><chapter><sect1><title>
> #: pbuilder-doc.xml:418
> @@ -836,13 +827,10 @@ msgstr ""
>
> # type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
> #: pbuilder-doc.xml:433
> -#, fuzzy
> msgid ""
> "Automatically running lintian (distributed as an example in <filename>/usr/"
> "share/doc/pbuilder/examples/B90lintian</filename>)."
> -msgstr ""
> -"自動的にlintian/lindaを実行する (例として <filename>/usr/share/doc/pbuilder/"
> -"examples/B90linda</filename>が配布されている)。"
> +msgstr "自動的にlintianを実行する (例として <filename>/usr/share/doc/pbuilder/examples/B90lintian</filename>が配布されている)。"
>
> # type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
> #: pbuilder-doc.xml:437
> @@ -851,20 +839,20 @@ msgid ""
> "removed from Debian. A <command>pbuilder</command> implementation can be "
> "found as debian/pbuilder-test directory, implemented through B92test-pkg "
> "script."
> -msgstr ""
> +msgstr "自動的にパッケージの debian-test を行う? debian-test パッケージは Debian から削除されました。 <command>pbuilder</command> での代替は debian/pbuilder-test ディレクトリにあります。B92test-pkgスクリプトで実装されています。"
>
> # type: Content of: <book><chapter><sect1><para><footnote>
> #: pbuilder-doc.xml:444
> msgid ""
> "To use B92test-pkg script, first, add it to your hook directory. <footnote>"
> -msgstr ""
> +msgstr "B92test-pkg を利用するためには、まずB92test-pkg スクリプトをフックディレクトリに追加してください。 <footnote>"
>
> # type: Content of: <book><chapter><sect1><para><footnote><para>
> #: pbuilder-doc.xml:446
> msgid ""
> "It is possible to specify <command>--hookdir /usr/share/doc/pbuilder/"
> "examples</command> command-line option to include all example hooks as well."
> -msgstr ""
> +msgstr "<command>--hookdir /usr/share/doc/pbuilder/examples</command> コマンドラインオプションを指定することですべてのサンプルフックを利用することが可能です。"
>
> # type: Content of: <book><chapter><sect1><para><footnote>
> #: pbuilder-doc.xml:449
> @@ -873,6 +861,8 @@ msgid ""
> "pbuilder-test/NN_name</filename> (where NN is number) following run-parts "
> "standard<footnote>"
> msgstr ""
> +"</footnote>。\n"
> +"テストファイルは <filename>debian/pbuilder-test/NN_name</filename> (NN: 番号)に配置されたシェルスクリプトです。ファイル名規則は run-parts の標準にしたがいます。<footnote>"
>
> # type: Content of: <book><chapter><sect1><para><footnote><para>
> #: pbuilder-doc.xml:454
> @@ -923,13 +913,14 @@ msgstr ""
>
> # type: Content of: <book><chapter><sect1><para><screen>
> #: pbuilder-doc.xml:485
> -#, fuzzy, no-wrap
> +#, no-wrap
> msgid ""
> "\n"
> "EXTRAPACKAGES=\"pentium-builder gcc-3.2 g++-3.2\"\n"
> "export DEBIAN_BUILDARCH=athlon\n"
> "export DEBIAN_BUILDGCCVER=3.2"
> msgstr ""
> +"\n"
> "EXTRAPACKAGES=\"pentium-builder gcc-3.2 g++-3.2\"\n"
> "export DEBIAN_BUILDARCH=athlon\n"
> "export DEBIAN_BUILDGCCVER=3.2"
> @@ -1074,7 +1065,7 @@ msgstr ""
>
> # type: Content of: <book><chapter><sect1><itemizedlist><listitem><para><screen>
> #: pbuilder-doc.xml:589
> -#, fuzzy, no-wrap
> +#, no-wrap
> msgid ""
> "\n"
> "transport=tuntap\n"
> @@ -1085,6 +1076,7 @@ msgid ""
> "uml=192.168.1.199\n"
> "netmask=255.255.255.0"
> msgstr ""
> +"\n"
> "transport=tuntap\n"
> "interface=eth0\n"
> "gateway=192.168.1.1\n"
> @@ -1131,7 +1123,7 @@ msgstr ""
>
> # type: Content of: <book><chapter><sect1><para><itemizedlist><listitem><para><screen>
> #: pbuilder-doc.xml:621
> -#, fuzzy, no-wrap
> +#, no-wrap
> msgid ""
> "\n"
> "MY_ETH0=tuntap,,,192.168.1.198\n"
> @@ -1142,6 +1134,7 @@ msgid ""
> "UML_GATEWAY=192.168.1.1\n"
> "PBUILDER_UML_IMAGE=\"/home/dancer/uml-image\""
> msgstr ""
> +"\n"
> "MY_ETH0=tuntap,,,192.168.1.198\n"
> "UML_IP=192.168.1.199\n"
> "UML_NETMASK=255.255.255.0\n"
> @@ -1222,14 +1215,14 @@ msgstr ""
> # type: Content of: <book><chapter><sect1><title>
> #: pbuilder-doc.xml:678
> msgid "Parallel running of pbuilder-user-mode-linux"
> -msgstr ""
> +msgstr "pbuilder-user-mode-linux を複数同時に実行させる"
>
> # type: Content of: <book><chapter><sect1><para>
> #: pbuilder-doc.xml:680
> msgid ""
> "To run <command>pbuilder-user-mode-linux</command> in parallel on a system, "
> "there are a few things to bear in mind."
> -msgstr ""
> +msgstr "<command>pbuilder-user-mode-linux</command> を同一システム上で同時に複数実行させるにはいくつか注意するべき点があります。\n"
>
> # type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
> #: pbuilder-doc.xml:685
> @@ -1257,6 +1250,11 @@ msgid ""
> " 20030107/whizzytex_1.1.1-1.dsc &\n"
> "done"
> msgstr ""
> +"\n"
> +"for IP in 102 103 104 105; do\n"
> +" xterm -e pbuilder-user-mode-linux build --uml-ip 192.168.0.$IP \\\n"
> +" 20030107/whizzytex_1.1.1-1.dsc &\n"
> +"done"
>
> # type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
> #: pbuilder-doc.xml:700
> @@ -1280,7 +1278,7 @@ msgstr ""
> # type: Content of: <book><chapter><sect1><para><command><option>
> #: pbuilder-doc.xml:712 pbuilder-doc.xml:818
> msgid "login"
> -msgstr ""
> +msgstr "login"
>
> # type: Content of: <book><chapter><sect1><para><command>
> #: pbuilder-doc.xml:712
> @@ -1292,7 +1290,7 @@ msgstr ""
> # type: Content of: <book><chapter><sect1><para><command><option>
> #: pbuilder-doc.xml:715
> msgid "execute"
> -msgstr ""
> +msgstr "execute"
>
> # type: Content of: <book><chapter><sect1><para>
> #: pbuilder-doc.xml:715
> @@ -1385,7 +1383,7 @@ msgstr ""
> # type: Content of: <book><chapter><sect1><title>
> #: pbuilder-doc.xml:775
> msgid "Directories that cannot be bind-mounted"
> -msgstr ""
> +msgstr "bind mount できないディレクトリ"
>
> # type: Content of: <book><chapter><sect1><para>
> #: pbuilder-doc.xml:777
> @@ -1401,7 +1399,7 @@ msgstr ""
> # type: Content of: <book><chapter><sect1><title>
> #: pbuilder-doc.xml:788
> msgid "Logging in to pbuilder to investigate build failure"
> -msgstr ""
> +msgstr "ビルド失敗の調査のために pbuilder 環境にログインする"
>
> # type: Content of: <book><chapter><sect1><para>
> #: pbuilder-doc.xml:790
> @@ -1415,7 +1413,7 @@ msgstr ""
> # type: Content of: <book><chapter><sect1><title>
> #: pbuilder-doc.xml:799
> msgid "Logging in to pbuilder to modify the environment"
> -msgstr ""
> +msgstr "環境を変更するために pbuilder 環境にログインする"
>
> # type: Content of: <book><chapter><sect1><para>
> #: pbuilder-doc.xml:801
> @@ -1440,7 +1438,7 @@ msgstr ""
> # type: Content of: <book><chapter><sect1><para>
> #: pbuilder-doc.xml:813
> msgid "It is also possible to add"
> -msgstr ""
> +msgstr "また別の方法としては"
>
> # type: Content of: <book><chapter><sect1><para><option>
> #: pbuilder-doc.xml:813
> @@ -1680,9 +1678,8 @@ msgstr ""
>
> # type: Content of: <book><chapter><sect1><para><command>
> #: pbuilder-doc.xml:918
> -#, fuzzy
> msgid "</command>"
> -msgstr "<command>"
> +msgstr "</command>"
>
> # type: Content of: <book><chapter><sect1><para><command>
> #: pbuilder-doc.xml:921
> @@ -1722,7 +1719,7 @@ msgstr ""
>
> # type: Content of: <book><chapter><sect1><para><screen>
> #: pbuilder-doc.xml:938
> -#, fuzzy, no-wrap
> +#, no-wrap
> msgid ""
> "\n"
> "# cat /var/cache/pbuilder/hooks/D70results\n"
> @@ -1731,6 +1728,7 @@ msgid ""
> "/usr/bin/dpkg-scanpackages . /dev/null > /var/cache/pbuilder/result/Packages\n"
> "/usr/bin/apt-get update"
> msgstr ""
> +"\n"
> "# cat /var/cache/pbuilder/hooks/D70results\n"
> "#!/bin/sh\n"
> "cd /var/cache/pbuilder/result/\n"
> @@ -1803,11 +1801,11 @@ msgstr ""
>
> # type: Content of: <book><chapter><sect1><screen>
> #: pbuilder-doc.xml:980
> -#, fuzzy, no-wrap
> +#, no-wrap
> msgid ""
> "\n"
> "\texport debian_chroot=\"pbuild$$\""
> -msgstr "export debian_chroot=\"pbuild$$\""
> +msgstr "\n export debian_chroot=\"pbuild$$\""
>
> # type: Content of: <book><chapter><sect1><para>
> #: pbuilder-doc.xml:982
> @@ -2106,9 +2104,8 @@ msgstr ""
>
> # type: Content of: <book><chapter><sect1><para><command>
> #: pbuilder-doc.xml:1155
> -#, fuzzy
> msgid "<command>pdebuild"
> -msgstr "<command>"
> +msgstr "<command>pdebuild"
>
> # type: Content of: <book><chapter><sect1><screen>
> #: pbuilder-doc.xml:1155
> @@ -2367,34 +2364,32 @@ msgstr ""
> # type: Content of: <book><chapter><sect1><table><title>
> #: pbuilder-doc.xml:1302
> msgid "Directory structure of the testsuite"
> -msgstr ""
> +msgstr "テストスイートのディレクトリ構造"
>
> # type: Content of: <book><chapter><sect1><table><tgroup><thead><row><entry>
> #: pbuilder-doc.xml:1308 pbuilder-doc.xml:1548 pbuilder-doc.xml:1612
> msgid "Directory"
> -msgstr ""
> +msgstr "ディレクトリ"
>
> # type: Content of: <book><chapter><sect1><table><tgroup><thead><row><entry>
> #: pbuilder-doc.xml:1309 pbuilder-doc.xml:1549 pbuilder-doc.xml:1613
> msgid "Meaning"
> -msgstr ""
> +msgstr "意味"
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> #: pbuilder-doc.xml:1314
> -#, fuzzy
> msgid "<filename>./testsuite/</filename>"
> -msgstr " <filename>/proc/mounts</filename>へのシンボリックリンク。"
> +msgstr "<filename>./testsuite/</filename>"
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> #: pbuilder-doc.xml:1315
> msgid "Directory for testsuite"
> -msgstr ""
> +msgstr "テストスイートへのディレクトリ"
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> #: pbuilder-doc.xml:1318
> -#, fuzzy
> msgid "<filename>./testsuite/run-test.sh</filename>"
> -msgstr " <filename>/proc/mounts</filename>へのシンボリックリンク。"
> +msgstr "<filename>./testsuite/run-test.sh</filename>"
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> #: pbuilder-doc.xml:1319
> @@ -2405,9 +2400,8 @@ msgstr ""
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> #: pbuilder-doc.xml:1322
> -#, fuzzy
> msgid "<filename>./testsuite/run-test.log</filename>"
> -msgstr " <filename>/proc/mounts</filename>へのシンボリックリンク。"
> +msgstr "<filename>./testsuite/run-test.log</filename>"
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> #: pbuilder-doc.xml:1323
> @@ -2474,19 +2468,19 @@ msgstr ""
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> #: pbuilder-doc.xml:1347
> msgid "Files used for the regression testsuite."
> -msgstr ""
> +msgstr "回帰テストスイートに利用されるファイル"
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> #: pbuilder-doc.xml:1350
> msgid "<filename>./testsuite/regression/log/BugID-*.sh.log</filename>"
> -msgstr ""
> +msgstr "<filename>./testsuite/regression/log/BugID-*.sh.log</filename>"
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> #: pbuilder-doc.xml:1351
> msgid ""
> "Output of the regression test, output from the script is redirected by run-"
> "regression.sh"
> -msgstr ""
> +msgstr "回帰テストの出力、 run-regression.sh によりスクリプトの出力がリダイレクトされる"
>
> # type: Content of: <book><chapter><sect1><para>
> #: pbuilder-doc.xml:1357
> @@ -2521,7 +2515,7 @@ msgstr ""
> # type: Content of: <book><chapter><sect1><title>
> #: pbuilder-doc.xml:1379
> msgid "Using pbuilder for small experiments"
> -msgstr ""
> +msgstr "pbuilder を小規模な実験のために活用する"
>
> # type: Content of: <book><chapter><sect1><para>
> #: pbuilder-doc.xml:1381
> @@ -2571,7 +2565,7 @@ msgstr ""
> # type: Content of: <book><chapter><title>
> #: pbuilder-doc.xml:1412
> msgid "Experimental or wish-list features of pbuilder"
> -msgstr ""
> +msgstr "実験的な pbuilder の wish-list 的な機能"
>
> # type: Content of: <book><chapter><para>
> #: pbuilder-doc.xml:1414
> @@ -2583,7 +2577,7 @@ msgstr ""
> # type: Content of: <book><chapter><sect1><title>
> #: pbuilder-doc.xml:1418
> msgid "Using LVM"
> -msgstr ""
> +msgstr "LVMの活用"
>
> # type: Content of: <book><chapter><sect1><para>
> #: pbuilder-doc.xml:1420
> @@ -2599,7 +2593,7 @@ msgstr ""
> # type: Content of: <book><chapter><sect1><title>
> #: pbuilder-doc.xml:1429
> msgid "Using cowdancer"
> -msgstr ""
> +msgstr "cowdancer の活用"
>
> # type: Content of: <book><chapter><sect1><para>
> #: pbuilder-doc.xml:1431
> @@ -2626,6 +2620,10 @@ msgid ""
> "# cowbuilder --update --distribution sid\n"
> "# cowbuilder --build XXX.dsc"
> msgstr ""
> +"\n"
> +"# cowbuilder --create --distribution sid\n"
> +"# cowbuilder --update --distribution sid\n"
> +"# cowbuilder --build XXX.dsc"
>
> # type: Content of: <book><chapter><sect1><para>
> #: pbuilder-doc.xml:1451
> @@ -2637,7 +2635,7 @@ msgstr ""
> # type: Content of: <book><chapter><sect1><para><option>
> #: pbuilder-doc.xml:1452
> msgid "--pbuilder"
> -msgstr ""
> +msgstr "--pbuilder"
>
> # type: Content of: <book><chapter><sect1><para>
> #: pbuilder-doc.xml:1453
> @@ -2650,12 +2648,12 @@ msgstr ""
> msgid ""
> "\n"
> "$ pdebuild --pbuilder cowbuilder"
> -msgstr ""
> +msgstr "\n$ pdebuild --pbuilder cowbuilder"
>
> # type: Content of: <book><chapter><sect1><sect2><title>
> #: pbuilder-doc.xml:1460
> msgid "Using cowdancer for sarge"
> -msgstr ""
> +msgstr "sarge 向けに cowdancer を利用する"
>
> # type: Content of: <book><chapter><sect1><sect2><para>
> #: pbuilder-doc.xml:1462
> @@ -2694,6 +2692,15 @@ msgid ""
> "deb http://ftp.de.debian.org/debian sarge main\n"
> "deb-src http://ftp.de.debian.org/debian sarge main"
> msgstr ""
> +"\n"
> +"$ cat sources.list\n"
> +"# sarge-backports\n"
> +"deb http://www.backports.org/debian sarge-backports main\n"
> +"deb-src http://www.backports.org/debian sarge-backports main\n"
> +"\n"
> +"# sarge\n"
> +"deb http://ftp.de.debian.org/debian sarge main\n"
> +"deb-src http://ftp.de.debian.org/debian sarge main"
>
> # type: Content of: <book><chapter><sect1><sect2><para>
> #: pbuilder-doc.xml:1488
> @@ -2713,6 +2720,12 @@ msgid ""
> "Pin: release a=sarge-backports\n"
> "Pin-Priority: 950"
> msgstr ""
> +"\n"
> +"$ cat preferences\n"
> +"Explanation: use cowdancer from backports\n"
> +"Package: cowdancer\n"
> +"Pin: release a=sarge-backports\n"
> +"Pin-Priority: 950"
>
> # type: Content of: <book><chapter><sect1><title>
> #: pbuilder-doc.xml:1502
> @@ -2742,13 +2755,14 @@ msgstr ""
>
> # type: Content of: <book><chapter><sect1><para><screen>
> #: pbuilder-doc.xml:1517
> -#, fuzzy, no-wrap
> +#, no-wrap
> msgid ""
> "\n"
> "# pbuilder create --distribution etch --no-targz --basetgz /chroot/etch\n"
> "# pbuilder create --distribution lenny --no-targz --basetgz /chroot/lenny\n"
> "# pbuilder create --distribution sid --no-targz --basetgz /chroot/sid"
> msgstr ""
> +"\n"
> "# pbuilder create --distribution etch --no-targz --basetgz /chroot/etch\n"
> "# pbuilder create --distribution lenny --no-targz --basetgz /chroot/lenny\n"
> "# pbuilder create --distribution sid --no-targz --basetgz /chroot/sid"
> @@ -2791,9 +2805,8 @@ msgstr "chroot 内部のディレクトリ構造"
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> #: pbuilder-doc.xml:1554
> -#, fuzzy
> msgid "<filename>/etc/pbuilderrc</filename>"
> -msgstr " <filename>/proc/mounts</filename>へのシンボリックリンク。"
> +msgstr "<filename>/etc/pbuilderrc</filename>"
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> #: pbuilder-doc.xml:1555
> @@ -2882,9 +2895,8 @@ msgstr ""
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> #: pbuilder-doc.xml:1588
> -#, fuzzy
> msgid "<filename>/tmp</filename>"
> -msgstr " <filename>/proc/mounts</filename>へのシンボリックリンク。"
> +msgstr "<filename>/tmp</filename>"
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> #: pbuilder-doc.xml:1589
> @@ -2927,9 +2939,8 @@ msgstr "chroot 内部のディレクトリ構造"
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> #: pbuilder-doc.xml:1618
> -#, fuzzy
> msgid "<filename>/etc/mtab</filename>"
> -msgstr " <filename>/proc/mounts</filename>へのシンボリックリンク。"
> +msgstr "<filename>/etc/mtab</filename>"
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> #: pbuilder-doc.xml:1620
> @@ -2938,9 +2949,8 @@ msgstr " <filename>/proc/mounts</filename>へのシンボリックリンク。"
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> #: pbuilder-doc.xml:1624
> -#, fuzzy
> msgid "<filename>/tmp/buildd</filename>"
> -msgstr " <filename>/proc/mounts</filename>へのシンボリックリンク。"
> +msgstr "<filename>/tmp/buildd</filename>"
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> #: pbuilder-doc.xml:1625
> @@ -2954,9 +2964,8 @@ msgstr ""
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> #: pbuilder-doc.xml:1634
> -#, fuzzy
> msgid "<filename>/run</filename>"
> -msgstr " <filename>/proc/mounts</filename>へのシンボリックリンク。"
> +msgstr "<filename>/run</filename>"
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> #: pbuilder-doc.xml:1635
> @@ -2967,9 +2976,8 @@ msgstr ""
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> #: pbuilder-doc.xml:1641
> -#, fuzzy
> msgid "<filename>/tmp/hooks</filename>"
> -msgstr " <filename>/proc/mounts</filename>へのシンボリックリンク。"
> +msgstr "<filename>/tmp/hooks</filename>"
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> #: pbuilder-doc.xml:1643
> @@ -2978,9 +2986,8 @@ msgstr "フックの場所。"
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> #: pbuilder-doc.xml:1647
> -#, fuzzy
> msgid "<filename>/var/cache/apt/archives</filename>"
> -msgstr " <filename>/proc/mounts</filename>へのシンボリックリンク。"
> +msgstr "<filename>/var/cache/apt/archives</filename>"
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> #: pbuilder-doc.xml:1649
> @@ -2993,9 +3000,8 @@ msgstr ""
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> #: pbuilder-doc.xml:1654
> -#, fuzzy
> msgid "<filename>/tmp/XXXX</filename>"
> -msgstr " <filename>/proc/mounts</filename>へのシンボリックリンク。"
> +msgstr "<filename>/tmp/XXXX</filename>"
>
> # type: Content of: <book><chapter><sect1><table><tgroup><tbody><row><entry>
> #: pbuilder-doc.xml:1655
> @@ -3131,7 +3137,7 @@ msgstr ""
> # type: Content of: <book><chapter><sect1><sect2><title>
> #: pbuilder-doc.xml:1752
> msgid "And the second year of its life"
> -msgstr ""
> +msgstr "そして二年目の人生"
>
> # type: Content of: <book><chapter><sect1><sect2><para>
> #: pbuilder-doc.xml:1754
> --
> 1.5.6.3
>
> [14 0013-touch-up-to-Japanese-translation.patch <text/x-diff; iso-2022-jp (7bit)>]
> >From 86af547a81de5c61ea2551914be72facd562234c Mon Sep 17 00:00:00 2001
> From: Osamu Aoki <osamu at debian.org>
> Date: Sun, 3 Aug 2008 10:09:30 +0900
> Subject: [PATCH] touch up to Japanese translation
>
> I hope these are more natural translation.
> ---
> Documentation/pbuilder-doc.ja.po | 14 +++++++-------
> 1 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/Documentation/pbuilder-doc.ja.po b/Documentation/pbuilder-doc.ja.po
> index 7dcc658..c101b9c 100644
> --- a/Documentation/pbuilder-doc.ja.po
> +++ b/Documentation/pbuilder-doc.ja.po
> @@ -8,7 +8,7 @@ msgid ""
> msgstr ""
> "Project-Id-Version: xxx\n"
> "POT-Creation-Date: 2008-08-03 00:33+0900\n"
> -"PO-Revision-Date: 2008-08-03 09:33+0900\n"
> +"PO-Revision-Date: 2008-08-03 10:06+0900\n"
> "Last-Translator: Junichi Uekawa <osamu at debian.org>\n"
> "Language-Team: Junichi Uekawa <dancer at debian.org>\n"
> "MIME-Version: 1.0\n"
> @@ -668,7 +668,7 @@ msgid ""
> msgstr ""
> " オプションが使われた場合、無効になります。 <filename>preferences</filename> "
> "の設定をカスタムのフックスクリプトやマニュアル操作で <filename>base.tgz</"
> -"filename> を改変する代わりに、 <filename>preferences</filename> 自身のコピー"
> +"filename> を改変して設定する代わりに、 <filename>preferences</filename> 自身のコピー"
> "を提供すれば充分です。"
>
> # type: Content of: <book><chapter><sect1><para>
> @@ -694,7 +694,7 @@ msgstr ""
> # type: Content of: <book><chapter><sect1><para>
> #: pbuilder-doc.xml:317
> msgid "option, these new extensions under the"
> -msgstr " オプション無しには、"
> +msgstr " オプションを使わない場合には、"
>
> # type: Content of: <book><chapter><sect1><para>
> #: pbuilder-doc.xml:318
> @@ -716,14 +716,14 @@ msgid ""
> "option is that the <command>pbuilder</command> command switches "
> "configuration files and working directories systematically based on the "
> "argument of the"
> -msgstr " オプションを使った際の相違点は、"
> +msgstr " オプションを使った際の相違点は、設定ファイルや作業ディレクトリを "
>
> # type: Content of: <book><chapter><sect1><para>
> #: pbuilder-doc.xml:326
> msgid "option. Let's assume the option value for the"
> msgstr ""
> -" オプションの引数により系統的に決まる設定ファイルや作業ディレクトリを切り替え"
> -"て <command>pbuilder</command> コマンドが使用する点です。"
> +" オプションの引数により系統的に決めて、 <command>pbuilder</command> "
> +"コマンドがこれらを切り替えながら動作する点です。"
>
> # type: Content of: <book><chapter><sect1><para>
> #: pbuilder-doc.xml:327
> @@ -1000,7 +1000,7 @@ msgid ""
> msgstr ""
> " <filename>preferences</filename> ファイルを使ってapt-pinningをする際にはディ"
> "ストリビューションのアーカイブの <filename>Release</filename> の内容に注意が"
> -"いる。Debian は \"スイート名\" \"stable\" や \"testing\" や \"unstable\" と"
> +"必要です。Debian は \"スイート名\" \"stable\" や \"testing\" や \"unstable\" と"
> "いった \"スイート名\" を使います。一方 Ubuntu は \"hardy\" といった \"コード"
> "ネーム\" を使います。"
>
> --
> 1.5.6.3
>
More information about the Pbuilder-maint
mailing list