From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 28 Aug 2013 22:27:00 +0000 (+0100)
Subject: When uploading to Debian, tell dput to upload to "ftp-master".  This avoids problems... 
X-Git-Tag: debian/0.13~7
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=0a6e52869abeda15e14577ea5a4db58301afd005

When uploading to Debian, tell dput to upload to "ftp-master".  This avoids problems with derivatives whose dput has a different default. Closes: #720958.
---

diff --git a/debian/changelog b/debian/changelog
index be670ab2..6d3d7834 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ dgit (0.13) unstable; urgency=low
     erroneously duplicated during editing, apparently.)
   * Remove DGET_UNPACK from the environment in case the user has set it.
   * Remove scary warning from Description.
+  * When uploading to Debian, tell dput to upload to "ftp-master".  This
+    avoids problems with derivatives whose dput has a different default.
+    Closes: #720958.
 
  --
 
diff --git a/dgit b/dgit
index 9d1570c7..35c02afc 100755
--- a/dgit
+++ b/dgit
@@ -247,6 +247,7 @@ our %defcfg = ('dgit.default.distro' => 'debian',
 	       'dgit-distro.debian.sshdakls-host' => 'coccia.debian.org',
 	       'dgit-distro.debian.sshdakls-dir' =>
 	           '/srv/ftp-master.debian.org/ftp/dists',
+	       'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
 	       'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/');
 
 sub cfg {