summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2013-08-28 23:27:00 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2013-08-28 23:27:00 +0100
commit0a6e52869abeda15e14577ea5a4db58301afd005 (patch)
tree7db19ea807407aaf95bcd04f3857b885415806ab
parent28789232f5edcc1c24bbb4bfe3b5e12119e9886e (diff)
When uploading to Debian, tell dput to upload to "ftp-master". This avoids problems with derivatives whose dput has a different default. Closes: #720958.
-rw-r--r--debian/changelog3
-rwxr-xr-xdgit1
2 files changed, 4 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index be670ab..6d3d783 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 9d1570c..35c02af 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 {