[devscripts] 01/01: Switch from /org to /srv in paths on debian.org servers

[Paul Wise]

This is an automated email from the git hooks/post-receive script.

pabs pushed a commit to branch master
in repository devscripts.

commit b5c44104d445246c8707f6f631e2a80c757c6d59
Author: Paul Wise <pabs at debian.org>
Date:   Sat Jun 17 13:12:09 2017 +0800

    Switch from /org to /srv in paths on debian.org servers
    
    /org has been obsoleted by /srv many many years ago.
---
 debian/changelog       | 6 ++++++
 po4a/po/de.po          | 4 ++--
 po4a/po/devscripts.pot | 2 +-
 po4a/po/fr.po          | 4 ++--
 scripts/bts.pl         | 2 +-
 scripts/dscverify.1    | 2 +-
 scripts/dscverify.pl   | 2 +-
 scripts/rc-alert.pl    | 2 +-
 8 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0067413..059ea5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+devscripts (2.17.7) UNRELEASED; urgency=medium
+
+  * Switch from /org to /srv in paths on debian.org servers
+
+ -- Paul Wise <pabs at debian.org>  Sat, 17 Jun 2017 13:11:35 +0800
+
 devscripts (2.17.6) unstable; urgency=medium
 
   [ Osamu Aoki ]
diff --git a/po4a/po/de.po b/po4a/po/de.po
index db8c918..211d6e4 100644
--- a/po4a/po/de.po
+++ b/po4a/po/de.po
@@ -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
diff --git a/po4a/po/devscripts.pot b/po4a/po/devscripts.pot
index 798e1b9..c3678da 100644
--- a/po4a/po/devscripts.pot
+++ b/po4a/po/devscripts.pot
@@ -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
diff --git a/po4a/po/fr.po b/po4a/po/fr.po
index 2422e3d..b1f4623 100644
--- a/po4a/po/fr.po
+++ b/po4a/po/fr.po
@@ -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
diff --git a/scripts/bts.pl b/scripts/bts.pl
index a2a64c5..2468978 100755
--- a/scripts/bts.pl
+++ b/scripts/bts.pl
@@ -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",
diff --git a/scripts/dscverify.1 b/scripts/dscverify.1
index db49ad3..a0452f8 100644
--- a/scripts/dscverify.1
+++ b/scripts/dscverify.1
@@ -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
 
diff --git a/scripts/dscverify.pl b/scripts/dscverify.pl
index 45fb0eb..bc19c51 100755
--- a/scripts/dscverify.pl
+++ b/scripts/dscverify.pl
@@ -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));
diff --git a/scripts/rc-alert.pl b/scripts/rc-alert.pl
index 5fa4fff..bc6d724 100755
--- a/scripts/rc-alert.pl
+++ b/scripts/rc-alert.pl
@@ -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];

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git