From: hertzog <hertzog@313b444b-1b9f-4f58-a734-7bb04f332e8d>
Date: Sun, 3 Jan 2010 23:28:40 +0000 (+0000)
Subject: Drop references to non-working upload queues, document ssh upload queue
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=developers-reference.git;a=commitdiff_plain;h=f81208222903239b23f392916c1fe194d395cddd

Drop references to non-working upload queues, document ssh upload queue

Thanks to Simon McVittie <smcv@debian.org> for the patch. Closes: #554077

git-svn-id: svn://anonscm.debian.org/ddp/manuals/trunk/developers-reference@7029 313b444b-1b9f-4f58-a734-7bb04f332e8d
---

diff --git a/common.ent b/common.ent
index 8008efc..a4ef08e 100644
--- a/common.ent
+++ b/common.ent
@@ -35,6 +35,7 @@
 <!ENTITY pts-host "packages.qa.debian.org">
 <!ENTITY ftp-master-host "ftp-master.debian.org">
 <!ENTITY ftp-upload-host "ftp.upload.debian.org">
+<!ENTITY ftp-eu-upload-host "ftp.upload.debian.org">
 <!ENTITY ssh-upload-host "ssh.upload.debian.org">
 <!ENTITY ftp-master-mirror "merkel.debian.org">
 <!ENTITY upload-queue "/pub/UploadQueue/">
diff --git a/debian/changelog b/debian/changelog
index dcfc36f..9f83954 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,10 @@ developers-reference (3.4.4) UNRELEASED; urgency=low
     on master.debian.org, it's no more required to search into
     the debian-private archives. Thanks to gregor herrmann <gregoa@debian.org>
     for the patch. Closes: #548823
+  * Update information about upload queues. Thanks to Simon McVittie
+    <smcv@debian.org> for the patches:
+    - point to official names {ftp,ssh}.upload.debian.org. Closes: #554054
+    - drop references to non-working queues. Closes: #554077
 
  -- Lucas Nussbaum <lucas@lucas-nussbaum.net>  Tue, 22 Dec 2009 22:49:40 +0900
 
diff --git a/pkgs.dbk b/pkgs.dbk
index 4de435e..3dc249e 100644
--- a/pkgs.dbk
+++ b/pkgs.dbk
@@ -448,17 +448,16 @@ see section <xref linkend="bug-security"/> .
 <section id="s5.6.5">
 <title>Other upload queues</title>
 <para>
-The scp queues on <literal>&ftp-master-host;</literal>, and <literal>
-security.debian.org</literal> are mostly unusable due to the login restrictions
-on those hosts.
+There is an alternative upload queue in Europe at <ulink
+url="ftp://&ftp-eu-upload-host;&upload-queue;"/>. It operates in
+the same way as <literal>&ftp-upload-host;</literal>, but should be faster
+for European developers.
 </para>
 <para>
-The anonymous queues on ftp.uni-erlangen.de and ftp.uk.debian.org are currently
-down.  Work is underway to resurrect them.
-</para>
-<para>
-The queues on master.debian.org, samosa.debian.org, master.debian.or.jp, and
-ftp.chiark.greenend.org.uk are down permanently, and will not be resurrected.
+Packages can also be uploaded via ssh to
+<literal>&ssh-upload-host;</literal>; files should be put
+<literal>/srv/upload.debian.org/UploadQueue</literal>. This queue does
+not support <xref linkend="delayed-incoming">delayed uploads</xref>.
 </para>
 </section>