From 2e22ca8d7367ea006ed971621dd6f1724ce76294 Mon Sep 17 00:00:00 2001 From: Neil Williams Date: Sun, 12 Apr 2015 18:56:53 +0100 Subject: [PATCH] Update for Jessie release --- cross/crosschroot-stable.conf | 2 +- debian/changelog | 1 + examples/multistrap-example.conf | 2 +- examples/stretch.conf | 27 +++++++++++++++++++++ po/da.po | 2 +- po/de.po | 2 +- po/fr.po | 2 +- po/multistrap.pot | 2 +- po/pt.po | 2 +- po/vi.po | 2 +- pod/multistrap | 41 +++++++++++--------------------- 11 files changed, 50 insertions(+), 35 deletions(-) create mode 100644 examples/stretch.conf diff --git a/cross/crosschroot-stable.conf b/cross/crosschroot-stable.conf index 5df27b1..bd41836 100644 --- a/cross/crosschroot-stable.conf +++ b/cross/crosschroot-stable.conf @@ -1,4 +1,4 @@ -# Example multistrap configuration file for a lenny build chroot +# Example multistrap configuration file for a squeeze build chroot # Need to use cascading to select the toolchain for the cross arch. [General] diff --git a/debian/changelog b/debian/changelog index 7de1efa..8e344d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ multistrap (2.2.1) UNRELEASED; urgency=medium * Move to github * Switch example mirror in usage information. (Closes: #774476) + * Update for Jessie release -- Neil Williams Sun, 12 Apr 2015 18:15:30 +0100 diff --git a/examples/multistrap-example.conf b/examples/multistrap-example.conf index 10e9c90..c52908c 100644 --- a/examples/multistrap-example.conf +++ b/examples/multistrap-example.conf @@ -1,5 +1,5 @@ # Example multistrap configuration file -# to create a plain Debian lenny bootstrap for amd64 +# to create a plain Debian stable bootstrap for amd64 [General] arch=amd64 diff --git a/examples/stretch.conf b/examples/stretch.conf new file mode 100644 index 0000000..02b3eeb --- /dev/null +++ b/examples/stretch.conf @@ -0,0 +1,27 @@ +# Example multistrap configuration file for the squeeze 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 bootstrap 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 bootstrap option determines which repository +# is used to calculate the list of Priority: required packages. +bootstrap=Debian +aptsources=Debian + +[Debian] +packages=apt +source=http://http.debian.net/debian +keyring=debian-archive-keyring +suite=stretch diff --git a/po/da.po b/po/da.po index 08f80a4..0aead43 100644 --- a/po/da.po +++ b/po/da.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: multistrap\n" "Report-Msgid-Bugs-To: multistrap@packages.debian.org\n" -"POT-Creation-Date: 2015-04-12 18:31+0100\n" +"POT-Creation-Date: 2015-04-12 18:55+0100\n" "PO-Revision-Date: 2012-04-21 17:30+01:00\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" diff --git a/po/de.po b/po/de.po index 395bd93..23a4b25 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: multistrap 2.1.18\n" "Report-Msgid-Bugs-To: multistrap@packages.debian.org\n" -"POT-Creation-Date: 2015-04-12 18:31+0100\n" +"POT-Creation-Date: 2015-04-12 18:55+0100\n" "PO-Revision-Date: 2012-04-23 19:41+0200\n" "Last-Translator: Chris Leick \n" "Language-Team: German \n" diff --git a/po/fr.po b/po/fr.po index d77ff4d..d60d2ab 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: multistrap\n" "Report-Msgid-Bugs-To: multistrap@packages.debian.org\n" -"POT-Creation-Date: 2015-04-12 18:31+0100\n" +"POT-Creation-Date: 2015-04-12 18:55+0100\n" "PO-Revision-Date: 2012-04-24 11:21+0100\n" "Last-Translator: Julien Patriarca \n" "Language-Team: French \n" diff --git a/po/multistrap.pot b/po/multistrap.pot index fd63684..ffcc790 100644 --- a/po/multistrap.pot +++ b/po/multistrap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: multistrap@packages.debian.org\n" -"POT-Creation-Date: 2015-04-12 18:31+0100\n" +"POT-Creation-Date: 2015-04-12 18:55+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/pt.po b/po/pt.po index 4a3cfe2..b09bc32 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: multistrap 2.1.16\n" "Report-Msgid-Bugs-To: multistrap@packages.debian.org\n" -"POT-Creation-Date: 2015-04-12 18:31+0100\n" +"POT-Creation-Date: 2015-04-12 18:55+0100\n" "PO-Revision-Date: 2011-08-25 23:20+0100\n" "Last-Translator: Pedro Ribeiro \n" "Language-Team: Portuguese \n" diff --git a/po/vi.po b/po/vi.po index 85c5b26..0d223f2 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: multistrap 2.1.7\n" "Report-Msgid-Bugs-To: multistrap@packages.debian.org\n" -"POT-Creation-Date: 2015-04-12 18:31+0100\n" +"POT-Creation-Date: 2015-04-12 18:55+0100\n" "PO-Revision-Date: 2010-09-29 19:59+0930\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" diff --git a/pod/multistrap b/pod/multistrap index b511fa5..f3be555 100644 --- a/pod/multistrap +++ b/pod/multistrap @@ -89,11 +89,11 @@ Example configuration: packages= source=http://ftp.uk.debian.org/debian keyring=debian-archive-keyring - suite=lenny + suite=jessie -This will result in a completely normal bootstrap of Debian lenny from +This will result in a completely normal bootstrap of Debian Jessie from the specified mirror, for armel in '/opt/multistrap/'. (This configuration -is retained in the package as F) +is retained in the package as F) Specify a package to extend the multistrap to include that package and all dependencies of that package. @@ -220,7 +220,7 @@ other than comments. Values must all on the same line as the key. packages= source=http://ftp.uk.debian.org/debian keyring=debian-archive-keyring - suite=lenny + suite=jessie The section name (in [] brackets) needs to be unique for this configuration file and any configuration files which this file @@ -238,15 +238,15 @@ each group under 'bootstrap'. [base] packages=udev mtd-utils - source=http://www.emdebian.org/grip - keyring=emdebian-archive-keyring - suite=lenny + source=http://http.debian.net/debian + keyring=debian-archive-keyring + suite=jessie [networking] packages=netbase ifupdown iproute net-tools samba - source=http://www.emdebian.org/grip - keyring=emdebian-archive-keyring - suite=lenny + source=http://http.debian.net/debian + keyring=debian-archive-keyring + suite=jessie As a special case, C also supports multiple packages keys per section, one line for each. Other keys cannot be repeated in this @@ -255,9 +255,9 @@ manner. [Emdebian] packages=udev mtd-utils netbase ifupdown iproute packages=busybox net-tools samba - source=http://www.emdebian.org/grip - keyring=emdebian-archive-keyring - suite=lenny + source=http://http.debian.net/debian + keyring=debian-archive-keyring + suite=jessie '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, @@ -273,7 +273,7 @@ option must be set to B. See Secure Apt. be the suite, not the codename. Suites change from time to time: (oldstable, stable, testing, sid) -The codename (etch, lenny, squeeze, sid) does not change. +The codename (squeeze, wheezy, jessie, sid) does not change. =head1 Secure Apt @@ -606,19 +606,6 @@ complete set of dependencies. In this situation, being explicit about one package selection may require being explicit about some (not necessarily all) of the dependencies of that package as well. -When using this support in Lenny, ensure that each section uses the -suite (oldstable, stable, testing, sid) and B the codename -(etch, lenny, squeeze, sid) in the C configuration item -as the version of apt in Lenny and previous cannot use the codename. - -To test, on Lenny, try: - - $ sudo apt-get install apt/stable - -Compare with - - $ sudo apt-get install apt/lenny - When using explicitsuite, take care in using stable-proposed-updates or other temporary locations - if the package migrates into another suite and is removed from the temporary suite (as with