diff -pruN 2.1.6/cross/buildchroot.conf 2.1.6ubuntu3/cross/buildchroot.conf --- 2.1.6/cross/buildchroot.conf 2010-07-22 21:15:08.000000000 +0100 +++ 2.1.6ubuntu3/cross/buildchroot.conf 2010-08-25 22:13:10.000000000 +0100 @@ -22,7 +22,7 @@ aptsources=Debian # this is a duplicate if the suite is the same as the toolchain. [Debian] -packages=build-essential fakeroot +packages=apt build-essential fakeroot source=http://ftp.uk.debian.org/debian keyring=debian-archive-keyring suite=unstable diff -pruN 2.1.6/cross/setcrossarch.sh 2.1.6ubuntu3/cross/setcrossarch.sh --- 2.1.6/cross/setcrossarch.sh 2010-05-03 17:31:58.000000000 +0100 +++ 2.1.6ubuntu3/cross/setcrossarch.sh 2010-08-25 22:13:10.000000000 +0100 @@ -26,6 +26,11 @@ if [ -z "$dir" ]; then exit 1 fi +#run chroot script to ensure no unwanted system interactions (e.g. startup scripts) +if [ -x /usr/share/multistrap/chroot.sh ]; then + /usr/share/multistrap/chroot.sh $dir $hostarch +fi + cfg="/etc/pdebuild-cross/pdebuild-cross.rc" if [ -f $cfg ]; then . $cfg diff -pruN 2.1.6/cross/ubuntu/armel.conf 2.1.6ubuntu3/cross/ubuntu/armel.conf --- 2.1.6/cross/ubuntu/armel.conf 1970-01-01 01:00:00.000000000 +0100 +++ 2.1.6ubuntu3/cross/ubuntu/armel.conf 2010-10-01 07:41:43.000000000 +0100 @@ -0,0 +1,22 @@ +[General] +include=/usr/share/multistrap/ubuntu/crosschroot-maverick.conf +omitrequired=false +configscript= +setupscript=/usr/share/multistrap/setcrossarch.sh +debootstrap=UbuntuToolchains +aptsources= +tarballname=pdebuild-cross.tgz + +[Toolchains] +packages=g++-4.2-arm-linux-gnueabi linux-libc-dev-armel-cross +reinstall=binutils-multiarch +source=http://www.emdebian.org/debian +keyring=emdebian-archive-keyring +suite=stable + +[UbuntuToolchains] +packages=g++-arm-linux-gnueabi libc-dev-armel-cross linux-libc-dev-armel-cross +source=http://archive.ubuntu.com/ubuntu +suite=maverick +components=main universe +keyring=ubuntu-keyring diff -pruN 2.1.6/cross/ubuntu/crosschroot-maverick.conf 2.1.6ubuntu3/cross/ubuntu/crosschroot-maverick.conf --- 2.1.6/cross/ubuntu/crosschroot-maverick.conf 1970-01-01 01:00:00.000000000 +0100 +++ 2.1.6ubuntu3/cross/ubuntu/crosschroot-maverick.conf 2010-10-01 07:41:53.000000000 +0100 @@ -0,0 +1,42 @@ +# Example multistrap configuration file for a sid build chroot +# Need to use cascading to select the toolchain for a cross arch. + +[General] +arch= +directory= +# same as --tidy-up option if set to true +cleanup=true +# same as --no-auth option if set to true +# keyring packages listed in each debootstrap will +# still be installed. +noauth=false +# whether to add the /suite to be explicit about where apt +# needs to look for packages. Default is false. +explicitsuite=false +# extract all downloaded archives (default is true) +unpack=true +# run chroot script to ensure chroot behaves correctly +setupscript=/usr/share/multistrap/chroot.sh +# the order of sections is not important. +# the debootstrap option determines which repository +# is used to calculate the list of Priority: required packages. +debootstrap=Ubuntu +aptsources=Ubuntu UbuntuPorts + + +# this is a duplicate if the suite is the same as the toolchain. +[Ubuntu] +packages=dpkg-dev build-essential aptitude binutils-multiarch dpkg-cross ubuntu-keyring gnupg xapt realpath +source=http://archive.ubuntu.com/ubuntu +keyring=ubuntu-keyring +suite=maverick +components=main universe +omitdebsrc=false + +[Ubuntuports] +packages= +source=[arch=armel] http://ports.ubuntu.com/ +keyring=ubuntu-keyring +suite=maverick +components=main universe +omitdebsrc=true diff -pruN 2.1.6/debian/changelog 2.1.6ubuntu3/debian/changelog --- 2.1.6/debian/changelog 2010-07-28 19:30:25.000000000 +0100 +++ 2.1.6ubuntu3/debian/changelog 2010-10-01 07:43:58.000000000 +0100 @@ -1,3 +1,36 @@ +multistrap (2.1.6ubuntu3) maverick; urgency=low + + * cross/ubuntu/armel.conf: Set config to use maverick now that all the + packages are in the archive. LP: #646901 + * Always use the host apt keyring when bootstrapping, since we don't + have one yet in the target root. + + [ Wookey ] + * Point UbuntuToolchains config at the gcc-defaults metapackage instead of + at g++-4.4-arm-linux-gnueabi. + + -- Steve Langasek Thu, 30 Sep 2010 19:26:29 +0000 + +multistrap (2.1.6ubuntu2) maverick; urgency=low + + * Better flat aptftparcive-style URL implementation + * Make flat URL regexp more explicit/correct. LP: #625059 + + -- Wookey Fri, 27 Aug 2010 03:15:41 +0100 + +multistrap (2.1.6ubuntu1) maverick; urgency=low + + * Add all packages to the source dir, including calculated + dependencies. + * Improve the omitdebsrc handling for detection of 'true'. + * Add examples for Grip. + * Add more synopsis information to manual page. (Closes: #592621) + * Add support for flat aptftparchive-style URLs + * Include Ubuntu config files + * Include chroot.sh preventing services being started during chroot creation + + -- Wookey Tue, 25 Aug 2010 23:18:30 +0100 + multistrap (2.1.6) unstable; urgency=low * [INTL:fr] French manpage translation update (Closes: #584679) diff -pruN 2.1.6/debian/control 2.1.6ubuntu3/debian/control --- 2.1.6/debian/control 2010-07-28 19:31:35.000000000 +0100 +++ 2.1.6ubuntu3/debian/control 2010-09-03 00:29:35.000000000 +0100 @@ -1,7 +1,8 @@ Source: multistrap Section: utils Priority: optional -Maintainer: Neil Williams +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Neil Williams Uploaders: Wookey Build-Depends: cdbs, debhelper (>= 5), po4a (>= 0.37.1) Build-Depends-Indep: intltool diff -pruN 2.1.6/debian/multistrap.install 2.1.6ubuntu3/debian/multistrap.install --- 2.1.6/debian/multistrap.install 2010-05-03 14:12:32.000000000 +0100 +++ 2.1.6ubuntu3/debian/multistrap.install 2010-08-25 23:51:14.000000000 +0100 @@ -5,8 +5,12 @@ examples/multistrap-example.conf ./usr/s examples/sid.conf ./usr/share/multistrap/ examples/squeeze.conf ./usr/share/multistrap/ examples/lenny.conf ./usr/share/multistrap/ +examples/grip-sid.conf ./usr/share/multistrap/ +examples/grip-squeeze.conf ./usr/share/multistrap/ +examples/grip-lenny.conf ./usr/share/multistrap/ examples/setup.sh ./usr/share/doc/multistrap/examples/ examples/config.sh ./usr/share/doc/multistrap/examples/ +examples/chroot.sh ./usr/share/multistrap/ check-deps.sh ./usr/share/multistrap/ device-table.pl ./usr/share/multistrap/ update-rc.d ./usr/share/multistrap/ @@ -14,3 +18,4 @@ bash/multistrap ./etc/bash_completion.d/ cross/*.conf ./usr/share/multistrap/ cross/test.c ./usr/share/multistrap/ cross/setcrossarch.sh ./usr/share/multistrap/ +cross/ubuntu/*.conf ./usr/share/multistrap/ubuntu/ diff -pruN 2.1.6/doc/po/fr.po 2.1.6ubuntu3/doc/po/fr.po --- 2.1.6/doc/po/fr.po 2010-07-22 21:21:24.000000000 +0100 +++ 2.1.6ubuntu3/doc/po/fr.po 2010-09-03 00:29:08.000000000 +0100 @@ -7,14 +7,14 @@ msgid "" msgstr "" "Project-Id-Version: multistrap 2.1.4\n" -"POT-Creation-Date: 2010-07-22 21:21+0200\n" +"POT-Creation-Date: 2010-08-25 23:40+0200\n" "PO-Revision-Date: 2010-05-30 11:24+0100\n" "Last-Translator: Alexandre Normand \n" "Language-Team: French \n" -"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: fr\n" "X-Poedit-Bookmarks: 138,-1,-1,-1,-1,-1,-1,-1,-1,-1\n" #. type: =head1 @@ -25,7 +25,6 @@ msgstr "Nom" #. type: textblock #: pod/multistrap:5 #, fuzzy -#| msgid "multistrap - debootstrap replacement for multiple repository support" msgid "multistrap - multiple repository bootstraps" msgstr "" "multistrap - Remplacement de debootstrap pour ajouter à debootstrap la " @@ -57,6 +56,11 @@ msgstr "Options" #. type: textblock #: pod/multistrap:15 +msgid "-?|-h|--help|--version - output the help text and exit successfully." +msgstr "" + +#. type: textblock +#: pod/multistrap:17 msgid "" "--dry-run - collate all the configuration settings and output a bare summary." msgstr "" @@ -64,19 +68,34 @@ msgstr "" "sommaire." #. type: textblock -#: pod/multistrap:18 +#: pod/multistrap:20 msgid "--simulate - same as --dry-run" msgstr "--simulate - identique à --dry-run" #. type: textblock -#: pod/multistrap:20 +#: pod/multistrap:22 msgid "(The following options can also be set in the configuration file.)" msgstr "" "(Les options suivantes peuvent également être définies dans le fichier de " "configuration.)" #. type: textblock -#: pod/multistrap:22 +#: pod/multistrap:24 +msgid "-a|--arch - architecture of the packages to put into the multistrap." +msgstr "" + +#. type: textblock +#: pod/multistrap:26 +msgid "-d|--dir - directory into which the bootstrap will be installed." +msgstr "" + +#. type: textblock +#: pod/multistrap:28 +msgid "-f|--file - configuration file for multistrap [required]" +msgstr "" + +#. type: textblock +#: pod/multistrap:30 msgid "" "--tidy-up - remove apt cache data, downloaded Packages files and the apt " "package cache. Same as cleanup=true." @@ -85,7 +104,7 @@ msgstr "" "téléchargés et le cache des paquets apt. Identique à cleanup=true." #. type: textblock -#: pod/multistrap:25 +#: pod/multistrap:33 msgid "" "--no-auth - allow the use of unauthenticated repositories. Same as " "noauth=true" @@ -94,35 +113,27 @@ msgstr "" "noauth=true" #. type: textblock -#: pod/multistrap:28 +#: pod/multistrap:36 #, fuzzy -#| msgid "" -#| "--sourcedir DIR - move the contents of var/cache/apt/archives/ from " -#| "inside the chroot to the specified external directory. Same as " -#| "retainsources=DIR" msgid "" -"--sourcedir DIR - move the contents of var/cache/apt/archives/ from inside " +"--source-dir DIR - move the contents of var/cache/apt/archives/ from inside " "the chroot to the specified external directory, then add the Debian source " "packages for each used binary. Same as retainsources=DIR If the specified " -"directory does not exist, nothing is done." +"directory does not exist, nothing is done. Requires --tidy-up in order to " +"calculate the full list of source packages, including dependencies." msgstr "" -"--sourcedir DIR - déplace le contenu de var/cache/apt/archives/ de " +"--source-dir DIR - déplace le contenu de var/cache/apt/archives/ de " "l'intérieur du chroot vers le répertoire exterieur spécifié. Identique à " "retainsources=DIR" #. type: =head1 -#: pod/multistrap:33 +#: pod/multistrap:43 msgid "Description" msgstr "Description" #. type: textblock -#: pod/multistrap:35 +#: pod/multistrap:45 #, fuzzy -#| msgid "" -#| "multistrap provides a debootstrap-like method based on apt and extended " -#| "to provide support for multiple repositories, using a configuration file " -#| "to specify the relevant suites, architecture, extra packages and the " -#| "mirror to use for each debootstrap." msgid "" "multistrap provides a debootstrap-like method based on apt and extended to " "provide support for multiple repositories, using a configuration file to " @@ -135,7 +146,7 @@ msgstr "" "supplémentaires et le miroir à utiliser pour chaque debootstrap." #. type: textblock -#: pod/multistrap:40 +#: pod/multistrap:50 msgid "" "The aim is to create a complete bootstrap / root filesystem with all " "packages installed and configured, instead of just the base system." @@ -145,35 +156,13 @@ msgstr "" "système de base." #. type: textblock -#: pod/multistrap:44 +#: pod/multistrap:54 msgid "Example configuration:" msgstr "Exemple de configuration :" #. type: verbatim -#: pod/multistrap:46 +#: pod/multistrap:56 #, fuzzy, no-wrap -#| msgid "" -#| " [General]\n" -#| " arch=armel\n" -#| " directory=/opt/multistrap/\n" -#| " # same as --tidy-up option if set to true\n" -#| " cleanup=true\n" -#| " # same as --no-auth option if set to true\n" -#| " # keyring packages listed in each bootstrap will\n" -#| " # still be installed.\n" -#| " noauth=false\n" -#| " # extract all downloaded archives (default is true)\n" -#| " unpack=true\n" -#| " # aptsources is a list of sections to be used\n" -#| " # the /etc/apt/sources.list.d/multistrap.sources.list \n" -#| " # of the target. Order is not important\n" -#| " aptsources=Debian\n" -#| " # the bootstrap option determines which repository\n" -#| " # is used to calculate the list of Priority: required packages\n" -#| " # and which packages go into the rootfs.\n" -#| " # The order of sections is not important.\n" -#| " bootstrap=Debian\n" -#| " \n" msgid "" " [General]\n" " arch=armel\n" @@ -223,7 +212,7 @@ msgstr "" " \n" #. type: verbatim -#: pod/multistrap:70 pod/multistrap:163 +#: pod/multistrap:80 pod/multistrap:173 #, no-wrap msgid "" " [Debian]\n" @@ -241,11 +230,8 @@ msgstr "" "\n" #. type: textblock -#: pod/multistrap:76 +#: pod/multistrap:86 #, fuzzy -#| msgid "" -#| "This will result in a completely normal debootstrap of Debian lenny from " -#| "the specified mirror, for armel in '/opt/multistrap/'." msgid "" "This will result in a completely normal debootstrap of Debian lenny from the " "specified mirror, for armel in '/opt/multistrap/'. (This configuration is " @@ -255,11 +241,8 @@ msgstr "" "partir du miroir spécifié, pour armel dans « /opt/multistrap/ »." #. type: textblock -#: pod/multistrap:80 +#: pod/multistrap:90 #, fuzzy -#| msgid "" -#| "Specify a package to extend the multistrap to include that package and " -#| "all dependencies." msgid "" "Specify a package to extend the multistrap to include that package and all " "dependencies of that package." @@ -268,11 +251,8 @@ msgstr "" "toutes ses dépendances." #. type: textblock -#: pod/multistrap:83 +#: pod/multistrap:93 #, fuzzy -#| msgid "" -#| "Specify more bootstraps by adding new sections. Section names are used in " -#| "the bootstrap general option." msgid "" "Specify more repositories for the bootstrap by adding new sections. Section " "names need to be listed in the bootstrap general option for the packages to " @@ -282,7 +262,7 @@ msgstr "" "sections sont utilisés dans l'option générale de bootstrap." #. type: textblock -#: pod/multistrap:87 +#: pod/multistrap:97 msgid "" "Specify which repositories will be available to the final system at boot by " "listing the section names in the aptsources general option, e.g. to exclude " @@ -290,19 +270,13 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:92 +#: pod/multistrap:102 msgid "Section names are case-insensitive." msgstr "La casse des lettres n'est pas importante dans les noms de section." #. type: textblock -#: pod/multistrap:94 +#: pod/multistrap:104 #, fuzzy -#| msgid "" -#| "All dependencies are resolved only by apt, using all bootstrap " -#| "repositories, to use only the most recent and most suitable dependencies. " -#| "Note that multistrap turns off Install-Recommends so if the multistrap " -#| "needs a package that is only a Recommended dependency, the recommended " -#| "package needs to be specified in the packages line explicitly." msgid "" "All dependencies are resolved only by apt, using all bootstrap repositories, " "to use only the most recent and most suitable dependencies. Note that " @@ -320,27 +294,23 @@ msgstr "" "paquets." #. type: textblock -#: pod/multistrap:102 +#: pod/multistrap:112 #, fuzzy -#| msgid "" -#| "'Architecture' and 'directory' can be overridden on the command line. " -#| "Other general options have command line options, except debootstrap " -#| "itself." msgid "" "'Architecture' and 'directory' can be overridden on the command line. Some " "other general options also have command line options." msgstr "" -"« Architecture » et « directory » peuvent être modifiés en ligne de " -"commande. D'autres options générales peuvent aussi être indiquées en ligne " -"de commande, sauf debootstrap." +"« Architecture » et « directory » peuvent être modifiés en ligne de commande. " +"D'autres options générales peuvent aussi être indiquées en ligne de " +"commande, sauf debootstrap." #. type: =head1 -#: pod/multistrap:105 +#: pod/multistrap:115 msgid "Repositories" msgstr "" #. type: textblock -#: pod/multistrap:107 +#: pod/multistrap:117 msgid "" "C lists the sections which should be used to create the F apt sources in the final system. Not all " @@ -355,7 +325,7 @@ msgstr "" "par le système de fichiers racine installé." #. type: textblock -#: pod/multistrap:113 +#: pod/multistrap:123 msgid "" "C lists the sections which will be used to create the multistrap " "itself. Only packages listed in C will be downloaded and unpacked " @@ -366,7 +336,7 @@ msgstr "" "téléchargés et dépaquetés par multistrap." #. type: textblock -#: pod/multistrap:117 +#: pod/multistrap:127 msgid "" "Make sure C lists all sections you need for apt to be able to " "find all the packages to be unpacked for the multistrap." @@ -376,7 +346,7 @@ msgstr "" "multistrap." #. type: textblock -#: pod/multistrap:120 +#: pod/multistrap:130 msgid "" "(Older versions of multistrap supported the same option under the " "C name - this spelling is still supported but new configuration " @@ -384,36 +354,29 @@ msgid "" msgstr "" #. type: =head1 -#: pod/multistrap:124 +#: pod/multistrap:134 msgid "General settings:" msgstr "Paramètres généraux :" #. type: textblock -#: pod/multistrap:126 +#: pod/multistrap:136 msgid "" "'arch' can be overridden on the command line using the C<--arch> option." msgstr "" #. type: textblock -#: pod/multistrap:128 +#: pod/multistrap:138 #, fuzzy -#| msgid "" -#| "'directory' specifies the top level directory where the debootstrap will " -#| "be created - it is not packed into a .tgz once complete." msgid "" "'directory' specifies the top level directory where the bootstrap will be " "created - it is not packed into a .tgz once complete." msgstr "" -"« directory » indique le répertoire de haut niveau dans lequel le " -"debootstrap sera créé - il n'est pas empaqueté en un .tgz une fois complété." +"« directory » indique le répertoire de haut niveau dans lequel le debootstrap " +"sera créé - il n'est pas empaqueté en un .tgz une fois complété." #. type: textblock -#: pod/multistrap:131 +#: pod/multistrap:141 #, fuzzy -#| msgid "" -#| "C lists the sections which will be used to create the " -#| "multistrap itself. Only packages listed in C will be " -#| "downloaded and unpacked by multistrap." msgid "" "'bootstrap' lists the Sections which will be used to specify the packages " "which will be downloaded (and optionally unpacked) into the bootstrap." @@ -423,7 +386,7 @@ msgstr "" "téléchargés et dépaquetés par multistrap." #. type: textblock -#: pod/multistrap:134 +#: pod/multistrap:144 msgid "" "'aptsources' lists the Sections which will be used to specify the apt " "sources in the final system, e.g. if you need to use a local repository to " @@ -432,28 +395,27 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:139 +#: pod/multistrap:149 msgid "" "If you want a package to be in the rootfs, it B be specified in the " "C list under General." msgstr "" #. type: textblock -#: pod/multistrap:142 +#: pod/multistrap:152 msgid "The order of section names in either list is not important." msgstr "" #. type: textblock -#: pod/multistrap:144 +#: pod/multistrap:154 #, fuzzy -#| msgid "As with debootstrap, multistrap will continue after errors." msgid "" "As with debootstrap, multistrap will continue after errors, as long as the " "configuration file can be correctly parsed." msgstr "Comme pour debootstrap, multistrap se poursuivra après des erreurs." #. type: textblock -#: pod/multistrap:147 +#: pod/multistrap:157 msgid "" "multistrap also implements the machine:variant support originally used in " "Emdebian Crush, although in a different implementation. Using the cascading " @@ -466,7 +428,7 @@ msgstr "" "variant combinations can be supported by simple changes on the command line." #. type: textblock -#: pod/multistrap:152 +#: pod/multistrap:162 msgid "" "Setting C to true also packs up the final filesystem into a " "tarball." @@ -475,7 +437,7 @@ msgstr "" "final dans un tarball." #. type: textblock -#: pod/multistrap:155 +#: pod/multistrap:165 msgid "" "Note that multistrap ignores any unrecognised options in the config file - " "this allows for backwards-compatible behaviour as well as overloading the " @@ -484,14 +446,13 @@ msgid "" msgstr "" #. type: =head1 -#: pod/multistrap:161 +#: pod/multistrap:171 #, fuzzy -#| msgid "General settings:" msgid "Section settings" msgstr "Paramètres généraux :" #. type: textblock -#: pod/multistrap:169 +#: pod/multistrap:179 msgid "" "The section name (in [] brackets) needs to be unique for this configuration " "file and any configuration files which this file includes. Section names are " @@ -499,14 +460,14 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:174 +#: pod/multistrap:184 msgid "" "'packages' is the list of packages to be added when this Section is listed " "in C." msgstr "" #. type: textblock -#: pod/multistrap:177 +#: pod/multistrap:187 msgid "" "'source' is the apt source to use for this Section. (To use a local source " "on the same machine, ensure you use C not C, so that apt " @@ -515,7 +476,7 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:183 +#: pod/multistrap:193 msgid "" "'keyring' lists the package which contains the key used by the source listed " "in this Section. If no keyring is specified, the C option must be " @@ -523,32 +484,27 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:187 +#: pod/multistrap:197 msgid "" "'suite' is the suite to use from this source. Note that this B be the " "suite, not the codename." msgstr "" #. type: textblock -#: pod/multistrap:190 +#: pod/multistrap:200 msgid "" "Suites change from time to time: (oldstable, stable, testing, sid) The " "codename (etch, lenny, squeeze, sid) does not change." msgstr "" #. type: =head1 -#: pod/multistrap:194 +#: pod/multistrap:204 msgid "Secure Apt" msgstr "Apt sécurisé" #. type: textblock -#: pod/multistrap:196 +#: pod/multistrap:206 #, fuzzy -#| msgid "" -#| "To use authenticated apt repositories, multistrap either needs to be able " -#| "to install an appropriate keyring package from the existing apt sources " -#| "*outside the multistrap environment* or have the relevant keys already " -#| "configured using apt-key *on the host system*." msgid "" "To use authenticated apt repositories, multistrap either needs to be able to " "install an appropriate keyring package from the existing apt sources " @@ -561,7 +517,7 @@ msgstr "" "en utilisant apt-key *sur le système hôte*." #. type: textblock -#: pod/multistrap:201 +#: pod/multistrap:211 msgid "" "If relevant packages exist, specify them in the 'keyring' option for each " "repository. multistrap will then check that apt has already installed this " @@ -573,15 +529,8 @@ msgstr "" "le dépôt pourra être authentifié avant de télécharger des paquets." #. type: textblock -#: pod/multistrap:206 +#: pod/multistrap:216 #, fuzzy -#| msgid "" -#| "Note that *all* repositories to be used with multistrap must be " -#| "authenticated or apt will fail. Similarly, secure apt can only be " -#| "disabled for all repositories (by using the --no-auth command line option " -#| "or setting the general noauth option in the configuration file), even if " -#| "only one repository does not have a suitable keyring available. Not all " -#| "packages need keyring packages, if you configure apt-key appropriately." msgid "" "Note that B repositories to be used with multistrap must be " "authenticated or apt will fail. Similarly, secure apt can only be disabled " @@ -599,7 +548,7 @@ msgstr "" "de clés, si vous configurez apt-key correctement." #. type: textblock -#: pod/multistrap:214 +#: pod/multistrap:224 msgid "" "The keyring package(s) will also be installed inside the multistrap " "environment to match the installed apt sources for the multistrap." @@ -609,7 +558,7 @@ msgstr "" "installés du multistrap." #. type: textblock -#: pod/multistrap:217 +#: pod/multistrap:227 msgid "" "All configuration of apt-key needs to be done for the machine running " "multistrap itself." @@ -618,12 +567,12 @@ msgstr "" "multistrap." #. type: =head1 -#: pod/multistrap:220 +#: pod/multistrap:230 msgid "State" msgstr "État" #. type: textblock -#: pod/multistrap:222 +#: pod/multistrap:232 msgid "" "multistrap is stateless - if the directory exists, it will simply proceed as " "normal and apt will try to pick up where it left off." @@ -633,14 +582,13 @@ msgstr "" "s'était arrêté." #. type: =head1 -#: pod/multistrap:225 +#: pod/multistrap:235 #, fuzzy -#| msgid "Configuration" msgid "Root Filesystem Configuration" msgstr "Configuration" #. type: textblock -#: pod/multistrap:227 +#: pod/multistrap:237 msgid "" "multistrap unpacks the downloaded packages but other stages of system " "configuration are not attempted. Examples include:" @@ -649,7 +597,7 @@ msgstr "" "configuration du système ne sont pas tentées. Les exemples incluent : " #. type: verbatim -#: pod/multistrap:230 +#: pod/multistrap:240 #, no-wrap msgid "" " /etc/inittab\n" @@ -675,13 +623,8 @@ msgstr "" "\n" #. type: textblock -#: pod/multistrap:240 +#: pod/multistrap:250 #, fuzzy -#| msgid "" -#| "As an alternative, multistrap includes a device-table.pl helper script " -#| "that can work around some of the issues with MAKEDEV. device-table.pl " -#| "requires a device table file along the lines of the one in the mtd-utils " -#| "source package." msgid "" "Any device-specific device nodes will also need to be created using MAKEDEV " "or C - a helper script that can work around some of the " @@ -695,7 +638,7 @@ msgstr "" "le paquet source mtd-utils." #. type: textblock -#: pod/multistrap:246 +#: pod/multistrap:256 msgid "" "Once multistrap has successfully created the basic file and directory " "layout, other device-specific scripts are needed before the filesystem can " @@ -707,7 +650,7 @@ msgstr "" "le périphérique cible." #. type: textblock -#: pod/multistrap:251 +#: pod/multistrap:261 msgid "" "Once installed, the packages themselves need to be configured using the " "package maintainer scripts and C, unless this is a " @@ -718,7 +661,7 @@ msgstr "" "moins qu'il ne s'agisse d'un multistrap natif." #. type: textblock -#: pod/multistrap:255 +#: pod/multistrap:265 msgid "" "For C to work, F and F must be mounted (or mountable), " "F is also recommended." @@ -727,17 +670,17 @@ msgstr "" "montés (ou être montables), F est également recommandé." #. type: textblock -#: pod/multistrap:258 +#: pod/multistrap:268 msgid "See also: http://wiki.debian.org/Multistrap" msgstr "Voir aussi : http://wiki.debian.org/Multistrap" #. type: =head1 -#: pod/multistrap:260 +#: pod/multistrap:270 msgid "Environment" msgstr "Environnement" #. type: textblock -#: pod/multistrap:262 +#: pod/multistrap:272 msgid "" "To configure the unpacked packages (whether in native or cross mode), " "certain environment variables are needed:" @@ -746,7 +689,7 @@ msgstr "" "natif), certaines variables d'environnements sont nécessaires :" #. type: textblock -#: pod/multistrap:265 +#: pod/multistrap:275 msgid "" "Debconf needs to be told to accept that user interaction is not desired:" msgstr "" @@ -754,11 +697,8 @@ msgstr "" "pas souhaitée : " #. type: verbatim -#: pod/multistrap:268 +#: pod/multistrap:278 #, fuzzy, no-wrap -#| msgid "" -#| " DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true\n" -#| " \n" msgid "" " DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true\n" "\n" @@ -767,7 +707,7 @@ msgstr "" " \n" #. type: textblock -#: pod/multistrap:270 +#: pod/multistrap:280 msgid "" "Perl needs to be told to accept that no locales are available inside the " "chroot and not to complain:" @@ -776,7 +716,7 @@ msgstr "" "l'intérieur du chroot et de ne pas se plaindre :" #. type: verbatim -#: pod/multistrap:273 +#: pod/multistrap:283 #, no-wrap msgid "" " LC_ALL=C LANGUAGE=C LANG=C\n" @@ -786,17 +726,17 @@ msgstr "" "\n" #. type: textblock -#: pod/multistrap:275 +#: pod/multistrap:285 msgid "Then, dpkg can configure the packages:" msgstr "Puis, dpkg peut configurer les paquets :" #. type: textblock -#: pod/multistrap:277 +#: pod/multistrap:287 msgid "chroot method (PATH = top directory of chroot):" msgstr "méthode chroot (PATH = le répertoire de base du chroot) :" #. type: verbatim -#: pod/multistrap:279 +#: pod/multistrap:289 #, no-wrap msgid "" " DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \\\n" @@ -808,12 +748,12 @@ msgstr "" "\n" #. type: textblock -#: pod/multistrap:282 +#: pod/multistrap:292 msgid "at a login shell:" msgstr "dans un interpréteur de commandes de connexion : " #. type: verbatim -#: pod/multistrap:284 +#: pod/multistrap:294 #, no-wrap msgid "" " # export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true\n" @@ -827,19 +767,19 @@ msgstr "" "\n" #. type: textblock -#: pod/multistrap:288 +#: pod/multistrap:298 msgid "(As above, dpkg needs F and F mounted first.)" msgstr "" "(Comme ci-dessus, dpkg a besoin que F et F soient montés en " "premier.)" #. type: =head1 -#: pod/multistrap:290 +#: pod/multistrap:300 msgid "Native mode - multistrap" msgstr "mode natif - multistrap" #. type: textblock -#: pod/multistrap:292 +#: pod/multistrap:302 msgid "" "multistrap was not intended for native support, it was developed for cross " "architecture support. In order for multiple repositories to be used, " @@ -851,7 +791,7 @@ msgstr "" "apt." #. type: textblock -#: pod/multistrap:296 +#: pod/multistrap:306 msgid "" "In native mode, various post-multistrap operations are likely to be needed " "that debootstrap would do for you:" @@ -860,7 +800,7 @@ msgstr "" "pour vous sont probablement nécessaires :" #. type: verbatim -#: pod/multistrap:299 +#: pod/multistrap:309 #, no-wrap msgid "" " 1. copy /etc/hosts into the chroot\n" @@ -874,7 +814,7 @@ msgstr "" "\n" #. type: textblock -#: pod/multistrap:303 +#: pod/multistrap:313 msgid "" "(An alternative to unset the localisation variables is to add locales to " "your multistrap configuration file in the 'packages' option." @@ -884,7 +824,7 @@ msgstr "" "»." #. type: textblock -#: pod/multistrap:307 +#: pod/multistrap:317 msgid "" "A native multistrap can be used directly with chroot, so C runs " "C at the end of the multistrap process." @@ -894,12 +834,12 @@ msgstr "" "multistrap." #. type: =head1 -#: pod/multistrap:311 +#: pod/multistrap:321 msgid "Cascading configuration" msgstr "Configuration en cascade" #. type: textblock -#: pod/multistrap:313 +#: pod/multistrap:323 msgid "" "To support multiple variants of a basic (common) configuration, " "C allows configuration files to include other (more general) " @@ -915,12 +855,12 @@ msgstr "" "configurations." #. type: textblock -#: pod/multistrap:319 +#: pod/multistrap:329 msgid "Base file:" msgstr "Fichier de base :" #. type: verbatim -#: pod/multistrap:321 +#: pod/multistrap:331 #, no-wrap msgid "" " /usr/share/multistrap/crosschroot.conf\n" @@ -930,12 +870,12 @@ msgstr "" "\n" #. type: textblock -#: pod/multistrap:323 +#: pod/multistrap:333 msgid "Variations:" msgstr "Variations :" #. type: verbatim -#: pod/multistrap:325 +#: pod/multistrap:335 #, no-wrap msgid "" " /usr/share/multistrap/armel.conf\n" @@ -945,7 +885,7 @@ msgstr "" "\n" #. type: textblock -#: pod/multistrap:327 +#: pod/multistrap:337 msgid "" "Specifying just the armel.conf file will get the rest of the settings from " "crosschroot.conf so that common changes only need to be made in a single " @@ -956,7 +896,7 @@ msgstr "" "communes ne doivent être réalisées que dans un seul fichier." #. type: textblock -#: pod/multistrap:331 +#: pod/multistrap:341 msgid "" "It is B recommended that any changes to the configuration files " "involved in any particular cascade are tested using the C<--simulate> option " @@ -976,12 +916,12 @@ msgstr "" "option non définie." #. type: =head1 -#: pod/multistrap:339 +#: pod/multistrap:349 msgid "Machine:variant support" msgstr "Support des variantes de Machines" #. type: textblock -#: pod/multistrap:341 +#: pod/multistrap:351 msgid "" "The old packages.conf variables from emsandbox can all be converted into " "C configuration variables. The machine:variant support in " @@ -993,15 +933,8 @@ msgstr "" "sh> et F" #. type: textblock -#: pod/multistrap:346 +#: pod/multistrap:356 #, fuzzy -#| msgid "" -#| "Once C has unpacked the downloaded packages, the C " -#| "can be called, passing the location and architecture of the root " -#| "filesystem, so that other fine tuning can take place. At this stage, any " -#| "operations inside the rootfs must not try to execute any binaries within " -#| "the rootfs. As the final stage of the multistrap process, C is " -#| "copied into the F directory of the rootfs." msgid "" "Once C has unpacked the downloaded packages, the C can " "be called, passing the location and architecture of the root filesystem, so " @@ -1019,7 +952,7 @@ msgstr "" "répertoire F" #. type: textblock -#: pod/multistrap:353 +#: pod/multistrap:363 msgid "" "One advantage of using machine:variant support is that the entire " "rootfilesystem can be managed by a single call to multistrap - this is " @@ -1031,7 +964,7 @@ msgstr "" "racines dans l'espace utilisateur." #. type: textblock -#: pod/multistrap:357 +#: pod/multistrap:367 msgid "" "To enable machine:variant support, specify the path to the scripts to be " "called in the variant configuration file (General section):" @@ -1041,14 +974,8 @@ msgstr "" "variant (Section Générale) : " #. type: verbatim -#: pod/multistrap:360 +#: pod/multistrap:370 #, fuzzy, no-wrap -#| msgid "" -#| " [General]\n" -#| " include=/path/to/general.conf\n" -#| " setup_script=/path/to/setup.sh\n" -#| " config_script=/path/to/config.sh\n" -#| "\n" msgid "" " [General]\n" " include=/path/to/general.conf\n" @@ -1063,12 +990,12 @@ msgstr "" "\n" #. type: =head1 -#: pod/multistrap:366 +#: pod/multistrap:376 msgid "Restricting package selection" msgstr "Restriction de la sélection des paquets" #. type: textblock -#: pod/multistrap:368 +#: pod/multistrap:378 msgid "" "C includes Required packages by default, the current list of " "packages can be seen using:" @@ -1077,7 +1004,7 @@ msgstr "" "paquets peut être visualisée en utilisant : " #. type: verbatim -#: pod/multistrap:371 +#: pod/multistrap:381 #, no-wrap msgid "" " grep-available -FPriority 'required' -sPackage\n" @@ -1087,7 +1014,7 @@ msgstr "" "\n" #. type: textblock -#: pod/multistrap:373 +#: pod/multistrap:383 msgid "" "If the OmitRequired option is set to true, these packages will not be added " "- whilst useful, this option can easily lead to a useless rootfs. Only the " @@ -1101,7 +1028,7 @@ msgstr "" "paquets seront également ajoutées mais aucun autres." #. type: textblock -#: pod/multistrap:379 +#: pod/multistrap:389 msgid "" "Packages with Priority: important or standard are never included by " "C unless specifically included in a C option in a " @@ -1109,12 +1036,12 @@ msgid "" msgstr "" #. type: =head1 -#: pod/multistrap:383 +#: pod/multistrap:393 msgid "Recommends behaviour" msgstr "" #. type: textblock -#: pod/multistrap:385 +#: pod/multistrap:395 msgid "" "The Debian default behaviour after the Lenny release was to consider " "recommended packages as extra packages to be installed when any one package " @@ -1124,24 +1051,24 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:392 +#: pod/multistrap:402 msgid "The multistrap default is to turn recommends OFF." msgstr "" #. type: textblock -#: pod/multistrap:394 +#: pod/multistrap:404 msgid "" "Set the allowrecommends option to true in the General section to use typical " "Debian behaviour." msgstr "" #. type: =head1 -#: pod/multistrap:397 +#: pod/multistrap:407 msgid "Explicit suite specification" msgstr "" #. type: textblock -#: pod/multistrap:399 +#: pod/multistrap:409 msgid "" "Sometimes, apt needs to be told to get a particular package from a " "particular suite, ignoring a more recent version in another suite in the " @@ -1149,7 +1076,7 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:403 +#: pod/multistrap:413 msgid "" "C can operate with and without the explicit suite option, the " "default is to let apt use the most recent version from the collection of " @@ -1157,7 +1084,7 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:407 +#: pod/multistrap:417 msgid "" "Explicit suite specification has no effect on the final installed system - " "if your aptsources includes a repository which in turn includes a newer " @@ -1166,7 +1093,7 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:412 +#: pod/multistrap:422 msgid "" "Also, when specifying packages to get from a specific suite, apt will also " "try and ensure that the dependencies for that package are also from the same " @@ -1177,13 +1104,8 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:419 +#: pod/multistrap:429 #, fuzzy -#| msgid "" -#| "When using this support in Lenny, ensure that each section uses the " -#| "codename (etch, lenny, squeeze, sid) instead of the suite (oldstable, " -#| "stable, testing, sid) for the C configuration item as the version " -#| "of apt in Lenny and previous can only use the codename." msgid "" "When using this support in Lenny, ensure that each section uses the suite " "(oldstable, stable, testing, sid) and B the codename (etch, lenny, " @@ -1197,12 +1119,12 @@ msgstr "" "ne peut que utiliser le nom de code." #. type: textblock -#: pod/multistrap:424 +#: pod/multistrap:434 msgid "To test, on Lenny, try:" msgstr "" #. type: verbatim -#: pod/multistrap:426 +#: pod/multistrap:436 #, no-wrap msgid "" " $ sudo apt-get install apt/stable\n" @@ -1210,12 +1132,12 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:428 +#: pod/multistrap:438 msgid "Compare with" msgstr "" #. type: verbatim -#: pod/multistrap:430 +#: pod/multistrap:440 #, no-wrap msgid "" " $ sudo apt-get install apt/lenny\n" @@ -1223,12 +1145,12 @@ msgid "" msgstr "" #. type: =head1 -#: pod/multistrap:434 +#: pod/multistrap:444 msgid "Omitting deb-src listings" msgstr "" #. type: textblock -#: pod/multistrap:436 +#: pod/multistrap:446 msgid "" "Some multistrap environments do not need access to the Debian sources of " "packages being installed, typically this is required when preparing a build " @@ -1236,22 +1158,15 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:440 +#: pod/multistrap:450 msgid "" "To turn off this additional source (and save both download time and apt-" "cache size), use the omitdebsrc field in each Section." msgstr "" #. type: verbatim -#: pod/multistrap:443 +#: pod/multistrap:453 #, fuzzy, no-wrap -#| msgid "" -#| " [Debian]\n" -#| " packages=\n" -#| " source=http://ftp.uk.debian.org/debian\n" -#| " keyring=debian-archive-keyring\n" -#| " suite=lenny\n" -#| "\n" msgid "" " [Baked]\n" " packages=\n" @@ -1269,12 +1184,12 @@ msgstr "" "\n" #. type: =head1 -#: pod/multistrap:452 +#: pod/multistrap:462 msgid "fakeroot" msgstr "" #. type: textblock -#: pod/multistrap:454 +#: pod/multistrap:464 msgid "" "Foreign architecture bootstraps can operate under C (C " "is designed to do as much as it can within a single call to make this " @@ -1284,14 +1199,14 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:460 +#: pod/multistrap:470 msgid "" "Therefore, if C detects that C is in use, native mode " "configuration is skipped with a reminder warning." msgstr "" #. type: textblock -#: pod/multistrap:463 +#: pod/multistrap:473 msgid "" "The same problem applies to C and therefore the " "installation of the keyring package on the host system is also skipped if " @@ -1308,10 +1223,6 @@ msgstr "" #. type: verbatim #: device-table.pl:159 #, fuzzy, no-wrap -#| msgid "" -#| " device-table.pl [-d DIR] [-f FILE]\n" -#| " device-table.pl -?|-h|--help|--version\n" -#| "\n" msgid "" " device-table.pl [-n|--dry-run] [-d DIR] [-f FILE]\n" " device-table.pl -?|-h|--help|--version\n" @@ -1324,9 +1235,6 @@ msgstr "" #. type: textblock #: device-table.pl:164 #, fuzzy -#| msgid "" -#| "By default, device-table.pl writes out the device nodes in the current " -#| "working directory. Use the directory option to write out elsewhere." msgid "" "By default, F writes out the device nodes in the current " "working directory. Use the directory option to write out elsewhere." @@ -1338,9 +1246,6 @@ msgstr "" #. type: textblock #: device-table.pl:167 #, fuzzy -#| msgid "" -#| "multistrap contains a default device-table file, use the file option to " -#| "override the default /usr/share/multistrap/device-table.txt" msgid "" "multistrap contains a default device-table file, use the file option to " "override the default F" @@ -1359,10 +1264,6 @@ msgstr "" #. type: textblock #: device-table.pl:172 #, fuzzy -#| msgid "" -#| "Device nodes needs fakeroot or another way to use root access. If device-" -#| "table.pl is already being run under fakeroot or equivalent, use the no-" -#| "fakeroot option to drop the internal fakeroot usage." msgid "" "Device nodes need fakeroot or another way to use root access. If F is already being run under fakeroot or equivalent, the existing " @@ -1447,7 +1348,6 @@ msgstr "" #. type: textblock #: device-table.pl:209 #, fuzzy -#| msgid "See also: http://wiki.debian.org/Multistrap" msgid "See http://wiki.debian.org/DeviceTableScripting" msgstr "Voir aussi : http://wiki.debian.org/Multistrap" @@ -2124,8 +2024,8 @@ msgstr "Voir aussi : http://wiki.debian #~ "Adds \"export DEBCONF_USE_CDEBCONF=true\" to $TARGET/etc/profile for " #~ "cdebconf support." #~ msgstr "" -#~ "Ajoute « export DEBCONF_USE_CDEBCONF=true » au fichier $TARGET/etc/" -#~ "profile pour activer l'assistance de cdebconf." +#~ "Ajoute « export DEBCONF_USE_CDEBCONF=true » au fichier $TARGET/etc/profile " +#~ "pour activer l'assistance de cdebconf." #~ msgid "symlink_rcS" #~ msgstr "symlink_rcS" diff -pruN 2.1.6/doc/po/multistrap.pot 2.1.6ubuntu3/doc/po/multistrap.pot --- 2.1.6/doc/po/multistrap.pot 2010-07-28 19:34:37.000000000 +0100 +++ 2.1.6ubuntu3/doc/po/multistrap.pot 2010-09-03 00:29:42.000000000 +0100 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2010-07-28 19:34+0200\n" +"POT-Creation-Date: 2010-08-25 23:40+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -47,51 +47,72 @@ msgstr "" #. type: textblock #: pod/multistrap:15 +msgid "-?|-h|--help|--version - output the help text and exit successfully." +msgstr "" + +#. type: textblock +#: pod/multistrap:17 msgid "" "--dry-run - collate all the configuration settings and output a bare " "summary." msgstr "" #. type: textblock -#: pod/multistrap:18 +#: pod/multistrap:20 msgid "--simulate - same as --dry-run" msgstr "" #. type: textblock -#: pod/multistrap:20 +#: pod/multistrap:22 msgid "(The following options can also be set in the configuration file.)" msgstr "" #. type: textblock -#: pod/multistrap:22 +#: pod/multistrap:24 +msgid "-a|--arch - architecture of the packages to put into the multistrap." +msgstr "" + +#. type: textblock +#: pod/multistrap:26 +msgid "-d|--dir - directory into which the bootstrap will be installed." +msgstr "" + +#. type: textblock +#: pod/multistrap:28 +msgid "-f|--file - configuration file for multistrap [required]" +msgstr "" + +#. type: textblock +#: pod/multistrap:30 msgid "" "--tidy-up - remove apt cache data, downloaded Packages files and the apt " "package cache. Same as cleanup=true." msgstr "" #. type: textblock -#: pod/multistrap:25 +#: pod/multistrap:33 msgid "" "--no-auth - allow the use of unauthenticated repositories. Same as " "noauth=true" msgstr "" #. type: textblock -#: pod/multistrap:28 +#: pod/multistrap:36 msgid "" -"--sourcedir DIR - move the contents of var/cache/apt/archives/ from inside " +"--source-dir DIR - move the contents of var/cache/apt/archives/ from inside " "the chroot to the specified external directory, then add the Debian source " "packages for each used binary. Same as retainsources=DIR If the specified " -"directory does not exist, nothing is done." +"directory does not exist, nothing is done. Requires --tidy-up in order to " +"calculate the full list of source packages, including dependencies." msgstr "" #. type: =head1 -#: pod/multistrap:33 +#: pod/multistrap:43 msgid "Description" msgstr "" #. type: textblock -#: pod/multistrap:35 +#: pod/multistrap:45 msgid "" "multistrap provides a debootstrap-like method based on apt and extended to " "provide support for multiple repositories, using a configuration file to " @@ -100,19 +121,19 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:40 +#: pod/multistrap:50 msgid "" "The aim is to create a complete bootstrap / root filesystem with all " "packages installed and configured, instead of just the base system." msgstr "" #. type: textblock -#: pod/multistrap:44 +#: pod/multistrap:54 msgid "Example configuration:" msgstr "" #. type: verbatim -#: pod/multistrap:46 +#: pod/multistrap:56 #, no-wrap msgid "" " [General]\n" @@ -142,7 +163,7 @@ msgid "" msgstr "" #. type: verbatim -#: pod/multistrap:70 pod/multistrap:163 +#: pod/multistrap:80 pod/multistrap:173 #, no-wrap msgid "" " [Debian]\n" @@ -154,7 +175,7 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:76 +#: pod/multistrap:86 msgid "" "This will result in a completely normal debootstrap of Debian lenny from the " "specified mirror, for armel in '/opt/multistrap/'. (This configuration is " @@ -162,14 +183,14 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:80 +#: pod/multistrap:90 msgid "" "Specify a package to extend the multistrap to include that package and all " "dependencies of that package." msgstr "" #. type: textblock -#: pod/multistrap:83 +#: pod/multistrap:93 msgid "" "Specify more repositories for the bootstrap by adding new sections. Section " "names need to be listed in the bootstrap general option for the packages to " @@ -177,7 +198,7 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:87 +#: pod/multistrap:97 msgid "" "Specify which repositories will be available to the final system at boot by " "listing the section names in the aptsources general option, e.g. to exclude " @@ -185,12 +206,12 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:92 +#: pod/multistrap:102 msgid "Section names are case-insensitive." msgstr "" #. type: textblock -#: pod/multistrap:94 +#: pod/multistrap:104 msgid "" "All dependencies are resolved only by apt, using all bootstrap repositories, " "to use only the most recent and most suitable dependencies. Note that " @@ -202,19 +223,19 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:102 +#: pod/multistrap:112 msgid "" "'Architecture' and 'directory' can be overridden on the command line. Some " "other general options also have command line options." msgstr "" #. type: =head1 -#: pod/multistrap:105 +#: pod/multistrap:115 msgid "Repositories" msgstr "" #. type: textblock -#: pod/multistrap:107 +#: pod/multistrap:117 msgid "" "C lists the sections which should be used to create the " "F apt sources in the final " @@ -224,7 +245,7 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:113 +#: pod/multistrap:123 msgid "" "C lists the sections which will be used to create the multistrap " "itself. Only packages listed in C will be downloaded and unpacked " @@ -232,14 +253,14 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:117 +#: pod/multistrap:127 msgid "" "Make sure C lists all sections you need for apt to be able to " "find all the packages to be unpacked for the multistrap." msgstr "" #. type: textblock -#: pod/multistrap:120 +#: pod/multistrap:130 msgid "" "(Older versions of multistrap supported the same option under the " "C name - this spelling is still supported but new configuration " @@ -247,31 +268,31 @@ msgid "" msgstr "" #. type: =head1 -#: pod/multistrap:124 +#: pod/multistrap:134 msgid "General settings:" msgstr "" #. type: textblock -#: pod/multistrap:126 +#: pod/multistrap:136 msgid "'arch' can be overridden on the command line using the C<--arch> option." msgstr "" #. type: textblock -#: pod/multistrap:128 +#: pod/multistrap:138 msgid "" "'directory' specifies the top level directory where the bootstrap will be " "created - it is not packed into a .tgz once complete." msgstr "" #. type: textblock -#: pod/multistrap:131 +#: pod/multistrap:141 msgid "" "'bootstrap' lists the Sections which will be used to specify the packages " "which will be downloaded (and optionally unpacked) into the bootstrap." msgstr "" #. type: textblock -#: pod/multistrap:134 +#: pod/multistrap:144 msgid "" "'aptsources' lists the Sections which will be used to specify the apt " "sources in the final system, e.g. if you need to use a local repository to " @@ -280,26 +301,26 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:139 +#: pod/multistrap:149 msgid "" "If you want a package to be in the rootfs, it B be specified in the " "C list under General." msgstr "" #. type: textblock -#: pod/multistrap:142 +#: pod/multistrap:152 msgid "The order of section names in either list is not important." msgstr "" #. type: textblock -#: pod/multistrap:144 +#: pod/multistrap:154 msgid "" "As with debootstrap, multistrap will continue after errors, as long as the " "configuration file can be correctly parsed." msgstr "" #. type: textblock -#: pod/multistrap:147 +#: pod/multistrap:157 msgid "" "multistrap also implements the machine:variant support originally used in " "Emdebian Crush, although in a different implementation. Using the cascading " @@ -308,14 +329,14 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:152 +#: pod/multistrap:162 msgid "" "Setting C to true also packs up the final filesystem into a " "tarball." msgstr "" #. type: textblock -#: pod/multistrap:155 +#: pod/multistrap:165 msgid "" "Note that multistrap ignores any unrecognised options in the config file - " "this allows for backwards-compatible behaviour as well as overloading the " @@ -324,12 +345,12 @@ msgid "" msgstr "" #. type: =head1 -#: pod/multistrap:161 +#: pod/multistrap:171 msgid "Section settings" msgstr "" #. type: textblock -#: pod/multistrap:169 +#: pod/multistrap:179 msgid "" "The section name (in [] brackets) needs to be unique for this configuration " "file and any configuration files which this file includes. Section names are " @@ -337,14 +358,14 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:174 +#: pod/multistrap:184 msgid "" "'packages' is the list of packages to be added when this Section is listed " "in C." msgstr "" #. type: textblock -#: pod/multistrap:177 +#: pod/multistrap:187 msgid "" "'source' is the apt source to use for this Section. (To use a local source " "on the same machine, ensure you use C not C, so that apt " @@ -353,7 +374,7 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:183 +#: pod/multistrap:193 msgid "" "'keyring' lists the package which contains the key used by the source listed " "in this Section. If no keyring is specified, the C option must be " @@ -361,26 +382,26 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:187 +#: pod/multistrap:197 msgid "" "'suite' is the suite to use from this source. Note that this B be the " "suite, not the codename." msgstr "" #. type: textblock -#: pod/multistrap:190 +#: pod/multistrap:200 msgid "" "Suites change from time to time: (oldstable, stable, testing, sid) The " "codename (etch, lenny, squeeze, sid) does not change." msgstr "" #. type: =head1 -#: pod/multistrap:194 +#: pod/multistrap:204 msgid "Secure Apt" msgstr "" #. type: textblock -#: pod/multistrap:196 +#: pod/multistrap:206 msgid "" "To use authenticated apt repositories, multistrap either needs to be able to " "install an appropriate keyring package from the existing apt sources " @@ -389,7 +410,7 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:201 +#: pod/multistrap:211 msgid "" "If relevant packages exist, specify them in the 'keyring' option for each " "repository. multistrap will then check that apt has already installed this " @@ -398,7 +419,7 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:206 +#: pod/multistrap:216 msgid "" "Note that B repositories to be used with multistrap must be " "authenticated or apt will fail. Similarly, secure apt can only be disabled " @@ -409,45 +430,45 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:214 +#: pod/multistrap:224 msgid "" "The keyring package(s) will also be installed inside the multistrap " "environment to match the installed apt sources for the multistrap." msgstr "" #. type: textblock -#: pod/multistrap:217 +#: pod/multistrap:227 msgid "" "All configuration of apt-key needs to be done for the machine running " "multistrap itself." msgstr "" #. type: =head1 -#: pod/multistrap:220 +#: pod/multistrap:230 msgid "State" msgstr "" #. type: textblock -#: pod/multistrap:222 +#: pod/multistrap:232 msgid "" "multistrap is stateless - if the directory exists, it will simply proceed as " "normal and apt will try to pick up where it left off." msgstr "" #. type: =head1 -#: pod/multistrap:225 +#: pod/multistrap:235 msgid "Root Filesystem Configuration" msgstr "" #. type: textblock -#: pod/multistrap:227 +#: pod/multistrap:237 msgid "" "multistrap unpacks the downloaded packages but other stages of system " "configuration are not attempted. Examples include:" msgstr "" #. type: verbatim -#: pod/multistrap:230 +#: pod/multistrap:240 #, no-wrap msgid "" " /etc/inittab\n" @@ -463,7 +484,7 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:240 +#: pod/multistrap:250 msgid "" "Any device-specific device nodes will also need to be created using MAKEDEV " "or C - a helper script that can work around some of the " @@ -473,7 +494,7 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:246 +#: pod/multistrap:256 msgid "" "Once multistrap has successfully created the basic file and directory " "layout, other device-specific scripts are needed before the filesystem can " @@ -481,7 +502,7 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:251 +#: pod/multistrap:261 msgid "" "Once installed, the packages themselves need to be configured using the " "package maintainer scripts and C, unless this is a " @@ -489,36 +510,36 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:255 +#: pod/multistrap:265 msgid "" "For C to work, F and F must be mounted (or mountable), " "F is also recommended." msgstr "" #. type: textblock -#: pod/multistrap:258 +#: pod/multistrap:268 msgid "See also: http://wiki.debian.org/Multistrap" msgstr "" #. type: =head1 -#: pod/multistrap:260 +#: pod/multistrap:270 msgid "Environment" msgstr "" #. type: textblock -#: pod/multistrap:262 +#: pod/multistrap:272 msgid "" "To configure the unpacked packages (whether in native or cross mode), " "certain environment variables are needed:" msgstr "" #. type: textblock -#: pod/multistrap:265 +#: pod/multistrap:275 msgid "Debconf needs to be told to accept that user interaction is not desired:" msgstr "" #. type: verbatim -#: pod/multistrap:268 +#: pod/multistrap:278 #, no-wrap msgid "" " DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true\n" @@ -526,14 +547,14 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:270 +#: pod/multistrap:280 msgid "" "Perl needs to be told to accept that no locales are available inside the " "chroot and not to complain:" msgstr "" #. type: verbatim -#: pod/multistrap:273 +#: pod/multistrap:283 #, no-wrap msgid "" " LC_ALL=C LANGUAGE=C LANG=C\n" @@ -541,17 +562,17 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:275 +#: pod/multistrap:285 msgid "Then, dpkg can configure the packages:" msgstr "" #. type: textblock -#: pod/multistrap:277 +#: pod/multistrap:287 msgid "chroot method (PATH = top directory of chroot):" msgstr "" #. type: verbatim -#: pod/multistrap:279 +#: pod/multistrap:289 #, no-wrap msgid "" " DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \\\n" @@ -560,12 +581,12 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:282 +#: pod/multistrap:292 msgid "at a login shell:" msgstr "" #. type: verbatim -#: pod/multistrap:284 +#: pod/multistrap:294 #, no-wrap msgid "" " # export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true\n" @@ -575,17 +596,17 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:288 +#: pod/multistrap:298 msgid "(As above, dpkg needs F and F mounted first.)" msgstr "" #. type: =head1 -#: pod/multistrap:290 +#: pod/multistrap:300 msgid "Native mode - multistrap" msgstr "" #. type: textblock -#: pod/multistrap:292 +#: pod/multistrap:302 msgid "" "multistrap was not intended for native support, it was developed for cross " "architecture support. In order for multiple repositories to be used, " @@ -593,14 +614,14 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:296 +#: pod/multistrap:306 msgid "" "In native mode, various post-multistrap operations are likely to be needed " "that debootstrap would do for you:" msgstr "" #. type: verbatim -#: pod/multistrap:299 +#: pod/multistrap:309 #, no-wrap msgid "" " 1. copy /etc/hosts into the chroot\n" @@ -610,26 +631,26 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:303 +#: pod/multistrap:313 msgid "" "(An alternative to unset the localisation variables is to add locales to " "your multistrap configuration file in the 'packages' option." msgstr "" #. type: textblock -#: pod/multistrap:307 +#: pod/multistrap:317 msgid "" "A native multistrap can be used directly with chroot, so C runs " "C at the end of the multistrap process." msgstr "" #. type: =head1 -#: pod/multistrap:311 +#: pod/multistrap:321 msgid "Cascading configuration" msgstr "" #. type: textblock -#: pod/multistrap:313 +#: pod/multistrap:323 msgid "" "To support multiple variants of a basic (common) configuration, " "C allows configuration files to include other (more general) " @@ -639,12 +660,12 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:319 +#: pod/multistrap:329 msgid "Base file:" msgstr "" #. type: verbatim -#: pod/multistrap:321 +#: pod/multistrap:331 #, no-wrap msgid "" " /usr/share/multistrap/crosschroot.conf\n" @@ -652,12 +673,12 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:323 +#: pod/multistrap:333 msgid "Variations:" msgstr "" #. type: verbatim -#: pod/multistrap:325 +#: pod/multistrap:335 #, no-wrap msgid "" " /usr/share/multistrap/armel.conf\n" @@ -665,7 +686,7 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:327 +#: pod/multistrap:337 msgid "" "Specifying just the armel.conf file will get the rest of the settings from " "crosschroot.conf so that common changes only need to be made in a single " @@ -673,7 +694,7 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:331 +#: pod/multistrap:341 msgid "" "It is B recommended that any changes to the configuration files " "involved in any particular cascade are tested using the C<--simulate> option " @@ -685,12 +706,12 @@ msgid "" msgstr "" #. type: =head1 -#: pod/multistrap:339 +#: pod/multistrap:349 msgid "Machine:variant support" msgstr "" #. type: textblock -#: pod/multistrap:341 +#: pod/multistrap:351 msgid "" "The old packages.conf variables from emsandbox can all be converted into " "C configuration variables. The machine:variant support in " @@ -698,7 +719,7 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:346 +#: pod/multistrap:356 msgid "" "Once C has unpacked the downloaded packages, the C can " "be called, passing the location and architecture of the root filesystem, so " @@ -709,7 +730,7 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:353 +#: pod/multistrap:363 msgid "" "One advantage of using machine:variant support is that the entire " "rootfilesystem can be managed by a single call to multistrap - this is " @@ -717,14 +738,14 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:357 +#: pod/multistrap:367 msgid "" "To enable machine:variant support, specify the path to the scripts to be " "called in the variant configuration file (General section):" msgstr "" #. type: verbatim -#: pod/multistrap:360 +#: pod/multistrap:370 #, no-wrap msgid "" " [General]\n" @@ -735,19 +756,19 @@ msgid "" msgstr "" #. type: =head1 -#: pod/multistrap:366 +#: pod/multistrap:376 msgid "Restricting package selection" msgstr "" #. type: textblock -#: pod/multistrap:368 +#: pod/multistrap:378 msgid "" "C includes Required packages by default, the current list of " "packages can be seen using:" msgstr "" #. type: verbatim -#: pod/multistrap:371 +#: pod/multistrap:381 #, no-wrap msgid "" " grep-available -FPriority 'required' -sPackage\n" @@ -755,7 +776,7 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:373 +#: pod/multistrap:383 msgid "" "If the OmitRequired option is set to true, these packages will not be added " "- whilst useful, this option can easily lead to a useless rootfs. Only the " @@ -764,7 +785,7 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:379 +#: pod/multistrap:389 msgid "" "Packages with Priority: important or standard are never included by " "C unless specifically included in a C option in a " @@ -772,12 +793,12 @@ msgid "" msgstr "" #. type: =head1 -#: pod/multistrap:383 +#: pod/multistrap:393 msgid "Recommends behaviour" msgstr "" #. type: textblock -#: pod/multistrap:385 +#: pod/multistrap:395 msgid "" "The Debian default behaviour after the Lenny release was to consider " "recommended packages as extra packages to be installed when any one package " @@ -787,24 +808,24 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:392 +#: pod/multistrap:402 msgid "The multistrap default is to turn recommends OFF." msgstr "" #. type: textblock -#: pod/multistrap:394 +#: pod/multistrap:404 msgid "" "Set the allowrecommends option to true in the General section to use typical " "Debian behaviour." msgstr "" #. type: =head1 -#: pod/multistrap:397 +#: pod/multistrap:407 msgid "Explicit suite specification" msgstr "" #. type: textblock -#: pod/multistrap:399 +#: pod/multistrap:409 msgid "" "Sometimes, apt needs to be told to get a particular package from a " "particular suite, ignoring a more recent version in another suite in the " @@ -812,7 +833,7 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:403 +#: pod/multistrap:413 msgid "" "C can operate with and without the explicit suite option, the " "default is to let apt use the most recent version from the collection of " @@ -820,7 +841,7 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:407 +#: pod/multistrap:417 msgid "" "Explicit suite specification has no effect on the final installed system - " "if your aptsources includes a repository which in turn includes a newer " @@ -829,7 +850,7 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:412 +#: pod/multistrap:422 msgid "" "Also, when specifying packages to get from a specific suite, apt will also " "try and ensure that the dependencies for that package are also from the same " @@ -840,7 +861,7 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:419 +#: pod/multistrap:429 msgid "" "When using this support in Lenny, ensure that each section uses the suite " "(oldstable, stable, testing, sid) and B the codename (etch, lenny, " @@ -849,12 +870,12 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:424 +#: pod/multistrap:434 msgid "To test, on Lenny, try:" msgstr "" #. type: verbatim -#: pod/multistrap:426 +#: pod/multistrap:436 #, no-wrap msgid "" " $ sudo apt-get install apt/stable\n" @@ -862,12 +883,12 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:428 +#: pod/multistrap:438 msgid "Compare with" msgstr "" #. type: verbatim -#: pod/multistrap:430 +#: pod/multistrap:440 #, no-wrap msgid "" " $ sudo apt-get install apt/lenny\n" @@ -875,12 +896,12 @@ msgid "" msgstr "" #. type: =head1 -#: pod/multistrap:434 +#: pod/multistrap:444 msgid "Omitting deb-src listings" msgstr "" #. type: textblock -#: pod/multistrap:436 +#: pod/multistrap:446 msgid "" "Some multistrap environments do not need access to the Debian sources of " "packages being installed, typically this is required when preparing a build " @@ -888,14 +909,14 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:440 +#: pod/multistrap:450 msgid "" "To turn off this additional source (and save both download time and " "apt-cache size), use the omitdebsrc field in each Section." msgstr "" #. type: verbatim -#: pod/multistrap:443 +#: pod/multistrap:453 #, no-wrap msgid "" " [Baked]\n" @@ -908,12 +929,12 @@ msgid "" msgstr "" #. type: =head1 -#: pod/multistrap:452 +#: pod/multistrap:462 msgid "fakeroot" msgstr "" #. type: textblock -#: pod/multistrap:454 +#: pod/multistrap:464 msgid "" "Foreign architecture bootstraps can operate under C (C " "is designed to do as much as it can within a single call to make this " @@ -923,14 +944,14 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:460 +#: pod/multistrap:470 msgid "" "Therefore, if C detects that C is in use, native mode " "configuration is skipped with a reminder warning." msgstr "" #. type: textblock -#: pod/multistrap:463 +#: pod/multistrap:473 msgid "" "The same problem applies to C and therefore the " "installation of the keyring package on the host system is also skipped if " diff -pruN 2.1.6/doc/po/pt.po 2.1.6ubuntu3/doc/po/pt.po --- 2.1.6/doc/po/pt.po 2010-07-22 21:21:24.000000000 +0100 +++ 2.1.6ubuntu3/doc/po/pt.po 2010-09-03 00:29:08.000000000 +0100 @@ -6,14 +6,14 @@ msgid "" msgstr "" "Project-Id-Version: multistrap 2.1.4\n" -"POT-Creation-Date: 2010-07-22 21:21+0200\n" +"POT-Creation-Date: 2010-08-25 23:40+0200\n" "PO-Revision-Date: 2010-05-14 20:52+0100\n" "Last-Translator: Américo Monteiro \n" "Language-Team: Portuguese \n" -"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: pt\n" "X-Generator: Lokalize 1.0\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -25,7 +25,6 @@ msgstr "Nome" #. type: textblock #: pod/multistrap:5 #, fuzzy -#| msgid "multistrap - debootstrap replacement for multiple repository support" msgid "multistrap - multiple repository bootstraps" msgstr "" "multistrap - substituto do debootstrap para suporte a múltiplos repositórios" @@ -56,6 +55,11 @@ msgstr "Opções" #. type: textblock #: pod/multistrap:15 +msgid "-?|-h|--help|--version - output the help text and exit successfully." +msgstr "" + +#. type: textblock +#: pod/multistrap:17 msgid "" "--dry-run - collate all the configuration settings and output a bare summary." msgstr "" @@ -63,18 +67,33 @@ msgstr "" "descoberto." #. type: textblock -#: pod/multistrap:18 +#: pod/multistrap:20 msgid "--simulate - same as --dry-run" msgstr "--simulate - o mesmo que --dry-run" #. type: textblock -#: pod/multistrap:20 +#: pod/multistrap:22 msgid "(The following options can also be set in the configuration file.)" msgstr "" "(As seguintes opções também podem ser definidas no ficheiro de configuração.)" #. type: textblock -#: pod/multistrap:22 +#: pod/multistrap:24 +msgid "-a|--arch - architecture of the packages to put into the multistrap." +msgstr "" + +#. type: textblock +#: pod/multistrap:26 +msgid "-d|--dir - directory into which the bootstrap will be installed." +msgstr "" + +#. type: textblock +#: pod/multistrap:28 +msgid "-f|--file - configuration file for multistrap [required]" +msgstr "" + +#. type: textblock +#: pod/multistrap:30 msgid "" "--tidy-up - remove apt cache data, downloaded Packages files and the apt " "package cache. Same as cleanup=true." @@ -83,7 +102,7 @@ msgstr "" "e a cache de pacotes do apt. O mesmo que cleanup=true." #. type: textblock -#: pod/multistrap:25 +#: pod/multistrap:33 msgid "" "--no-auth - allow the use of unauthenticated repositories. Same as " "noauth=true" @@ -92,25 +111,26 @@ msgstr "" "noauth=true" #. type: textblock -#: pod/multistrap:28 +#: pod/multistrap:36 #, fuzzy msgid "" -"--sourcedir DIR - move the contents of var/cache/apt/archives/ from inside " +"--source-dir DIR - move the contents of var/cache/apt/archives/ from inside " "the chroot to the specified external directory, then add the Debian source " "packages for each used binary. Same as retainsources=DIR If the specified " -"directory does not exist, nothing is done." +"directory does not exist, nothing is done. Requires --tidy-up in order to " +"calculate the full list of source packages, including dependencies." msgstr "" -"--sourcedir DIRECTÓRIO - move o conteúdo de var/cache/apt/archives/ de " +"--source-dir DIRECTÓRIO - move o conteúdo de var/cache/apt/archives/ de " "dentro da chroot para o directório externo especificado. O mesmo que " "retainsources=DIRECTÓRIO" #. type: =head1 -#: pod/multistrap:33 +#: pod/multistrap:43 msgid "Description" msgstr "Descrição" #. type: textblock -#: pod/multistrap:35 +#: pod/multistrap:45 #, fuzzy msgid "" "multistrap provides a debootstrap-like method based on apt and extended to " @@ -124,7 +144,7 @@ msgstr "" "arquitectura, pacotes extra e o mirror a usar para cada debootstrap." #. type: textblock -#: pod/multistrap:40 +#: pod/multistrap:50 msgid "" "The aim is to create a complete bootstrap / root filesystem with all " "packages installed and configured, instead of just the base system." @@ -133,12 +153,12 @@ msgstr "" "todos os pacotes instalados e configurados, em vez de apenas o sistema base." #. type: textblock -#: pod/multistrap:44 +#: pod/multistrap:54 msgid "Example configuration:" msgstr "Exemplo de configuração:" #. type: verbatim -#: pod/multistrap:46 +#: pod/multistrap:56 #, fuzzy, no-wrap msgid "" " [General]\n" @@ -189,7 +209,7 @@ msgstr "" " \n" #. type: verbatim -#: pod/multistrap:70 pod/multistrap:163 +#: pod/multistrap:80 pod/multistrap:173 #, no-wrap msgid "" " [Debian]\n" @@ -207,11 +227,8 @@ msgstr "" "\n" #. type: textblock -#: pod/multistrap:76 +#: pod/multistrap:86 #, fuzzy -#| msgid "" -#| "This will result in a completely normal debootstrap of Debian lenny from " -#| "the specified mirror, for armel in '/opt/multistrap/'." msgid "" "This will result in a completely normal debootstrap of Debian lenny from the " "specified mirror, for armel in '/opt/multistrap/'. (This configuration is " @@ -221,11 +238,8 @@ msgstr "" "partir do mirror especificado, para armel em '/opt/multistrap/'." #. type: textblock -#: pod/multistrap:80 +#: pod/multistrap:90 #, fuzzy -#| msgid "" -#| "Specify a package to extend the multistrap to include that package and " -#| "all dependencies." msgid "" "Specify a package to extend the multistrap to include that package and all " "dependencies of that package." @@ -234,11 +248,8 @@ msgstr "" "todas as dependências." #. type: textblock -#: pod/multistrap:83 +#: pod/multistrap:93 #, fuzzy -#| msgid "" -#| "Specify more bootstraps by adding new sections. Section names are used in " -#| "the bootstrap general option." msgid "" "Specify more repositories for the bootstrap by adding new sections. Section " "names need to be listed in the bootstrap general option for the packages to " @@ -248,7 +259,7 @@ msgstr "" "são usados na opção geral do bootstrap." #. type: textblock -#: pod/multistrap:87 +#: pod/multistrap:97 msgid "" "Specify which repositories will be available to the final system at boot by " "listing the section names in the aptsources general option, e.g. to exclude " @@ -256,19 +267,13 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:92 +#: pod/multistrap:102 msgid "Section names are case-insensitive." msgstr "Os nomes das secções são insensíveis a maiúsculas/minúsculas." #. type: textblock -#: pod/multistrap:94 +#: pod/multistrap:104 #, fuzzy -#| msgid "" -#| "All dependencies are resolved only by apt, using all bootstrap " -#| "repositories, to use only the most recent and most suitable dependencies. " -#| "Note that multistrap turns off Install-Recommends so if the multistrap " -#| "needs a package that is only a Recommended dependency, the recommended " -#| "package needs to be specified in the packages line explicitly." msgid "" "All dependencies are resolved only by apt, using all bootstrap repositories, " "to use only the most recent and most suitable dependencies. Note that " @@ -286,7 +291,7 @@ msgstr "" "explicitamente na linha de pacotes." #. type: textblock -#: pod/multistrap:102 +#: pod/multistrap:112 #, fuzzy msgid "" "'Architecture' and 'directory' can be overridden on the command line. Some " @@ -297,12 +302,12 @@ msgstr "" "debootstrap." #. type: =head1 -#: pod/multistrap:105 +#: pod/multistrap:115 msgid "Repositories" msgstr "" #. type: textblock -#: pod/multistrap:107 +#: pod/multistrap:117 msgid "" "C lists the sections which should be used to create the F apt sources in the final system. Not all " @@ -317,7 +322,7 @@ msgstr "" "ficheiros raiz instalado." #. type: textblock -#: pod/multistrap:113 +#: pod/multistrap:123 msgid "" "C lists the sections which will be used to create the multistrap " "itself. Only packages listed in C will be downloaded and unpacked " @@ -328,7 +333,7 @@ msgstr "" "desempacotados pelo multistrap." #. type: textblock -#: pod/multistrap:117 +#: pod/multistrap:127 msgid "" "Make sure C lists all sections you need for apt to be able to " "find all the packages to be unpacked for the multistrap." @@ -337,7 +342,7 @@ msgstr "" "capaz de encontrar todos os pacotes a serem desempacotados para o multistrap." #. type: textblock -#: pod/multistrap:120 +#: pod/multistrap:130 msgid "" "(Older versions of multistrap supported the same option under the " "C name - this spelling is still supported but new configuration " @@ -345,18 +350,18 @@ msgid "" msgstr "" #. type: =head1 -#: pod/multistrap:124 +#: pod/multistrap:134 msgid "General settings:" msgstr "Definições gerais:" #. type: textblock -#: pod/multistrap:126 +#: pod/multistrap:136 msgid "" "'arch' can be overridden on the command line using the C<--arch> option." msgstr "" #. type: textblock -#: pod/multistrap:128 +#: pod/multistrap:138 #, fuzzy msgid "" "'directory' specifies the top level directory where the bootstrap will be " @@ -366,7 +371,7 @@ msgstr "" "ser criado - não é empacotado em um .tgz depois de completo." #. type: textblock -#: pod/multistrap:131 +#: pod/multistrap:141 #, fuzzy msgid "" "'bootstrap' lists the Sections which will be used to specify the packages " @@ -377,7 +382,7 @@ msgstr "" "desempacotados pelo multistrap." #. type: textblock -#: pod/multistrap:134 +#: pod/multistrap:144 msgid "" "'aptsources' lists the Sections which will be used to specify the apt " "sources in the final system, e.g. if you need to use a local repository to " @@ -386,19 +391,19 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:139 +#: pod/multistrap:149 msgid "" "If you want a package to be in the rootfs, it B be specified in the " "C list under General." msgstr "" #. type: textblock -#: pod/multistrap:142 +#: pod/multistrap:152 msgid "The order of section names in either list is not important." msgstr "" #. type: textblock -#: pod/multistrap:144 +#: pod/multistrap:154 #, fuzzy msgid "" "As with debootstrap, multistrap will continue after errors, as long as the " @@ -407,7 +412,7 @@ msgstr "" "Tal como no debootstrap, o multistrap irá continuar após ocorrerem erros." #. type: textblock -#: pod/multistrap:147 +#: pod/multistrap:157 msgid "" "multistrap also implements the machine:variant support originally used in " "Emdebian Crush, although in a different implementation. Using the cascading " @@ -421,7 +426,7 @@ msgstr "" "linha de comandos." #. type: textblock -#: pod/multistrap:152 +#: pod/multistrap:162 msgid "" "Setting C to true also packs up the final filesystem into a " "tarball." @@ -430,7 +435,7 @@ msgstr "" "ficheiros final num tarball." #. type: textblock -#: pod/multistrap:155 +#: pod/multistrap:165 msgid "" "Note that multistrap ignores any unrecognised options in the config file - " "this allows for backwards-compatible behaviour as well as overloading the " @@ -439,13 +444,13 @@ msgid "" msgstr "" #. type: =head1 -#: pod/multistrap:161 +#: pod/multistrap:171 #, fuzzy msgid "Section settings" msgstr "Definições gerais:" #. type: textblock -#: pod/multistrap:169 +#: pod/multistrap:179 msgid "" "The section name (in [] brackets) needs to be unique for this configuration " "file and any configuration files which this file includes. Section names are " @@ -453,14 +458,14 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:174 +#: pod/multistrap:184 msgid "" "'packages' is the list of packages to be added when this Section is listed " "in C." msgstr "" #. type: textblock -#: pod/multistrap:177 +#: pod/multistrap:187 msgid "" "'source' is the apt source to use for this Section. (To use a local source " "on the same machine, ensure you use C not C, so that apt " @@ -469,7 +474,7 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:183 +#: pod/multistrap:193 msgid "" "'keyring' lists the package which contains the key used by the source listed " "in this Section. If no keyring is specified, the C option must be " @@ -477,32 +482,27 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:187 +#: pod/multistrap:197 msgid "" "'suite' is the suite to use from this source. Note that this B be the " "suite, not the codename." msgstr "" #. type: textblock -#: pod/multistrap:190 +#: pod/multistrap:200 msgid "" "Suites change from time to time: (oldstable, stable, testing, sid) The " "codename (etch, lenny, squeeze, sid) does not change." msgstr "" #. type: =head1 -#: pod/multistrap:194 +#: pod/multistrap:204 msgid "Secure Apt" msgstr "Segurança do Apt" #. type: textblock -#: pod/multistrap:196 +#: pod/multistrap:206 #, fuzzy -#| msgid "" -#| "To use authenticated apt repositories, multistrap either needs to be able " -#| "to install an appropriate keyring package from the existing apt sources " -#| "*outside the multistrap environment* or have the relevant keys already " -#| "configured using apt-key *on the host system*." msgid "" "To use authenticated apt repositories, multistrap either needs to be able to " "install an appropriate keyring package from the existing apt sources " @@ -515,7 +515,7 @@ msgstr "" "configuradas usando apt-key *na máquina do sistema*." #. type: textblock -#: pod/multistrap:201 +#: pod/multistrap:211 msgid "" "If relevant packages exist, specify them in the 'keyring' option for each " "repository. multistrap will then check that apt has already installed this " @@ -528,15 +528,8 @@ msgstr "" "pacotes sejam descarregados dele." #. type: textblock -#: pod/multistrap:206 +#: pod/multistrap:216 #, fuzzy -#| msgid "" -#| "Note that *all* repositories to be used with multistrap must be " -#| "authenticated or apt will fail. Similarly, secure apt can only be " -#| "disabled for all repositories (by using the --no-auth command line option " -#| "or setting the general noauth option in the configuration file), even if " -#| "only one repository does not have a suitable keyring available. Not all " -#| "packages need keyring packages, if you configure apt-key appropriately." msgid "" "Note that B repositories to be used with multistrap must be " "authenticated or apt will fail. Similarly, secure apt can only be disabled " @@ -554,7 +547,7 @@ msgstr "" "apt-key apropriadamente." #. type: textblock -#: pod/multistrap:214 +#: pod/multistrap:224 msgid "" "The keyring package(s) will also be installed inside the multistrap " "environment to match the installed apt sources for the multistrap." @@ -563,7 +556,7 @@ msgstr "" "multistrap para coincidir com as fontes apt instaladas para o multistrap." #. type: textblock -#: pod/multistrap:217 +#: pod/multistrap:227 msgid "" "All configuration of apt-key needs to be done for the machine running " "multistrap itself." @@ -572,12 +565,12 @@ msgstr "" "correndo o próprio multistrap." #. type: =head1 -#: pod/multistrap:220 +#: pod/multistrap:230 msgid "State" msgstr "Estado" #. type: textblock -#: pod/multistrap:222 +#: pod/multistrap:232 msgid "" "multistrap is stateless - if the directory exists, it will simply proceed as " "normal and apt will try to pick up where it left off." @@ -586,14 +579,13 @@ msgstr "" "prosseguir como normalmente e o apt irá tentar prosseguir de onde ficou." #. type: =head1 -#: pod/multistrap:225 +#: pod/multistrap:235 #, fuzzy -#| msgid "Configuration" msgid "Root Filesystem Configuration" msgstr "Configuração" #. type: textblock -#: pod/multistrap:227 +#: pod/multistrap:237 msgid "" "multistrap unpacks the downloaded packages but other stages of system " "configuration are not attempted. Examples include:" @@ -602,7 +594,7 @@ msgstr "" "outros estágios da configuração do sistema. Os exemplos incluem:" #. type: verbatim -#: pod/multistrap:230 +#: pod/multistrap:240 #, no-wrap msgid "" " /etc/inittab\n" @@ -628,13 +620,8 @@ msgstr "" "\n" #. type: textblock -#: pod/multistrap:240 +#: pod/multistrap:250 #, fuzzy -#| msgid "" -#| "As an alternative, multistrap includes a device-table.pl helper script " -#| "that can work around some of the issues with MAKEDEV. device-table.pl " -#| "requires a device table file along the lines of the one in the mtd-utils " -#| "source package." msgid "" "Any device-specific device nodes will also need to be created using MAKEDEV " "or C - a helper script that can work around some of the " @@ -648,7 +635,7 @@ msgstr "" "no pacote mtd-utils source." #. type: textblock -#: pod/multistrap:246 +#: pod/multistrap:256 msgid "" "Once multistrap has successfully created the basic file and directory " "layout, other device-specific scripts are needed before the filesystem can " @@ -660,7 +647,7 @@ msgstr "" "instalado no dispositivo de destino." #. type: textblock -#: pod/multistrap:251 +#: pod/multistrap:261 msgid "" "Once installed, the packages themselves need to be configured using the " "package maintainer scripts and C, unless this is a " @@ -671,7 +658,7 @@ msgstr "" "seja um multistrap nativo." #. type: textblock -#: pod/multistrap:255 +#: pod/multistrap:265 msgid "" "For C to work, F and F must be mounted (or mountable), " "F is also recommended." @@ -680,17 +667,17 @@ msgstr "" "(ou serem montáveis), também é recomendado F." #. type: textblock -#: pod/multistrap:258 +#: pod/multistrap:268 msgid "See also: http://wiki.debian.org/Multistrap" msgstr "Veja também: http://wiki.debian.org/Multistrap" #. type: =head1 -#: pod/multistrap:260 +#: pod/multistrap:270 msgid "Environment" msgstr "Ambiente" #. type: textblock -#: pod/multistrap:262 +#: pod/multistrap:272 msgid "" "To configure the unpacked packages (whether in native or cross mode), " "certain environment variables are needed:" @@ -699,7 +686,7 @@ msgstr "" "são necessárias certas variáveis de ambiente:" #. type: textblock -#: pod/multistrap:265 +#: pod/multistrap:275 msgid "" "Debconf needs to be told to accept that user interaction is not desired:" msgstr "" @@ -707,7 +694,7 @@ msgstr "" "utilizador não é desejada:" #. type: verbatim -#: pod/multistrap:268 +#: pod/multistrap:278 #, fuzzy, no-wrap msgid "" " DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true\n" @@ -717,7 +704,7 @@ msgstr "" " \n" #. type: textblock -#: pod/multistrap:270 +#: pod/multistrap:280 msgid "" "Perl needs to be told to accept that no locales are available inside the " "chroot and not to complain:" @@ -726,7 +713,7 @@ msgstr "" "dentro da chroot e não se queixar:" #. type: verbatim -#: pod/multistrap:273 +#: pod/multistrap:283 #, no-wrap msgid "" " LC_ALL=C LANGUAGE=C LANG=C\n" @@ -736,17 +723,17 @@ msgstr "" "\n" #. type: textblock -#: pod/multistrap:275 +#: pod/multistrap:285 msgid "Then, dpkg can configure the packages:" msgstr "Depois, o dpkg pode configurar os pacotes." #. type: textblock -#: pod/multistrap:277 +#: pod/multistrap:287 msgid "chroot method (PATH = top directory of chroot):" msgstr "método de chroot (PATH = directório de topo da chroot):" #. type: verbatim -#: pod/multistrap:279 +#: pod/multistrap:289 #, no-wrap msgid "" " DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \\\n" @@ -758,12 +745,12 @@ msgstr "" "\n" #. type: textblock -#: pod/multistrap:282 +#: pod/multistrap:292 msgid "at a login shell:" msgstr "numa shell de login:" #. type: verbatim -#: pod/multistrap:284 +#: pod/multistrap:294 #, no-wrap msgid "" " # export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true\n" @@ -777,18 +764,18 @@ msgstr "" "\n" #. type: textblock -#: pod/multistrap:288 +#: pod/multistrap:298 msgid "(As above, dpkg needs F and F mounted first.)" msgstr "" "(Como em cima, o dpkg precisa de F e F montados primeiro.)" #. type: =head1 -#: pod/multistrap:290 +#: pod/multistrap:300 msgid "Native mode - multistrap" msgstr "Modo nativo - multistrap" #. type: textblock -#: pod/multistrap:292 +#: pod/multistrap:302 msgid "" "multistrap was not intended for native support, it was developed for cross " "architecture support. In order for multiple repositories to be used, " @@ -800,7 +787,7 @@ msgstr "" "apt." #. type: textblock -#: pod/multistrap:296 +#: pod/multistrap:306 msgid "" "In native mode, various post-multistrap operations are likely to be needed " "that debootstrap would do for you:" @@ -809,7 +796,7 @@ msgstr "" "multistrap que o debootstrap faria por si:" #. type: verbatim -#: pod/multistrap:299 +#: pod/multistrap:309 #, no-wrap msgid "" " 1. copy /etc/hosts into the chroot\n" @@ -823,7 +810,7 @@ msgstr "" "\n" #. type: textblock -#: pod/multistrap:303 +#: pod/multistrap:313 msgid "" "(An alternative to unset the localisation variables is to add locales to " "your multistrap configuration file in the 'packages' option." @@ -832,7 +819,7 @@ msgstr "" "seu ficheiro de configuração multistrap na opção 'packages')." #. type: textblock -#: pod/multistrap:307 +#: pod/multistrap:317 msgid "" "A native multistrap can be used directly with chroot, so C runs " "C at the end of the multistrap process." @@ -841,12 +828,12 @@ msgstr "" "C corra C no final do processo multistrap." #. type: =head1 -#: pod/multistrap:311 +#: pod/multistrap:321 msgid "Cascading configuration" msgstr "Configuração em cascata" #. type: textblock -#: pod/multistrap:313 +#: pod/multistrap:323 msgid "" "To support multiple variants of a basic (common) configuration, " "C allows configuration files to include other (more general) " @@ -861,12 +848,12 @@ msgstr "" "ficheiro inclui outro ficheiro que é partilhado por outras configurações." #. type: textblock -#: pod/multistrap:319 +#: pod/multistrap:329 msgid "Base file:" msgstr "Ficheiro base:" #. type: verbatim -#: pod/multistrap:321 +#: pod/multistrap:331 #, no-wrap msgid "" " /usr/share/multistrap/crosschroot.conf\n" @@ -876,12 +863,12 @@ msgstr "" "\n" #. type: textblock -#: pod/multistrap:323 +#: pod/multistrap:333 msgid "Variations:" msgstr "Variações:" #. type: verbatim -#: pod/multistrap:325 +#: pod/multistrap:335 #, no-wrap msgid "" " /usr/share/multistrap/armel.conf\n" @@ -891,7 +878,7 @@ msgstr "" "\n" #. type: textblock -#: pod/multistrap:327 +#: pod/multistrap:337 msgid "" "Specifying just the armel.conf file will get the rest of the settings from " "crosschroot.conf so that common changes only need to be made in a single " @@ -902,7 +889,7 @@ msgstr "" "único ficheiro." #. type: textblock -#: pod/multistrap:331 +#: pod/multistrap:341 msgid "" "It is B recommended that any changes to the configuration files " "involved in any particular cascade are tested using the C<--simulate> option " @@ -921,12 +908,12 @@ msgstr "" "portanto um simples erro de escrita pode resultar numa opção não definida." #. type: =head1 -#: pod/multistrap:339 +#: pod/multistrap:349 msgid "Machine:variant support" msgstr "Suporte a Machine:variant" #. type: textblock -#: pod/multistrap:341 +#: pod/multistrap:351 msgid "" "The old packages.conf variables from emsandbox can all be converted into " "C configuration variables. The machine:variant support in " @@ -937,7 +924,7 @@ msgstr "" "C concentra-se nos scripts F e F" #. type: textblock -#: pod/multistrap:346 +#: pod/multistrap:356 #, fuzzy msgid "" "Once C has unpacked the downloaded packages, the C can " @@ -956,7 +943,7 @@ msgstr "" "rootfs." #. type: textblock -#: pod/multistrap:353 +#: pod/multistrap:363 msgid "" "One advantage of using machine:variant support is that the entire " "rootfilesystem can be managed by a single call to multistrap - this is " @@ -967,7 +954,7 @@ msgstr "" "útil quando se constrói sistemas de ficheiros raiz no espaço do utilizador." #. type: textblock -#: pod/multistrap:357 +#: pod/multistrap:367 msgid "" "To enable machine:variant support, specify the path to the scripts to be " "called in the variant configuration file (General section):" @@ -977,7 +964,7 @@ msgstr "" "General):" #. type: verbatim -#: pod/multistrap:360 +#: pod/multistrap:370 #, fuzzy, no-wrap msgid "" " [General]\n" @@ -993,12 +980,12 @@ msgstr "" "\n" #. type: =head1 -#: pod/multistrap:366 +#: pod/multistrap:376 msgid "Restricting package selection" msgstr "Restringindo a selecção de pacotes" #. type: textblock -#: pod/multistrap:368 +#: pod/multistrap:378 msgid "" "C includes Required packages by default, the current list of " "packages can be seen using:" @@ -1007,7 +994,7 @@ msgstr "" "lista actual de pacotes pode ser vista usando:" #. type: verbatim -#: pod/multistrap:371 +#: pod/multistrap:381 #, no-wrap msgid "" " grep-available -FPriority 'required' -sPackage\n" @@ -1017,7 +1004,7 @@ msgstr "" "\n" #. type: textblock -#: pod/multistrap:373 +#: pod/multistrap:383 msgid "" "If the OmitRequired option is set to true, these packages will not be added " "- whilst useful, this option can easily lead to a useless rootfs. Only the " @@ -1031,7 +1018,7 @@ msgstr "" "serão adicionadas mas mais nenhuns." #. type: textblock -#: pod/multistrap:379 +#: pod/multistrap:389 msgid "" "Packages with Priority: important or standard are never included by " "C unless specifically included in a C option in a " @@ -1039,12 +1026,12 @@ msgid "" msgstr "" #. type: =head1 -#: pod/multistrap:383 +#: pod/multistrap:393 msgid "Recommends behaviour" msgstr "" #. type: textblock -#: pod/multistrap:385 +#: pod/multistrap:395 msgid "" "The Debian default behaviour after the Lenny release was to consider " "recommended packages as extra packages to be installed when any one package " @@ -1054,24 +1041,24 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:392 +#: pod/multistrap:402 msgid "The multistrap default is to turn recommends OFF." msgstr "" #. type: textblock -#: pod/multistrap:394 +#: pod/multistrap:404 msgid "" "Set the allowrecommends option to true in the General section to use typical " "Debian behaviour." msgstr "" #. type: =head1 -#: pod/multistrap:397 +#: pod/multistrap:407 msgid "Explicit suite specification" msgstr "" #. type: textblock -#: pod/multistrap:399 +#: pod/multistrap:409 msgid "" "Sometimes, apt needs to be told to get a particular package from a " "particular suite, ignoring a more recent version in another suite in the " @@ -1079,7 +1066,7 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:403 +#: pod/multistrap:413 msgid "" "C can operate with and without the explicit suite option, the " "default is to let apt use the most recent version from the collection of " @@ -1087,7 +1074,7 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:407 +#: pod/multistrap:417 msgid "" "Explicit suite specification has no effect on the final installed system - " "if your aptsources includes a repository which in turn includes a newer " @@ -1096,7 +1083,7 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:412 +#: pod/multistrap:422 msgid "" "Also, when specifying packages to get from a specific suite, apt will also " "try and ensure that the dependencies for that package are also from the same " @@ -1107,7 +1094,7 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:419 +#: pod/multistrap:429 #, fuzzy msgid "" "When using this support in Lenny, ensure that each section uses the suite " @@ -1121,12 +1108,12 @@ msgstr "" "Lenny e anteriores apenas pode usar o nome de código." #. type: textblock -#: pod/multistrap:424 +#: pod/multistrap:434 msgid "To test, on Lenny, try:" msgstr "" #. type: verbatim -#: pod/multistrap:426 +#: pod/multistrap:436 #, no-wrap msgid "" " $ sudo apt-get install apt/stable\n" @@ -1134,12 +1121,12 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:428 +#: pod/multistrap:438 msgid "Compare with" msgstr "" #. type: verbatim -#: pod/multistrap:430 +#: pod/multistrap:440 #, no-wrap msgid "" " $ sudo apt-get install apt/lenny\n" @@ -1147,12 +1134,12 @@ msgid "" msgstr "" #. type: =head1 -#: pod/multistrap:434 +#: pod/multistrap:444 msgid "Omitting deb-src listings" msgstr "" #. type: textblock -#: pod/multistrap:436 +#: pod/multistrap:446 msgid "" "Some multistrap environments do not need access to the Debian sources of " "packages being installed, typically this is required when preparing a build " @@ -1160,14 +1147,14 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:440 +#: pod/multistrap:450 msgid "" "To turn off this additional source (and save both download time and apt-" "cache size), use the omitdebsrc field in each Section." msgstr "" #. type: verbatim -#: pod/multistrap:443 +#: pod/multistrap:453 #, fuzzy, no-wrap msgid "" " [Baked]\n" @@ -1186,12 +1173,12 @@ msgstr "" "\n" #. type: =head1 -#: pod/multistrap:452 +#: pod/multistrap:462 msgid "fakeroot" msgstr "" #. type: textblock -#: pod/multistrap:454 +#: pod/multistrap:464 msgid "" "Foreign architecture bootstraps can operate under C (C " "is designed to do as much as it can within a single call to make this " @@ -1201,14 +1188,14 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:460 +#: pod/multistrap:470 msgid "" "Therefore, if C detects that C is in use, native mode " "configuration is skipped with a reminder warning." msgstr "" #. type: textblock -#: pod/multistrap:463 +#: pod/multistrap:473 msgid "" "The same problem applies to C and therefore the " "installation of the keyring package on the host system is also skipped if " diff -pruN 2.1.6/examples/chroot.sh 2.1.6ubuntu3/examples/chroot.sh --- 2.1.6/examples/chroot.sh 1970-01-01 01:00:00.000000000 +0100 +++ 2.1.6ubuntu3/examples/chroot.sh 2010-08-25 22:13:10.000000000 +0100 @@ -0,0 +1,37 @@ +#!/bin/sh + +set -e + +# This setup script is an alternative method of adjusting the tarball +# contents immediately after multistrap has unpacked the packages. + +# At this stage, any operations inside the rootfs must not try to +# execute any binaries within the rootfs. + +# The script is called with the following arguments: + +# $1 = $DIR - the top directory of the debootstrapped system +# $2 = $ARCH - the specified architecture, already checked with dpkg-architecture. + +# setup.sh needs to be executable. + +TARGET=$1 + +if [ -x "$TARGET/sbin/initctl" ]; then + mv "$TARGET/sbin/start-stop-daemon" "$TARGET/sbin/start-stop-daemon.REAL" + echo \ +"#!/bin/sh +echo +echo echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/start-stop-daemon" + chmod 755 "$TARGET/sbin/start-stop-daemon" +fi + +if [ -x "$TARGET/sbin/initctl" ]; then + mv "$TARGET/sbin/initctl" "$TARGET/sbin/initctl.REAL" + echo \ +"#!/bin/sh +echo +echo \"Warning: Fake initctl called, doing nothing\"" > "$TARGET/sbin/initctl" + chmod 755 "$TARGET/sbin/initctl" +fi + \ No newline at end of file diff -pruN 2.1.6/examples/grip-lenny.conf 2.1.6ubuntu3/examples/grip-lenny.conf --- 2.1.6/examples/grip-lenny.conf 1970-01-01 01:00:00.000000000 +0100 +++ 2.1.6ubuntu3/examples/grip-lenny.conf 2010-08-25 22:13:10.000000000 +0100 @@ -0,0 +1,33 @@ +# Example multistrap configuration file for the lenny shortcut. + +[General] +arch= +directory= +# same as --tidy-up option if set to true +cleanup=true +# same as --no-auth option if set to true +# keyring packages listed in each debootstrap will +# still be installed. +noauth=false +# whether to add the /suite to be explicit about where apt +# needs to look for packages. Default is false. +explicitsuite=false +# extract all downloaded archives (default is true) +unpack=true +# the order of sections is not important. +# the debootstrap option determines which repository +# is used to calculate the list of Priority: required packages. +debootstrap=Emdebian Updates +aptsources=Emdebian Updates + +[Emdebian] +packages= +source=http://www.emdebian.org/grip +keyring=emdebian-archive-keyring +suite=stable + +[Updates] +packages= +source=http://www.emdebian.org/grip +keyring=emdebian-archive-keyring +suite=stable-proposed-updates diff -pruN 2.1.6/examples/grip-sid.conf 2.1.6ubuntu3/examples/grip-sid.conf --- 2.1.6/examples/grip-sid.conf 1970-01-01 01:00:00.000000000 +0100 +++ 2.1.6ubuntu3/examples/grip-sid.conf 2010-08-25 22:13:10.000000000 +0100 @@ -0,0 +1,27 @@ +# Example multistrap configuration file for the lenny shortcut. + +[General] +arch= +directory= +# same as --tidy-up option if set to true +cleanup=true +# same as --no-auth option if set to true +# keyring packages listed in each debootstrap will +# still be installed. +noauth=false +# whether to add the /suite to be explicit about where apt +# needs to look for packages. Default is false. +explicitsuite=false +# extract all downloaded archives (default is true) +unpack=true +# the order of sections is not important. +# the debootstrap option determines which repository +# is used to calculate the list of Priority: required packages. +debootstrap=Emdebian +aptsources=Emdebian + +[Emdebian] +packages= +source=http://www.emdebian.org/grip +keyring=emdebian-archive-keyring +suite=unstable diff -pruN 2.1.6/examples/grip-squeeze.conf 2.1.6ubuntu3/examples/grip-squeeze.conf --- 2.1.6/examples/grip-squeeze.conf 1970-01-01 01:00:00.000000000 +0100 +++ 2.1.6ubuntu3/examples/grip-squeeze.conf 2010-08-25 22:13:10.000000000 +0100 @@ -0,0 +1,27 @@ +# Example multistrap configuration file for the lenny shortcut. + +[General] +arch= +directory= +# same as --tidy-up option if set to true +cleanup=true +# same as --no-auth option if set to true +# keyring packages listed in each debootstrap will +# still be installed. +noauth=false +# whether to add the /suite to be explicit about where apt +# needs to look for packages. Default is false. +explicitsuite=false +# extract all downloaded archives (default is true) +unpack=true +# the order of sections is not important. +# the debootstrap option determines which repository +# is used to calculate the list of Priority: required packages. +debootstrap=Emdebian +aptsources=Emdebian + +[Emdebian] +packages= +source=http://www.emdebian.org/grip +keyring=emdebian-archive-keyring +suite=testing diff -pruN 2.1.6/examples/jaunty.conf 2.1.6ubuntu3/examples/jaunty.conf --- 2.1.6/examples/jaunty.conf 1970-01-01 01:00:00.000000000 +0100 +++ 2.1.6ubuntu3/examples/jaunty.conf 2010-08-25 22:13:10.000000000 +0100 @@ -0,0 +1,27 @@ +# Example multistrap configuration file for the sid shortcut. + +[General] +arch= +directory= +# same as --tidy-up option if set to true +cleanup=true +# same as --no-auth option if set to true +# keyring packages listed in each debootstrap will +# still be installed. +noauth=false +# whether to add the /suite to be explicit about where apt +# needs to look for packages. Default is false. +explicitsuite=false +# extract all downloaded archives (default is true) +unpack=true +# the order of sections is not important. +# the debootstrap option determines which repository +# is used to calculate the list of Priority: required packages. +debootstrap=Ubuntu +aptsources=Ubuntu + +[Ubuntu] +packages=apt +source=http://archive.ubuntu.com/ubuntu +keyring=ubuntu-keyring +suite=jaunty diff -pruN 2.1.6/examples/lucid.conf 2.1.6ubuntu3/examples/lucid.conf --- 2.1.6/examples/lucid.conf 1970-01-01 01:00:00.000000000 +0100 +++ 2.1.6ubuntu3/examples/lucid.conf 2010-08-25 22:13:10.000000000 +0100 @@ -0,0 +1,27 @@ +# Example multistrap configuration file for the sid shortcut. + +[General] +arch= +directory= +# same as --tidy-up option if set to true +cleanup=true +# same as --no-auth option if set to true +# keyring packages listed in each debootstrap will +# still be installed. +noauth=false +# whether to add the /suite to be explicit about where apt +# needs to look for packages. Default is false. +explicitsuite=false +# extract all downloaded archives (default is true) +unpack=true +# the order of sections is not important. +# the debootstrap option determines which repository +# is used to calculate the list of Priority: required packages. +debootstrap=Ubuntu +aptsources=Ubuntu + +[Ubuntu] +packages=apt +source=http://archive.ubuntu.com/ubuntu +keyring=ubuntu-keyring +suite=lucid diff -pruN 2.1.6/examples/maverick.conf 2.1.6ubuntu3/examples/maverick.conf --- 2.1.6/examples/maverick.conf 1970-01-01 01:00:00.000000000 +0100 +++ 2.1.6ubuntu3/examples/maverick.conf 2010-08-25 22:13:10.000000000 +0100 @@ -0,0 +1,27 @@ +# Example multistrap configuration file for the sid shortcut. + +[General] +arch= +directory= +# same as --tidy-up option if set to true +cleanup=true +# same as --no-auth option if set to true +# keyring packages listed in each debootstrap will +# still be installed. +noauth=false +# whether to add the /suite to be explicit about where apt +# needs to look for packages. Default is false. +explicitsuite=false +# extract all downloaded archives (default is true) +unpack=true +# the order of sections is not important. +# the debootstrap option determines which repository +# is used to calculate the list of Priority: required packages. +debootstrap=Ubuntu +aptsources=Ubuntu + +[Ubuntu] +packages=apt +source=http://archive.ubuntu.com/ubuntu +keyring=ubuntu-keyring +suite=maverick universe diff -pruN 2.1.6/examples/maverick-ports.conf 2.1.6ubuntu3/examples/maverick-ports.conf --- 2.1.6/examples/maverick-ports.conf 1970-01-01 01:00:00.000000000 +0100 +++ 2.1.6ubuntu3/examples/maverick-ports.conf 2010-08-25 22:13:10.000000000 +0100 @@ -0,0 +1,27 @@ +# Example multistrap configuration file for the sid shortcut. + +[General] +arch=armel +directory= +# same as --tidy-up option if set to true +cleanup=true +# same as --no-auth option if set to true +# keyring packages listed in each debootstrap will +# still be installed. +noauth=false +# whether to add the /suite to be explicit about where apt +# needs to look for packages. Default is false. +explicitsuite=false +# extract all downloaded archives (default is true) +unpack=true +# the order of sections is not important. +# the debootstrap option determines which repository +# is used to calculate the list of Priority: required packages. +debootstrap=UbuntuPorts +aptsources=UbuntuPorts + +[UbuntuPorts] +packages=apt +source=http://ports.ubuntu.com/ +keyring=ubuntu-keyring +suite=maverick universe diff -pruN 2.1.6/multistrap 2.1.6ubuntu3/multistrap --- 2.1.6/multistrap 2010-07-26 22:45:46.000000000 +0100 +++ 2.1.6ubuntu3/multistrap 2010-10-01 07:40:56.000000000 +0100 @@ -32,7 +32,8 @@ use vars qw/ $progname $ourversion $dstr $type $file $config $tidy $noauth $keyring %keyrings $deflist $cfgdir @extrapkgs @includes %source $setupsh $configsh $omitrequired $dryrun $omitpreinst @reinstall $tgzname %uniq %required $check @check %uniq - $explicit_suite $allow_recommends %omitdebsrc @dsclist /; + $explicit_suite $allow_recommends %omitdebsrc @dsclist @sectoutput + %flatfile /; setlocale(LC_MESSAGES, ""); textdomain("multistrap"); @@ -105,6 +106,16 @@ foreach my $inc (@includes) printf (_g("%s %s using %s\n"), $progname, $ourversion, $chk); cascade($chk); } +%uniq=(); +foreach my $line (@debootstrap) { + $uniq{$line}++; +} +@debootstrap=sort keys %uniq; +%uniq=(); +foreach my $line (@aptsources) { + $uniq{$line}++; +} +@aptsources=sort keys %uniq; &dump_config if (defined $dryrun); if (not defined $dir or not defined $arch) { @@ -205,8 +216,7 @@ if (-l "${dir}lib64" ) { chdir ("${old}"); } -unlink ("${dir}etc/apt/sources.list.d/multistrap.sources.list") - if (-f "${dir}etc/apt/sources.list.d/multistrap.sources.list"); +system ("rm -rf ${dir}etc/apt/sources.list.d/*"); unlink ("${dir}etc/apt/sources.list") if (-f "${dir}etc/apt/sources.list"); @@ -227,12 +237,6 @@ foreach $repo (sort keys %suites) { mkdir "$dir/${cachedir}archives/partial"; } } -%uniq=(); -foreach my $line (@debootstrap) { - $uniq{$line}++; -} -@debootstrap=sort keys %uniq; -%uniq=(); foreach my $aptsrc (@debootstrap) { if (defined $deflist) { open (SOURCES, ">>${dir}etc/apt/sources.list.d/multistrap.sources.list") @@ -243,8 +247,9 @@ foreach my $aptsrc (@debootstrap) { open (SOURCES, ">>${dir}etc/apt/sources.list.d/multistrap-${aptsrc}.list") or die _g("Cannot open sources list"). $!; $mirror = $sources{$aptsrc}; - $suite = $suites{$aptsrc}; - $component = (defined $components{$aptsrc}) ? $components{$aptsrc} : "main"; + $suite = (exists $flatfile{$aptsrc}) ? "" : $suites{$aptsrc}; + $component = (exists $flatfile{$aptsrc}) ? "" + : (defined $components{$aptsrc}) ? $components{$aptsrc} : "main"; if (defined $mirror and defined $suite) { print SOURCES "deb $mirror $suite $component\n"; print SOURCES "deb-src $mirror $suite $component\n" if (not defined $omitdebsrc{$aptsrc}); @@ -274,14 +279,21 @@ if (defined $k) { $config_str = ''; $config_str .= " -o Apt::Architecture=$arch"; +$config_str .= " -o Dir::Etc::TrustedParts=/etc/apt/trusted.gpg.d"; +$config_str .= " -o Dir::Etc::Trusted=/etc/apt/trusted.gpg"; $config_str .= " -o Apt::Get::AllowUnauthenticated=true" if (defined $noauth); $config_str .= " -o Apt::Get::Download-Only=true"; $config_str .= " -o Apt::Install-Recommends=false"; $config_str .= " -o Dir=$dir"; $config_str .= " -o Dir::Etc=${dir}${etcdir}"; -$sourcesname = "sources.list.d/multistrap.sources.list"; -$config_str .= " -o Dir::Etc::SourceList=${dir}${etcdir}$sourcesname"; +if (defined $deflist) { + $sourcesname = "sources.list.d/multistrap.sources.list"; + $config_str .= " -o Dir::Etc::SourceList=${dir}${etcdir}$sourcesname"; +} # else { +# $sourcesname = "sources.list.d"; +# $config_str .= " -o Dir::Etc::SourceParts=${dir}${etcdir}$sourcesname"; +# } $config_str .= " -o Dir::State=${dir}${libdir}"; $config_str .= " -o Dir::State::Status=${dir}${dpkgdir}status"; $config_str .= " -o Dir::Cache=${dir}${cachedir}"; @@ -302,10 +314,11 @@ foreach my $sect (sort keys %packages) { my @list = split (' ', $sect); foreach my $pkg (@list) { next if ($packages{$pkg} =~ /^\s*$/); + next if (!(grep(/^$sect$/i, @debootstrap))); my @long=split (/ /, $packages{$sect}); foreach my $l (@long) { chomp ($l); - if (defined $explicit_suite) { + if (defined $explicit_suite and $suites{$sect}) { # instruct apt to get packages from the specified # suites (when the package exists in more than one). $str .= " $l/$suites{$sect}" if ((defined $l) and ($l !~ /^\s*$/)); @@ -357,12 +370,6 @@ foreach my $filelist (@sources) { next if (-d $filelist); unlink ("${dir}etc/apt/sources.list.d/$filelist"); } -%uniq=(); -foreach my $line (@aptsources) { - $uniq{$line}++; -} -@aptsources=sort keys %uniq; -%uniq=(); foreach my $aptsrc (@aptsources) { if (defined $deflist) { open (SOURCES, ">>${dir}etc/apt/sources.list.d/multistrap.sources.list") @@ -373,8 +380,9 @@ foreach my $aptsrc (@aptsources) { open (SOURCES, ">>${dir}etc/apt/sources.list.d/multistrap-${aptsrc}.list") or die _g("Cannot open sources list"). $!; $mirror = $sources{$aptsrc}; - $suite = $suites{$aptsrc}; - $component = (defined $components{$aptsrc}) ? $components{$aptsrc} : "main"; + $suite = (exists $flatfile{$aptsrc}) ? "" : $suites{$aptsrc}; + $component = (defined $components{$aptsrc}) ? $components{$aptsrc} + : (exists $flatfile{$aptsrc}) ? "" : "main"; if (defined $mirror and defined $suite) { print SOURCES "deb $mirror $suite $component\n"; print SOURCES "deb-src $mirror $suite $component\n" if (not defined $omitdebsrc{$aptsrc}); @@ -478,6 +486,7 @@ sub force_unpack { my $pkg=`LC_ALL=C dpkg -f ./${cachedir}archives/$deb Package`; chomp ($ver); chomp ($pkg); + push @dsclist, $pkg; mkdir ("./tmp"); my $tmpdir = `mktemp -p ./tmp -d -t multistrap.XXXXXX`; chomp ($tmpdir); @@ -587,7 +596,11 @@ sub check_bin_sh { sub tidy_apt { print _g("I: Tidying up apt cache and list data.\n"); if (defined $sourcedir) { - my $str = join (" ", @dsclist); + my %uniqdsc=(); + foreach my $a (@dsclist) { + $uniqdsc{$a}++; + } + my $str = join (" ", sort keys %uniqdsc); print "(cd $sourcedir; apt-get -d $config_str source $str)"; system ("(cd $sourcedir; apt-get -d $config_str source $str)"); } @@ -661,7 +674,7 @@ sub native { } # reinstall set foreach my $reinst (sort @reinstall) { - system ("$str $env chroot $dir apt-get --reinstall -y install $reinst"); + system ("$str $env chroot $dir apt-get --reinstall -y $forceyes install $reinst"); } } @@ -774,7 +787,7 @@ bootstrap=Debian [Debian] packages= -source=http://ftp.uk.debian.org/debian +source=http://cdn.debian.net/debian keyring=debian-archive-keyring suite=lenny @@ -845,10 +858,16 @@ sub cascade { push @includes, @i; } else { $sources{$section}=$keys{$section}{'source'} if (not exists $source{$section}); + # don't set suite or component if URL is of apt-ftparchive trailing-slash form + # regexp is: optional string in '[]', string without '[' or ']', string ending in '/' + $flatfile{$section}++ if (($sources{$section} =~ /^(\[.*\] )*[^\[\]]+ .+\/$/)); $packages{$section}=$keys{$section}{'packages'} if (not exists $packages{$section}); - $suites{$section}=$keys{$section}{'suite'} if (not exists $suites{$section}); - $components{$section}=$keys{$section}{'components'} if (not exists $components{$section}); - $omitdebsrc{$section}=$keys{$section}{'omitdebsrc'} if (not exists $omitdebsrc{$section}); + $suites{$section}=$keys{$section}{'suite'} + if (not exists $suites{$section} and not exists $flatfile{$section}); + $components{$section}=$keys{$section}{'components'} + if (not exists $components{$section} and not exists $flatfile{$section}); + $omitdebsrc{$section}=$section if ((defined $keys{$section}{'omitdebsrc'}) + and ($keys{$section}{'omitdebsrc'} eq "true")); push @reinstall, split (/ /, lc($keys{$section}{'reinstall'})); $components{$section}='main' if (not defined $components{$section}); $keyrings{$section}=$keys{$section}{'keyring'} if (not exists $keyrings{$section}); @@ -897,16 +916,14 @@ sub dump_config { " cannot be parsed correctly."), $file); warn ("\n$msg\n"); } - # Translators: followed by a list of section names from the config file. - printf ("bootstrap:\t"._g("Sections specifying packages for downloading in the bootstrap: ").join (", ", sort @debootstrap)."\n"); - # Translators: followed by a list of section names from the config file. - printf ("aptsources:\t"._g("Sections specifying apt sources in the final system: ").join (", ", sort @aptsources)."\n"); @check=(); %uniq=(); push @check, @debootstrap; push @check, @aptsources; foreach my $sect (@check) { $uniq{$sect}++; } - foreach my $sect (sort keys %uniq) { + @check = sort keys %uniq; + %uniq=(); + foreach my $sect (@check) { if (not exists $keys{$sect}) { $msg .= sprintf (_g("ERR: The '%s' section is not defined.\n"), $sect); } @@ -916,23 +933,36 @@ sub dump_config { } else { printf ("include:\t"._g("No included configuration files.\n")); } - print "source: \tSources: ".join (", ", sort values %sources)."\n"; - my @long=(); - foreach my $sect (sort keys %packages) { - my @list = split (' ', $sect); - foreach my $pkg (@list) { - next if ($packages{$pkg} =~ /^\s*$/); - @long=split (/ /, $packages{$sect}); - } + # explain the bootstrap section details explicitly and just refer to + # those for the apt sources. + foreach my $sect_name (@check) { + printf ("Section:\t$sect_name\n"); + print "\tsource: \t$sources{$sect_name}\n"; + my @sorted = split(/ /, $packages{$sect_name}); + %uniq=(); + foreach my $pkg (@sorted) { + $uniq{$pkg}++; + } + @sorted = sort keys %uniq; + %uniq=(); + print "\tsuite: \t$suites{$sect_name}\n" if (not exists $flatfile{$sect_name}); + print "\tcomponents:\t$components{$sect_name}\n" if (not exists $flatfile{$sect_name}); + # only packages can have a list + next if (not grep(/^$sect_name$/i, @debootstrap)); + print "\tBootstrap:\tpackages: ".join(" ", @sorted)."\n"; + } + printf ("Bootstrap:\t%s: %s\n", _g("Sections"), join(" ", sort @debootstrap)); + printf ("AptSources:\t%s: %s\n", _g("Sections"), join(" ", sort @aptsources)); + my @srcdump=(); + foreach my $src (sort keys %sources) { + next if ((!grep(/^$src$/i, @aptsources)) or (!grep(/^$src$/i, @debootstrap))); + push @srcdump, $sources{$src}; } - print "packages:\tPackages: ".join (", ", sort @long)."\n"; - print "suites: \tSuites: ".join (", ", sort values %suites)."\n"; - print "components\tComponents: ".join (", ", sort values %components)."\n"; - my $msg="omitdebsrc\t"._g("Omit deb-src from sources.list for sections:"); + my $srcmsg="omitdebsrc\t"._g("Omit deb-src from sources.list for sections:"); foreach my $omit (sort keys %omitdebsrc) { - $msg .= $omitdebsrc{$omit} if (defined $omitdebsrc{$omit}); + $srcmsg .= $omitdebsrc{$omit} if (defined $omitdebsrc{$omit}); } - print "$msg\n"; + print "$srcmsg\n"; if (defined $explicit_suite) { printf("explicitsuite:\t"._g("Explicit suite selection: Yes\n")); } else { @@ -958,9 +988,9 @@ sub dump_config { $msg .= sprintf(_g("Cannot determine directory from '%s'.\n"), $file); } printf ("unpack: \t"._g("extract all downloaded archives: %s\n"), $unpack) if (defined $unpack); - print "configscript\t: $configsh\n" if (defined $configsh); - print "setupscript\t: $setupsh\n" if (defined $setupsh); - print "omitrequired\t: $omitrequired\n" if (defined $omitrequired); + print "configscript:\t$configsh\n" if (defined $configsh); + print "setupscript:\t$setupsh\n" if (defined $setupsh); + print "omitrequired:\t$omitrequired\n" if (defined $omitrequired); if (defined $tidy) { printf ("cleanup: \t"._g("remove apt cache data: true\n")); } else { Binary files 2.1.6/po/da.gmo and 2.1.6ubuntu3/po/da.gmo differ Binary files 2.1.6/po/fr.gmo and 2.1.6ubuntu3/po/fr.gmo differ diff -pruN 2.1.6/po/multistrap.pot 2.1.6ubuntu3/po/multistrap.pot --- 2.1.6/po/multistrap.pot 2010-07-28 19:34:38.000000000 +0100 +++ 2.1.6ubuntu3/po/multistrap.pot 1970-01-01 01:00:00.000000000 +0100 @@ -1,436 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: multistrap@packages.debian.org\n" -"POT-Creation-Date: 2010-07-28 19:34+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../multistrap:80 -msgid "Unknown option" -msgstr "" - -#: ../multistrap:83 -#, perl-format -msgid "Need a configuration file - use %s -f\n" -msgstr "" - -#. Translators: fields are: programname, versionstring, configfile. -#: ../multistrap:105 ../multistrap:116 -#, perl-format -msgid "%s %s using %s\n" -msgstr "" - -#: ../multistrap:121 ../multistrap:123 -#, perl-format -msgid "Defaulting architecture to native: %s\n" -msgstr "" - -#: ../multistrap:125 -#, perl-format -msgid "Using foreign architecture: %s\n" -msgstr "" - -#: ../multistrap:130 -#, perl-format -msgid "" -"No sources defined for a foreign multistrap.\n" -"\tUsing your existing apt sources. To use different sources,\n" -"\tlist them with aptsources= in '%s'." -msgstr "" - -#. Translators: fields are: programname, architecture, host architecture. -#: ../multistrap:138 -#, perl-format -msgid "%s building %s multistrap on '%s'\n" -msgstr "" - -#: ../multistrap:143 -#, perl-format -msgid "Unable to create directory '%s'" -msgstr "" - -#: ../multistrap:159 -#, perl-format -msgid "Unable to create directory '%s'\n" -msgstr "" - -#: ../multistrap:195 -msgid "INF: ./lib64 -> /lib symbolic link reset to ./lib.\n" -msgstr "" - -#: ../multistrap:203 -msgid "INF: Setting ./lib64 -> ./lib symbolic link.\n" -msgstr "" - -#: ../multistrap:239 ../multistrap:244 ../multistrap:369 ../multistrap:374 -msgid "Cannot open sources list" -msgstr "" - -#: ../multistrap:270 -#, perl-format -msgid "I: Installing %s\n" -msgstr "" - -#: ../multistrap:288 -#, perl-format -msgid "Getting package lists: apt-get %s update\n" -msgstr "" - -#: ../multistrap:290 -#, perl-format -msgid "apt update failed. Exit value: %d\n" -msgstr "" - -#: ../multistrap:295 -msgid "I: Calculating required packages.\n" -msgstr "" - -#: ../multistrap:332 -#, perl-format -msgid "apt download failed. Exit value: %d\n" -msgstr "" - -#: ../multistrap:345 -msgid "ERR: ./lib64 -> /lib symbolic link reset to ./lib after unpacking.\n" -msgstr "" - -#: ../multistrap:346 -#, perl-format -msgid "ERR: Some files may have been unpacked outside %s!\n" -msgstr "" - -#: ../multistrap:353 -msgid "Cannot read apt sources list directory.\n" -msgstr "" - -#: ../multistrap:387 -#, perl-format -msgid "" -"\n" -"Multistrap system installed successfully in %s.\n" -msgstr "" - -#: ../multistrap:389 -#, perl-format -msgid "" -"\n" -"Compressing multistrap system in '%s' to a tarball called: '%s'.\n" -msgstr "" - -#: ../multistrap:395 -#, perl-format -msgid "" -"\n" -"Removing build directory: '%s'\n" -msgstr "" - -#: ../multistrap:400 -#, perl-format -msgid "" -"\n" -"Multistrap system packaged successfully as '%s'.\n" -msgstr "" - -#: ../multistrap:426 ../multistrap:467 ../multistrap:615 -msgid "Cannot read apt archives directory.\n" -msgstr "" - -#: ../multistrap:439 -msgid "I: Calculating obsolete packages\n" -msgstr "" - -#: ../multistrap:453 ../multistrap:457 -#, perl-format -msgid "I: Removing %s\n" -msgstr "" - -#: ../multistrap:474 -#, perl-format -msgid "Using directory %s for unpacking operations\n" -msgstr "" - -#: ../multistrap:476 -#, perl-format -msgid "I: Extracting %s...\n" -msgstr "" - -#: ../multistrap:488 -#, perl-format -msgid "" -"dpkg -X failed with error code %s\n" -"Skipping...\n" -msgstr "" - -#: ../multistrap:524 -#, perl-format -msgid " -> Processing conffiles for %s\n" -msgstr "" - -#: ../multistrap:543 -#, perl-format -msgid "ERR: lib64 -> ./lib symbolic link clobbered by %s\n" -msgstr "" - -#: ../multistrap:546 -msgid "INF: lib64 -> /lib symbolic link reset to ./lib.\n" -msgstr "" - -#: ../multistrap:553 -msgid "I: Unpacking complete.\n" -msgstr "" - -#: ../multistrap:566 -msgid "ERR: ./bin/sh symbolic link does not exist.\n" -msgstr "" - -#: ../multistrap:568 -msgid "INF: Setting ./bin/sh -> ./bin/dash\n" -msgstr "" - -#: ../multistrap:573 -msgid "INF: ./bin/dash not found. Setting ./bin/sh -> ./bin/bash\n" -msgstr "" - -#: ../multistrap:588 -msgid "I: Tidying up apt cache and list data.\n" -msgstr "" - -#: ../multistrap:597 -msgid "Cannot read apt lists directory.\n" -msgstr "" - -#: ../multistrap:605 -msgid "Cannot read apt cache directory.\n" -msgstr "" - -#: ../multistrap:637 -#, perl-format -msgid "" -"I: dpkg configuration settings:\n" -"\t%s\n" -msgstr "" - -#: ../multistrap:639 -msgid "" -"W: Cannot use 'chroot' when fakeroot is in use. Skipping package " -"configuration.\n" -msgstr "" - -#: ../multistrap:642 -msgid "I: Native mode - configuring unpacked packages . . .\n" -msgstr "" - -#: ../multistrap:653 -msgid "I: Running preinst scripts with 'upgrade' argument.\n" -msgstr "" - -#: ../multistrap:676 -#, perl-format -msgid "Cannot open %s directory. %s\n" -msgstr "" - -#: ../multistrap:707 -#, perl-format -msgid "cannot open apt sources list. %s" -msgstr "" - -#: ../multistrap:713 -#, perl-format -msgid "cannot open apt sources.list directory %s\n" -msgstr "" - -#: ../multistrap:718 -#, perl-format -msgid "cannot open /etc/apt/sources.list.d/%s %s" -msgstr "" - -#: ../multistrap:730 -#, perl-format -msgid "" -"\n" -"%s version %s\n" -"\n" -"Usage:\n" -" %s [-a ARCH] [-d DIR] -f CONFIG_FILE\n" -" %s -?|-h|--help|--version\n" -"\n" -"Command:\n" -" -f|--file CONFIG_FILE: path to the multistrap configuration file.\n" -"\n" -"Options:\n" -" -a|--arch ARCHITECTURE: override the configuration file architecture.\n" -" -d|--dir PATH: override the configuration file directory.\n" -" --no-auth: do not use Secure Apt for any repositories\n" -" --tidy-up: remove apt cache data and downloaded archives.\n" -" --dry-run: output the configuration and exit\n" -" --simulate: output the configuration and exit\n" -" -?|-h|--help: print this usage message and exit\n" -" --version: print this usage message and exit\n" -"\n" -"%s replaces debootstrap to provide support for multiple\n" -"repositories, using a configuration file to specify the relevant suites,\n" -"architecture, extra packages and the mirror to use for each repository.\n" -"\n" -"Example configuration:\n" -"[General]\n" -"arch=armel\n" -"directory=/opt/multistrap/\n" -"# same as --tidy-up option if set to true\n" -"cleanup=true\n" -"# same as --no-auth option if set to true\n" -"# keyring packages listed in each bootstrap will\n" -"# still be installed.\n" -"noauth=false\n" -"# extract all downloaded archives (default is true)\n" -"unpack=true\n" -"# aptsources is a list of sections to be used for downloading packages\n" -"# and lists and placed in the /etc/apt/sources.list.d/multistrap.sources." -"list\n" -"# of the target. Order is not important\n" -"aptsources=Grip Updates\n" -"# the order of sections is not important.\n" -"# the bootstrap option determines which repository\n" -"# is used to calculate the list of Priority: required packages.\n" -"bootstrap=Debian\n" -"\n" -"[Debian]\n" -"packages=\n" -"source=http://ftp.uk.debian.org/debian\n" -"keyring=debian-archive-keyring\n" -"suite=lenny\n" -"\n" -"This will result in a completely normal debootstrap of Debian lenny from\n" -"the specified mirror, for armel in /opt/multistrap/.\n" -"\n" -"'Architecture' and 'directory' can be overridden on the command line.\n" -"\n" -"Specify a package to extend the debootstap to include that package and\n" -"all dependencies. Dependencies will be calculated by apt so as to use\n" -"only the most recent suitable version from all configured repositories.\n" -"\n" -"General settings:\n" -"\n" -"'directory' specifies the top level directory where the bootstrap\n" -"will be created - it is not packed into a .tgz once complete.\n" -"\n" -msgstr "" - -#: ../multistrap:796 -msgid "failed to write usage:" -msgstr "" - -#: ../multistrap:876 -#, perl-format -msgid "" -"ERROR: Your version of apt is too old to support using a codename like '%s'. " -"You MUST use the suite and multistrap is unable to guess which one you meant " -"because suites change over time. Use one of: 'oldstable', 'stable', 'stable-" -"proposed-updates', 'testing', 'unstable' or 'experimental'. Alternatively, " -"upgrade to version of apt newer than 0.7.20.2+lenny1.\n" -msgstr "" - -#: ../multistrap:896 -#, perl-format -msgid "The supplied configuration file '%s' cannot be parsed correctly." -msgstr "" - -#. Translators: followed by a list of section names from the config file. -#: ../multistrap:901 -msgid "Sections specifying packages for downloading in the bootstrap: " -msgstr "" - -#. Translators: followed by a list of section names from the config file. -#: ../multistrap:903 -msgid "Sections specifying apt sources in the final system: " -msgstr "" - -#: ../multistrap:911 -#, perl-format -msgid "ERR: The '%s' section is not defined.\n" -msgstr "" - -#: ../multistrap:915 -msgid "Including configuration file from: " -msgstr "" - -#: ../multistrap:917 -msgid "No included configuration files.\n" -msgstr "" - -#: ../multistrap:931 -msgid "Omit deb-src from sources.list for sections:" -msgstr "" - -#: ../multistrap:937 -msgid "Explicit suite selection: Yes\n" -msgstr "" - -#: ../multistrap:939 -msgid "Explicit suite selection: No - let apt use latest.\n" -msgstr "" - -#: ../multistrap:942 -msgid "Recommended packages are added to the selection.\n" -msgstr "" - -#: ../multistrap:944 -msgid "Recommended packages are ignored.\n" -msgstr "" - -#: ../multistrap:951 -#, perl-format -msgid "Architecture: %s\n" -msgstr "" - -#: ../multistrap:953 -#, perl-format -msgid "Cannot determine architecture from '%s'.\n" -msgstr "" - -#: ../multistrap:956 -#, perl-format -msgid "Output directory: '%s'\n" -msgstr "" - -#: ../multistrap:958 -#, perl-format -msgid "Cannot determine directory from '%s'.\n" -msgstr "" - -#: ../multistrap:960 -#, perl-format -msgid "extract all downloaded archives: %s\n" -msgstr "" - -#: ../multistrap:965 -msgid "remove apt cache data: true\n" -msgstr "" - -#: ../multistrap:967 -msgid "remove apt cache data: false\n" -msgstr "" - -#: ../multistrap:970 -msgid "allow the use of unauthenticated repositories: true\n" -msgstr "" - -#: ../multistrap:972 -msgid "allow the use of unauthenticated repositories: false\n" -msgstr "" - -#: ../multistrap:975 -#, perl-format -msgid "Sources will be retained in: %s\n" -msgstr "" Binary files 2.1.6/po/pt.gmo and 2.1.6ubuntu3/po/pt.gmo differ Binary files 2.1.6/po/vi.gmo and 2.1.6ubuntu3/po/vi.gmo differ diff -pruN 2.1.6/pod/multistrap 2.1.6ubuntu3/pod/multistrap --- 2.1.6/pod/multistrap 2010-07-22 21:13:23.000000000 +0100 +++ 2.1.6ubuntu3/pod/multistrap 2010-08-25 22:13:10.000000000 +0100 @@ -12,6 +12,8 @@ multistrap - multiple repository bootstr =head1 Options +-?|-h|--help|--version - output the help text and exit successfully. + --dry-run - collate all the configuration settings and output a bare summary. @@ -19,16 +21,24 @@ bare summary. (The following options can also be set in the configuration file.) +-a|--arch - architecture of the packages to put into the multistrap. + +-d|--dir - directory into which the bootstrap will be installed. + +-f|--file - configuration file for multistrap [required] + --tidy-up - remove apt cache data, downloaded Packages files and the apt package cache. Same as cleanup=true. --no-auth - allow the use of unauthenticated repositories. Same as noauth=true ---sourcedir DIR - move the contents of var/cache/apt/archives/ from +--source-dir DIR - move the contents of var/cache/apt/archives/ from inside the chroot to the specified external directory, then add the Debian source packages for each used binary. Same as retainsources=DIR -If the specified directory does not exist, nothing is done. +If the specified directory does not exist, nothing is done. Requires +--tidy-up in order to calculate the full list of source packages, +including dependencies. =head1 Description