When uploading to Debian, tell dput to upload to "ftp-master". This avoids problems...

diff --git a/debian/changelog b/debian/changelog
index be670ab293e56238cf1663a3abefa8a63557630d..6d3d78343a7124448ff87063b7ea81b5d504e7ec 100644 (file)
--- 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 9d1570c7a9f86fdfba869973e12cc08487cb8afb..35c02afc0bcce12867bec7688e7ee9d29abfb22d 100755 (executable)
--- 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 {