Verified Commit b5c44104 authored by Paul Wise's avatar Paul Wise

Switch from /org to /srv in paths on debian.org servers

/org has been obsoleted by /srv many many years ago.
parent 1e3e827c
devscripts (2.17.7) UNRELEASED; urgency=medium
* Switch from /org to /srv in paths on debian.org servers
-- Paul Wise <pabs@debian.org> Sat, 17 Jun 2017 13:11:35 +0800
devscripts (2.17.6) unstable; urgency=medium
[ Osamu Aoki ]
......
......@@ -15447,8 +15447,8 @@ msgstr "- ~/.gnupg/trustedkeys.gpg"
#. type: Plain text
#: ../scripts/dscverify.1:72
msgid "- /org/keyring.debian.org/keyrings/debian-keyring.gpg"
msgstr "- /org/keyring.debian.org/keyrings/debian-keyring.gpg"
msgid "- /srv/keyring.debian.org/keyrings/debian-keyring.gpg"
msgstr "- /srv/keyring.debian.org/keyrings/debian-keyring.gpg"
#. type: Plain text
#: ../scripts/dscverify.1:74
......
......@@ -12052,7 +12052,7 @@ msgstr ""
#. type: Plain text
#: ../scripts/dscverify.1:72
msgid "- /org/keyring.debian.org/keyrings/debian-keyring.gpg"
msgid "- /srv/keyring.debian.org/keyrings/debian-keyring.gpg"
msgstr ""
#. type: Plain text
......
......@@ -15439,8 +15439,8 @@ msgstr "- ~/.gnupg/trustedkeys.gpg"
#. type: Plain text
#: ../scripts/dscverify.1:72
msgid "- /org/keyring.debian.org/keyrings/debian-keyring.gpg"
msgstr "- /org/keyring.debian.org/keyrings/debian-keyring.gpg"
msgid "- /srv/keyring.debian.org/keyrings/debian-keyring.gpg"
msgstr "- /srv/keyring.debian.org/keyrings/debian-keyring.gpg"
#. type: Plain text
#: ../scripts/dscverify.1:74
......
......@@ -153,7 +153,7 @@ $version = '2.9.6' if $version =~ /\#/; # for testing unconfigured version
my $new_cache_format_version = '2.9.6';
# The official list is mirrored
# bugs-mirror.debian.org:/org/bugs.debian.org/etc/config
# bugs-mirror.debian.org:/srv/bugs.debian.org/etc/config
# in the variable @gTags; we copy it verbatim here.
our (@gTags, @valid_tags, %valid_tags);
@gTags = ( "patch", "wontfix", "moreinfo", "unreproducible", "fixed",
......
......@@ -68,7 +68,7 @@ locations:
- ~/.gnupg/trustedkeys.gpg
- /org/keyring.debian.org/keyrings/debian-keyring.gpg
- /srv/keyring.debian.org/keyrings/debian-keyring.gpg
- /usr/share/keyrings/debian-keyring.gpg
......
......@@ -99,7 +99,7 @@ sub get_rings {
if (defined $ENV{HOME} && -r "$ENV{HOME}/.gnupg/trustedkeys.gpg") {
unshift(@keyrings, "$ENV{HOME}/.gnupg/trustedkeys.gpg");
}
unshift(@keyrings, '/org/keyring.debian.org/keyrings/debian-keyring.gpg');
unshift(@keyrings, '/srv/keyring.debian.org/keyrings/debian-keyring.gpg');
if (system('dpkg-vendor', '--derives-from', 'Ubuntu') == 0) {
unshift(@keyrings, qw(/usr/share/keyrings/ubuntu-master-keyring.gpg
/usr/share/keyrings/ubuntu-archive-keyring.gpg));
......
......@@ -435,7 +435,7 @@ sub human_dists($) {
}
}
# Reverse of master.debian.org:/org/bugs.debian.org/cgi-bin/common.pl
# Reverse of master.debian.org:/srv/bugs.debian.org/cgi-bin/common.pl
sub unhtmlsanit ($) {
my %saniarray = ('lt','<', 'gt','>', 'amp','&', 'quot', '"');
my $in = $_[0];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment