From b6308896b42ca48d8f2bcbbe834c5f9399690293 Mon Sep 17 00:00:00 2001 From: Neil Williams Date: Sun, 12 Apr 2015 18:35:15 +0100 Subject: [PATCH] Switch example mirror in usage information. (Closes: #774476) --- cross/armel.conf | 2 +- cross/buildchroot-stable.conf | 2 +- cross/buildchroot-testing.conf | 2 +- cross/buildchroot.conf | 2 +- cross/crosschroot-stable.conf | 4 ++-- cross/crosschroot-testing.conf | 4 ++-- cross/crosschroot.conf | 4 ++-- cross/mips.conf | 2 +- cross/mipsel.conf | 2 +- cross/powerpc.conf | 2 +- cross/sparc.conf | 2 +- debian/changelog | 1 + examples/chroot.conf | 2 +- examples/full.conf | 4 ++-- examples/jessie.conf | 2 +- examples/multiarch.conf | 4 ++-- examples/multistrap-example.conf | 2 +- examples/sid.conf | 2 +- examples/squeeze.conf | 2 +- examples/wheezy.conf | 2 +- multistrap | 2 +- po/da.po | 8 ++++---- po/de.po | 8 ++++---- po/fr.po | 8 ++++---- po/multistrap.pot | 4 ++-- po/pt.po | 6 +++--- po/vi.po | 4 ++-- 27 files changed, 45 insertions(+), 44 deletions(-) diff --git a/cross/armel.conf b/cross/armel.conf index 031e942..b941b4a 100644 --- a/cross/armel.conf +++ b/cross/armel.conf @@ -16,7 +16,7 @@ suite=squeeze [Foreign] packages= -source=http://cdn.debian.net/debian +source=http://http.debian.net/debian keyring=debian-archive-keyring suite=unstable architecture=armel diff --git a/cross/buildchroot-stable.conf b/cross/buildchroot-stable.conf index f8abaa0..5cb2e05 100644 --- a/cross/buildchroot-stable.conf +++ b/cross/buildchroot-stable.conf @@ -23,7 +23,7 @@ aptsources=Base [Base] packages=apt build-essential fakeroot -source=http://cdn.debian.net/debian +source=http://http.debian.net/debian keyring=debian-archive-keyring suite=stable omitdebsrc=false diff --git a/cross/buildchroot-testing.conf b/cross/buildchroot-testing.conf index 6289449..61af8af 100644 --- a/cross/buildchroot-testing.conf +++ b/cross/buildchroot-testing.conf @@ -23,7 +23,7 @@ aptsources=Debian [Debian] packages=apt build-essential fakeroot -source=http://cdn.debian.net/debian +source=http://http.debian.net/debian keyring=debian-archive-keyring suite=testing omitdebsrc=false diff --git a/cross/buildchroot.conf b/cross/buildchroot.conf index f824857..a956efa 100644 --- a/cross/buildchroot.conf +++ b/cross/buildchroot.conf @@ -22,7 +22,7 @@ aptsources=Debian [Debian] packages=apt build-essential fakeroot -source=http://cdn.debian.net/debian +source=http://http.debian.net/debian keyring=debian-archive-keyring suite=unstable omitdebsrc=false diff --git a/cross/crosschroot-stable.conf b/cross/crosschroot-stable.conf index 53915b2..5df27b1 100644 --- a/cross/crosschroot-stable.conf +++ b/cross/crosschroot-stable.conf @@ -24,14 +24,14 @@ aptsources=Base Build # Squeeze toolchains need -base from Squeeze. [Base] packages=gcc-4.4-base -source=http://cdn.debian.net/debian +source=http://http.debian.net/debian keyring=debian-archive-keyring suite=squeeze omitdebsrc=false [Build] packages=dpkg-dev binutils-multiarch build-essential dpkg-cross aptitude -source=http://cdn.debian.net/debian +source=http://http.debian.net/debian keyring=debian-archive-keyring suite=squeeze omitdebsrc=false diff --git a/cross/crosschroot-testing.conf b/cross/crosschroot-testing.conf index 90ca4db..cb34f4a 100644 --- a/cross/crosschroot-testing.conf +++ b/cross/crosschroot-testing.conf @@ -24,14 +24,14 @@ aptsources=Debian Base # Squeeze toolchains need -base from Squeeze. [Base] packages=gcc-4.4-base -source=http://cdn.debian.net/debian +source=http://http.debian.net/debian keyring=debian-archive-keyring suite=squeeze omitdebsrc=false [Debian] packages=dpkg-dev binutils-multiarch build-essential dpkg-cross aptitude -source=http://cdn.debian.net/debian +source=http://http.debian.net/debian keyring=debian-archive-keyring suite=testing omitdebsrc=false diff --git a/cross/crosschroot.conf b/cross/crosschroot.conf index e62a6f7..478422e 100644 --- a/cross/crosschroot.conf +++ b/cross/crosschroot.conf @@ -24,14 +24,14 @@ aptsources=Debian Base # Squeeze toolchains need -base from Squeeze. [Base] packages=gcc-4.4-base -source=http://cdn.debian.net/debian +source=http://http.debian.net/debian keyring=debian-archive-keyring suite=squeeze omitdebsrc=false [Debian] packages=dpkg-dev binutils-multiarch build-essential dpkg-cross aptitude -source=http://cdn.debian.net/debian +source=http://http.debian.net/debian keyring=debian-archive-keyring suite=unstable omitdebsrc=false diff --git a/cross/mips.conf b/cross/mips.conf index 58d824a..c5f378b 100644 --- a/cross/mips.conf +++ b/cross/mips.conf @@ -16,7 +16,7 @@ suite=squeeze [Foreign] packages= -source=http://cdn.debian.net/debian +source=http://http.debian.net/debian keyring=debian-archive-keyring suite=unstable architecture=mips diff --git a/cross/mipsel.conf b/cross/mipsel.conf index 71db309..6a70c02 100644 --- a/cross/mipsel.conf +++ b/cross/mipsel.conf @@ -16,7 +16,7 @@ suite=squeeze [Foreign] packages= -source=http://cdn.debian.net/debian +source=http://http.debian.net/debian keyring=debian-archive-keyring suite=unstable architecture=mipsel diff --git a/cross/powerpc.conf b/cross/powerpc.conf index 655f129..e36a586 100644 --- a/cross/powerpc.conf +++ b/cross/powerpc.conf @@ -16,7 +16,7 @@ suite=squeeze [Foreign] packages= -source=http://cdn.debian.net/debian +source=http://http.debian.net/debian keyring=debian-archive-keyring suite=unstable architecture=powerpc diff --git a/cross/sparc.conf b/cross/sparc.conf index 6db0eda..eec07f7 100644 --- a/cross/sparc.conf +++ b/cross/sparc.conf @@ -16,7 +16,7 @@ suite=squeeze [Foreign] packages= -source=http://cdn.debian.net/debian +source=http://http.debian.net/debian keyring=debian-archive-keyring suite=unstable architecture=sparc diff --git a/debian/changelog b/debian/changelog index ae77701..7de1efa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ multistrap (2.2.1) UNRELEASED; urgency=medium * Move to github + * Switch example mirror in usage information. (Closes: #774476) -- Neil Williams Sun, 12 Apr 2015 18:15:30 +0100 diff --git a/examples/chroot.conf b/examples/chroot.conf index 2956d3a..3313930 100644 --- a/examples/chroot.conf +++ b/examples/chroot.conf @@ -25,6 +25,6 @@ aptsources=Debian [Debian] packages=apt -source=http://cdn.debian.net/debian +source=http://http.debian.net/debian keyring=debian-archive-keyring suite=squeeze diff --git a/examples/full.conf b/examples/full.conf index fbee13e..2e66c89 100644 --- a/examples/full.conf +++ b/examples/full.conf @@ -64,7 +64,7 @@ aptsources=Debian [Debian] packages=apt -source=http://cdn.debian.net/debian +source=http://http.debian.net/debian keyring=debian-archive-keyring suite=wheezy omitdebsrc=false @@ -75,6 +75,6 @@ components=main [Foreign] packages=libgcc1 libc6 architecture=armel -source=http://cdn.debian.net/debian +source=http://http.debian.net/debian keyring=debian-archive-keyring suite=sid diff --git a/examples/jessie.conf b/examples/jessie.conf index 3cdcca8..4af59be 100644 --- a/examples/jessie.conf +++ b/examples/jessie.conf @@ -22,6 +22,6 @@ aptsources=Debian [Debian] packages=apt -source=http://cdn.debian.net/debian +source=http://http.debian.net/debian keyring=debian-archive-keyring suite=jessie diff --git a/examples/multiarch.conf b/examples/multiarch.conf index dfa7fd5..01267a0 100644 --- a/examples/multiarch.conf +++ b/examples/multiarch.conf @@ -24,7 +24,7 @@ aptsources=Debian [Debian] packages=apt -source=http://cdn.debian.net/debian +source=http://http.debian.net/debian keyring=debian-archive-keyring suite=wheezy @@ -32,7 +32,7 @@ suite=wheezy packages=libgcc1 packages=libc6 architecture=armel -source=http://cdn.debian.net/debian +source=http://http.debian.net/debian keyring=debian-archive-keyring suite=wheezy diff --git a/examples/multistrap-example.conf b/examples/multistrap-example.conf index 4127627..10e9c90 100644 --- a/examples/multistrap-example.conf +++ b/examples/multistrap-example.conf @@ -23,7 +23,7 @@ aptsources=Debian [Debian] packages= -source=http://cdn.debian.net/debian +source=http://http.debian.net/debian keyring=debian-archive-keyring suite=stable omitdebsrc=false diff --git a/examples/sid.conf b/examples/sid.conf index 28880ba..e7e1f9d 100644 --- a/examples/sid.conf +++ b/examples/sid.conf @@ -22,6 +22,6 @@ aptsources=Debian [Debian] packages=apt -source=http://cdn.debian.net/debian +source=http://http.debian.net/debian keyring=debian-archive-keyring suite=sid diff --git a/examples/squeeze.conf b/examples/squeeze.conf index 6d3d3dc..d2138ec 100644 --- a/examples/squeeze.conf +++ b/examples/squeeze.conf @@ -22,6 +22,6 @@ aptsources=Debian [Debian] packages=apt -source=http://cdn.debian.net/debian +source=http://http.debian.net/debian keyring=debian-archive-keyring suite=squeeze diff --git a/examples/wheezy.conf b/examples/wheezy.conf index 935ea4e..bbf5adf 100644 --- a/examples/wheezy.conf +++ b/examples/wheezy.conf @@ -22,6 +22,6 @@ aptsources=Debian [Debian] packages=apt -source=http://cdn.debian.net/debian +source=http://http.debian.net/debian keyring=debian-archive-keyring suite=wheezy diff --git a/multistrap b/multistrap index 6f81fd5..6093e6e 100755 --- a/multistrap +++ b/multistrap @@ -1107,7 +1107,7 @@ bootstrap=Debian [Debian] packages= -source=http://cdn.debian.net/debian +source=http://http.debian.net/debian keyring=debian-archive-keyring suite=stable diff --git a/po/da.po b/po/da.po index 80d969f..08f80a4 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: 2013-07-27 15:57+0100\n" +"POT-Creation-Date: 2015-04-12 18:31+0100\n" "PO-Revision-Date: 2012-04-21 17:30+01:00\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" @@ -454,7 +454,7 @@ msgid "cannot open /etc/apt/sources.list.d/%s %s" msgstr "kan ikke åbne /etc/apt/sources.list.d/%s %s" #: ../multistrap:1060 -#, perl-format +#, fuzzy, perl-format msgid "" "\n" "%s version %s\n" @@ -507,7 +507,7 @@ msgid "" "\n" "[Debian]\n" "packages=\n" -"source=http://cdn.debian.net/debian\n" +"source=http://http.debian.net/debian\n" "keyring=debian-archive-keyring\n" "suite=stable\n" "\n" @@ -576,7 +576,7 @@ msgstr "" "\n" "[Debian]\n" "packages=\n" -"source=http://cdn.debian.net/debian\n" +"source=http://http.debian.net/debian\n" "keyring=debian-archive-keyring\n" "suite=stable\n" "\n" diff --git a/po/de.po b/po/de.po index 2c2779d..395bd93 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: 2013-07-27 15:57+0100\n" +"POT-Creation-Date: 2015-04-12 18:31+0100\n" "PO-Revision-Date: 2012-04-23 19:41+0200\n" "Last-Translator: Chris Leick \n" "Language-Team: German \n" @@ -463,7 +463,7 @@ msgstr "/etc/apt/sources.list.d/%s kann nicht geöffnet werden. %s" # Secure Apt ist feststehender Begriff #: ../multistrap:1060 -#, perl-format +#, fuzzy, perl-format msgid "" "\n" "%s version %s\n" @@ -516,7 +516,7 @@ msgid "" "\n" "[Debian]\n" "packages=\n" -"source=http://cdn.debian.net/debian\n" +"source=http://http.debian.net/debian\n" "keyring=debian-archive-keyring\n" "suite=stable\n" "\n" @@ -592,7 +592,7 @@ msgstr "" "\n" "[Debian]\n" "packages=\n" -"source=http://cdn.debian.net/debian\n" +"source=http://http.debian.net/debian\n" "keyring=debian-archive-keyring\n" "suite=stable\n" "\n" diff --git a/po/fr.po b/po/fr.po index 1fda4e6..d77ff4d 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: 2013-07-27 15:57+0100\n" +"POT-Creation-Date: 2015-04-12 18:31+0100\n" "PO-Revision-Date: 2012-04-24 11:21+0100\n" "Last-Translator: Julien Patriarca \n" "Language-Team: French \n" @@ -468,7 +468,7 @@ msgid "cannot open /etc/apt/sources.list.d/%s %s" msgstr "Impossible d'accéder à /etc/apt/sources.list.d/%s %s" #: ../multistrap:1060 -#, perl-format +#, fuzzy, perl-format msgid "" "\n" "%s version %s\n" @@ -521,7 +521,7 @@ msgid "" "\n" "[Debian]\n" "packages=\n" -"source=http://cdn.debian.net/debian\n" +"source=http://http.debian.net/debian\n" "keyring=debian-archive-keyring\n" "suite=stable\n" "\n" @@ -597,7 +597,7 @@ msgstr "" "\n" "[Debian]\n" "packages=\n" -"source=http://cdn.debian.net/debian\n" +"source=http://http.debian.net/debian\n" "keyring=debian-archive-keyring\n" "suite=stable\n" "\n" diff --git a/po/multistrap.pot b/po/multistrap.pot index 150e0a5..fd63684 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: 2013-08-11 14:22+0100\n" +"POT-Creation-Date: 2015-04-12 18:31+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -475,7 +475,7 @@ msgid "" "\n" "[Debian]\n" "packages=\n" -"source=http://cdn.debian.net/debian\n" +"source=http://http.debian.net/debian\n" "keyring=debian-archive-keyring\n" "suite=stable\n" "\n" diff --git a/po/pt.po b/po/pt.po index 0eccf6b..4a3cfe2 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: 2013-07-27 15:57+0100\n" +"POT-Creation-Date: 2015-04-12 18:31+0100\n" "PO-Revision-Date: 2011-08-25 23:20+0100\n" "Last-Translator: Pedro Ribeiro \n" "Language-Team: Portuguese \n" @@ -458,7 +458,7 @@ msgid "cannot open /etc/apt/sources.list.d/%s %s" msgstr "impossível abrir /etc/apt/sources.list.d/%s %s" #: ../multistrap:1060 -#, perl-format +#, fuzzy, perl-format msgid "" "\n" "%s version %s\n" @@ -511,7 +511,7 @@ msgid "" "\n" "[Debian]\n" "packages=\n" -"source=http://cdn.debian.net/debian\n" +"source=http://http.debian.net/debian\n" "keyring=debian-archive-keyring\n" "suite=stable\n" "\n" diff --git a/po/vi.po b/po/vi.po index 3c77eee..85c5b26 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: 2013-07-27 15:57+0100\n" +"POT-Creation-Date: 2015-04-12 18:31+0100\n" "PO-Revision-Date: 2010-09-29 19:59+0930\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -503,7 +503,7 @@ msgid "" "\n" "[Debian]\n" "packages=\n" -"source=http://cdn.debian.net/debian\n" +"source=http://http.debian.net/debian\n" "keyring=debian-archive-keyring\n" "suite=stable\n" "\n"