[pbuilder] 01/02: Switch the default mirror from httpredir.debian.org to deb.debian.org
Mattia Rizzolo
mattia at debian.org
Fri Oct 27 21:07:30 UTC 2017
This is an automated email from the git hooks/post-receive script.
mattia pushed a commit to branch master
in repository pbuilder.
commit a9dd69854b83c2da72b8b1b891946a1bbb0396a2
Author: Mattia Rizzolo <mattia at debian.org>
Date: Fri Oct 27 23:05:47 2017 +0200
Switch the default mirror from httpredir.debian.org to deb.debian.org
Thanks: Unit193 <unit193 at ubuntu.com> for the patch
Signed-off-by: Mattia Rizzolo <mattia at debian.org>
---
debian/pbuilder.config | 2 +-
debian/pbuilder.templates | 2 +-
debian/po/ca.po | 4 ++--
debian/po/cs.po | 4 ++--
debian/po/da.po | 4 ++--
debian/po/de.po | 4 ++--
debian/po/es.po | 4 ++--
debian/po/eu.po | 4 ++--
debian/po/fi.po | 4 ++--
debian/po/fr.po | 4 ++--
debian/po/gl.po | 4 ++--
debian/po/it.po | 4 ++--
debian/po/ja.po | 4 ++--
debian/po/nl.po | 2 +-
debian/po/pt.po | 4 ++--
debian/po/pt_BR.po | 4 ++--
debian/po/ro.po | 4 ++--
debian/po/ru.po | 4 ++--
debian/po/sk.po | 4 ++--
debian/po/sr.po | 4 ++--
debian/po/sr at latin.po | 4 ++--
debian/po/sv.po | 4 ++--
debian/po/templates.pot | 2 +-
debian/po/tr.po | 2 +-
debian/rules | 8 ++++----
pbuilderrc | 2 +-
26 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/debian/pbuilder.config b/debian/pbuilder.config
index 2916a50..3da63e9 100755
--- a/debian/pbuilder.config
+++ b/debian/pbuilder.config
@@ -68,7 +68,7 @@ EOF
# if the interface is non-interactive, still set a valid mirror
if [ $RETCODE = 30 ] ; then
- MIRRORSITE="http://httpredir.debian.org/debian"
+ MIRRORSITE="http://deb.debian.org/debian"
else
db_get pbuilder/mirrorsite
MIRRORSITE="$RET"
diff --git a/debian/pbuilder.templates b/debian/pbuilder.templates
index 90f6eba..a48eab3 100644
--- a/debian/pbuilder.templates
+++ b/debian/pbuilder.templates
@@ -7,7 +7,7 @@ _Description: Default mirror site:
this information. If this attempt fails, you will be prompted again
to insert some valid mirror information.
.
- Here is a valid mirror example: http://httpredir.debian.org/debian
+ Here is a valid mirror example: http://deb.debian.org/debian
Template: pbuilder/nomirror
Type: error
diff --git a/debian/po/ca.po b/debian/po/ca.po
index dd4eaf3..0a28e79 100644
--- a/debian/po/ca.po
+++ b/debian/po/ca.po
@@ -45,8 +45,8 @@ msgstr ""
#. Type: string
#. Description
#: ../pbuilder.templates:1001
-msgid "Here is a valid mirror example: http://httpredir.debian.org/debian"
-msgstr "Un exemple de rèplica vàlida seria: http://httpredir.debian.org/debian"
+msgid "Here is a valid mirror example: http://deb.debian.org/debian"
+msgstr "Un exemple de rèplica vàlida seria: http://deb.debian.org/debian"
#. Type: error
#. Description
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 68368b5..38850dc 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -42,8 +42,8 @@ msgstr ""
#. Type: string
#. Description
#: ../pbuilder.templates:1001
-msgid "Here is a valid mirror example: http://httpredir.debian.org/debian"
-msgstr "Příklad platného zrcadla: http://httpredir.debian.org/debian"
+msgid "Here is a valid mirror example: http://deb.debian.org/debian"
+msgstr "Příklad platného zrcadla: http://deb.debian.org/debian"
#. Type: error
#. Description
diff --git a/debian/po/da.po b/debian/po/da.po
index f8e4938..9568a60 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -43,8 +43,8 @@ msgstr ""
#. Type: string
#. Description
#: ../pbuilder.templates:1001
-msgid "Here is a valid mirror example: http://httpredir.debian.org/debian"
-msgstr "Her er et gyldigt spejleksempel: http://httpredir.debian.org/debian"
+msgid "Here is a valid mirror example: http://deb.debian.org/debian"
+msgstr "Her er et gyldigt spejleksempel: http://deb.debian.org/debian"
#. Type: error
#. Description
diff --git a/debian/po/de.po b/debian/po/de.po
index ad50f4f..1d2abb1 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -43,9 +43,9 @@ msgstr ""
#. Type: string
#. Description
#: ../pbuilder.templates:1001
-msgid "Here is a valid mirror example: http://httpredir.debian.org/debian"
+msgid "Here is a valid mirror example: http://deb.debian.org/debian"
msgstr ""
-"Ein Beispiel f�r einen g�ltigen Spiegelserver: http://httpredir.debian.org/"
+"Ein Beispiel f�r einen g�ltigen Spiegelserver: http://deb.debian.org/"
"debian"
#. Type: error
diff --git a/debian/po/es.po b/debian/po/es.po
index 15da46a..464176f 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -61,8 +61,8 @@ msgstr ""
#. Type: string
#. Description
#: ../pbuilder.templates:1001
-msgid "Here is a valid mirror example: http://httpredir.debian.org/debian"
-msgstr "He aquí un ejemplo de una réplica válida: http://httpredir.debian.org/debian"
+msgid "Here is a valid mirror example: http://deb.debian.org/debian"
+msgstr "He aquí un ejemplo de una réplica válida: http://deb.debian.org/debian"
#. Type: error
#. Description
diff --git a/debian/po/eu.po b/debian/po/eu.po
index f509566..deb72af 100644
--- a/debian/po/eu.po
+++ b/debian/po/eu.po
@@ -45,9 +45,9 @@ msgstr ""
#. Type: string
#. Description
#: ../pbuilder.templates:1001
-msgid "Here is a valid mirror example: http://httpredir.debian.org/debian"
+msgid "Here is a valid mirror example: http://deb.debian.org/debian"
msgstr ""
-"Hau da baliozko ispilu baten adibidea: http://httpredir.debian.org/debian"
+"Hau da baliozko ispilu baten adibidea: http://deb.debian.org/debian"
#. Type: error
#. Description
diff --git a/debian/po/fi.po b/debian/po/fi.po
index fcc3a62..b5e9699 100644
--- a/debian/po/fi.po
+++ b/debian/po/fi.po
@@ -40,8 +40,8 @@ msgstr ""
#. Type: string
#. Description
#: ../pbuilder.templates:1001
-msgid "Here is a valid mirror example: http://httpredir.debian.org/debian"
-msgstr "Esimerkki kelvollisesta peilistä: http://httpredir.debian.org/debian"
+msgid "Here is a valid mirror example: http://deb.debian.org/debian"
+msgstr "Esimerkki kelvollisesta peilistä: http://deb.debian.org/debian"
#. Type: error
#. Description
diff --git a/debian/po/fr.po b/debian/po/fr.po
index dfd8924..0cc4ccf 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -44,8 +44,8 @@ msgstr ""
#. Type: string
#. Description
#: ../pbuilder.templates:1001
-msgid "Here is a valid mirror example: http://httpredir.debian.org/debian"
-msgstr "Exemple de miroir valable : http://httpredir.debian.org/debian"
+msgid "Here is a valid mirror example: http://deb.debian.org/debian"
+msgstr "Exemple de miroir valable : http://deb.debian.org/debian"
#. Type: error
#. Description
diff --git a/debian/po/gl.po b/debian/po/gl.po
index d0fd89e..1d530fb 100644
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
@@ -42,9 +42,9 @@ msgstr ""
#. Type: string
#. Description
#: ../pbuilder.templates:1001
-msgid "Here is a valid mirror example: http://httpredir.debian.org/debian"
+msgid "Here is a valid mirror example: http://deb.debian.org/debian"
msgstr ""
-"Velaquí un exemplo dunha réplica válida: http://httpredir.debian.org/debian"
+"Velaquí un exemplo dunha réplica válida: http://deb.debian.org/debian"
#. Type: error
#. Description
diff --git a/debian/po/it.po b/debian/po/it.po
index c8d5276..b0cbb21 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -45,8 +45,8 @@ msgstr ""
#. Type: string
#. Description
#: ../pbuilder.templates:1001
-msgid "Here is a valid mirror example: http://httpredir.debian.org/debian"
-msgstr "Ecco un esempio di mirror valido: http://httpredir.debian.org/debian"
+msgid "Here is a valid mirror example: http://deb.debian.org/debian"
+msgstr "Ecco un esempio di mirror valido: http://deb.debian.org/debian"
#. Type: error
#. Description
diff --git a/debian/po/ja.po b/debian/po/ja.po
index 025128d..e843528 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -43,8 +43,8 @@ msgstr ""
#. Type: string
#. Description
#: ../pbuilder.templates:1001
-msgid "Here is a valid mirror example: http://httpredir.debian.org/debian"
-msgstr "正しいミラーの例としては： http://httpredir.debian.org/debian"
+msgid "Here is a valid mirror example: http://deb.debian.org/debian"
+msgstr "正しいミラーの例としては： http://deb.debian.org/debian"
#. Type: error
#. Description
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 6cc68d1..c00df93 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -43,7 +43,7 @@ msgstr ""
#. Type: string
#. Description
#: ../pbuilder.templates:1001
-msgid "Here is a valid mirror example: http://httpredir.debian.org/debian"
+msgid "Here is a valid mirror example: http://deb.debian.org/debian"
msgstr ""
"Dit is een geldig voorbeeld van een spiegelserver: http://cdn.debian.net/"
"debian"
diff --git a/debian/po/pt.po b/debian/po/pt.po
index 7fe4d10..83745c3 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -46,9 +46,9 @@ msgstr ""
#. Type: string
#. Description
#: ../pbuilder.templates:1001
-msgid "Here is a valid mirror example: http://httpredir.debian.org/debian"
+msgid "Here is a valid mirror example: http://deb.debian.org/debian"
msgstr ""
-"Aqui está um exemplo de mirror válido: http://httpredir.debian.org/debian"
+"Aqui está um exemplo de mirror válido: http://deb.debian.org/debian"
#. Type: error
#. Description
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index 840ec4c..4e869f1 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -47,9 +47,9 @@ msgstr ""
#. Type: string
#. Description
#: ../pbuilder.templates:1001
-msgid "Here is a valid mirror example: http://httpredir.debian.org/debian"
+msgid "Here is a valid mirror example: http://deb.debian.org/debian"
msgstr ""
-"Este é um exemplo válido de espelho de rede: http://httpredir.debian.org/debian"
+"Este é um exemplo válido de espelho de rede: http://deb.debian.org/debian"
#. Type: error
#. Description
diff --git a/debian/po/ro.po b/debian/po/ro.po
index ecc53b5..7a7e42c 100644
--- a/debian/po/ro.po
+++ b/debian/po/ro.po
@@ -49,9 +49,9 @@ msgstr ""
#. Type: string
#. Description
#: ../pbuilder.templates:1001
-msgid "Here is a valid mirror example: http://httpredir.debian.org/debian"
+msgid "Here is a valid mirror example: http://deb.debian.org/debian"
msgstr ""
-"Iată un exemplu valid de sait-oglindă: http://httpredir.debian.org/debian"
+"Iată un exemplu valid de sait-oglindă: http://deb.debian.org/debian"
#. Type: error
#. Description
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 1c9c299..54ec572 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -47,8 +47,8 @@ msgstr ""
#. Type: string
#. Description
#: ../pbuilder.templates:1001
-msgid "Here is a valid mirror example: http://httpredir.debian.org/debian"
-msgstr "Пример задания сервера-зеркала: http://httpredir.debian.org/debian"
+msgid "Here is a valid mirror example: http://deb.debian.org/debian"
+msgstr "Пример задания сервера-зеркала: http://deb.debian.org/debian"
#. Type: error
#. Description
diff --git a/debian/po/sk.po b/debian/po/sk.po
index b8a06f0..6b6ba8f 100644
--- a/debian/po/sk.po
+++ b/debian/po/sk.po
@@ -47,8 +47,8 @@ msgstr ""
#. Type: string
#. Description
#: ../pbuilder.templates:1001
-msgid "Here is a valid mirror example: http://httpredir.debian.org/debian"
-msgstr "Tu je príklad platného zrkadla: http://httpredir.debian.org/debian"
+msgid "Here is a valid mirror example: http://deb.debian.org/debian"
+msgstr "Tu je príklad platného zrkadla: http://deb.debian.org/debian"
#. Type: error
#. Description
diff --git a/debian/po/sr.po b/debian/po/sr.po
index 8f1d8a9..40f2339 100644
--- a/debian/po/sr.po
+++ b/debian/po/sr.po
@@ -44,9 +44,9 @@ msgstr ""
#. Type: string
#. Description
#: ../pbuilder.templates:1001
-msgid "Here is a valid mirror example: http://httpredir.debian.org/debian"
+msgid "Here is a valid mirror example: http://deb.debian.org/debian"
msgstr ""
-"Овдје је примјер валидне интернет локације: http://httpredir.debian.org/"
+"Овдје је примјер валидне интернет локације: http://deb.debian.org/"
"debian"
#. Type: error
diff --git a/debian/po/sr at latin.po b/debian/po/sr at latin.po
index cdf0988..58b8e49 100644
--- a/debian/po/sr at latin.po
+++ b/debian/po/sr at latin.po
@@ -44,9 +44,9 @@ msgstr ""
#. Type: string
#. Description
#: ../pbuilder.templates:1001
-msgid "Here is a valid mirror example: http://httpredir.debian.org/debian"
+msgid "Here is a valid mirror example: http://deb.debian.org/debian"
msgstr ""
-"Ovdje je primjer validne internet lokacije: http://httpredir.debian.org/"
+"Ovdje je primjer validne internet lokacije: http://deb.debian.org/"
"debian"
#. Type: error
diff --git a/debian/po/sv.po b/debian/po/sv.po
index 6bd76d6..900d94d 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -44,9 +44,9 @@ msgstr ""
#. Type: string
#. Description
#: ../pbuilder.templates:1001
-msgid "Here is a valid mirror example: http://httpredir.debian.org/debian"
+msgid "Here is a valid mirror example: http://deb.debian.org/debian"
msgstr ""
-"Exempelvis kan denna spegel användas: http://httpredir.debian.org/debian"
+"Exempelvis kan denna spegel användas: http://deb.debian.org/debian"
#. Type: error
#. Description
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index a3b4442..a2e93fc 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -40,7 +40,7 @@ msgstr ""
#. Type: string
#. Description
#: ../pbuilder.templates:1001
-msgid "Here is a valid mirror example: http://httpredir.debian.org/debian"
+msgid "Here is a valid mirror example: http://deb.debian.org/debian"
msgstr ""
#. Type: error
diff --git a/debian/po/tr.po b/debian/po/tr.po
index 4fc59f5..83b5707 100644
--- a/debian/po/tr.po
+++ b/debian/po/tr.po
@@ -46,7 +46,7 @@ msgstr ""
#. Type: string
#. Description
#: ../pbuilder.templates:1001
-msgid "Here is a valid mirror example: http://httpredir.debian.org/debian"
+msgid "Here is a valid mirror example: http://deb.debian.org/debian"
msgstr "Geçerli bir yansı örneği şu şekildedir: http://http.debian.net/debian"
#. Type: error
diff --git a/debian/rules b/debian/rules
index 4806877..ecd98b0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,10 +8,10 @@ override_dh_clean:
ifneq ($(shell dpkg-vendor --derives-from ubuntu && echo true),true)
debconf-updatepo
else
- sed "s#http://httpredir.debian.org/debian#http://archive.ubuntu.com/ubuntu#g" -i debian/po/* -r
- sed "s#http://httpredir.debian.org/debian#http://archive.ubuntu.com/ubuntu#g" -i debian/pbuilder.templates
- sed "s#http://httpredir.debian.org/debian#http://archive.ubuntu.com/ubuntu#g" -i debian/pbuilder.config
- sed "s#http://httpredir.debian.org/debian#http://archive.ubuntu.com/ubuntu#g" -i pbuilderrc
+ sed "s#http://deb.debian.org/debian#http://archive.ubuntu.com/ubuntu#g" -i debian/po/* -r
+ sed "s#http://deb.debian.org/debian#http://archive.ubuntu.com/ubuntu#g" -i debian/pbuilder.templates
+ sed "s#http://deb.debian.org/debian#http://archive.ubuntu.com/ubuntu#g" -i debian/pbuilder.config
+ sed "s#http://deb.debian.org/debian#http://archive.ubuntu.com/ubuntu#g" -i pbuilderrc
sed "s/#DISTRIBUTION=sid/DISTRIBUTION=bionic/" -i pbuilderrc
sed 's/COMPONENTS="main"/COMPONENTS="main universe"/' -i pbuilderrc
endif
diff --git a/pbuilderrc b/pbuilderrc
index 86cd4b7..df139c1 100644
--- a/pbuilderrc
+++ b/pbuilderrc
@@ -24,7 +24,7 @@ BUILDDIR=/build
# Debian buildds too. You can set it to $BUILDDIR to get a working HOME, if
# you need to.
BUILD_HOME=/nonexistent
-MIRRORSITE=http://httpredir.debian.org/debian
+MIRRORSITE=http://deb.debian.org/debian
#OTHERMIRROR="deb http://www.home.com/updates/ ./"
#export http_proxy=http://your-proxy:8080/
USESHM=yes
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pbuilder/pbuilder.git
More information about the Pbuilder-maint
mailing list