Merge lp:~logan/ubuntu/saucy/dput/0.9.6.3+nmu2ubuntu1 into lp:ubuntu/saucy/dput

[Logan Rosen]

[Martin Pitt (pitti)]

Thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-26 15:50:06 +0000
+++ debian/changelog	2013-05-26 04:49:27 +0000
@@ -1,3 +1,38 @@
+dput (0.9.6.3+nmu2ubuntu1) saucy; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/control: Added suggests on python-bzrlib (as we use the
+      bzrlib.transport).
+    - debian/rules: Updated to install sftp.py.
+    - dput:
+      + Recognize 0ubuntu1 as a debian version that requires
+        orig.tar.gz to be included in the upload.
+      + Correctly handle cases where a non-existant host or no host at all is
+        supplied when -o option is passed. (Thanks to David Futcher for
+        spotting)
+      + Be more careful about setting a variable in a section that does not
+        exist in host argument handling.
+    - dput.1: Updated to document host argument feature and sftp support.
+    - dput.cf:
+      + Set 'default_main_host = ubuntu'
+      + Set 'progress_indicator = 2'
+      + Updated ppa stanza to make use of argument support.
+    - dput.cf.5: Updated to note support for sftp transport and host args.
+    - http.py: Don't incorrectly assume that HTTPResponse.reason is an
+      integer when generating an error message.
+    - sftp.py: Support for uploads via sftp transport with a progress
+      indicator.
+
+ -- Logan Rosen <[e-mail]>  Sun, 26 May 2013 00:34:14 -0400
+
+dput (0.9.6.3+nmu2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Update dput.cf to deal with backports.org being integrated into
+    the main archive (Closes: #704228).
+
+ -- Thijs Kinkhorst <[e-mail]>  Sun, 31 Mar 2013 13:09:54 +0200
+
 dput (0.9.6.3+nmu1ubuntu1) raring; urgency=low
 
   * Merge from Debian unstable. Remaining changes:
@@ -23,7 +58,7 @@
     - sftp.py: Support for uploads via sftp transport with a progress
       indicator.
 
- -- Logan Rosen <[e-mail]>  Mon, 26 Nov 2012 15:50:06 -0500
+ -- Logan Rosen <[e-mail]>  Mon, 26 Nov 2012 15:50:06 -0500
 
 dput (0.9.6.3+nmu1) unstable; urgency=low
 

=== modified file 'dput.cf'
--- dput.cf	2012-11-26 15:50:06 +0000
+++ dput.cf	2013-05-26 04:49:27 +0000
@@ -26,7 +26,7 @@
 method			= ftp
 # Please, upload your package to the proper archive
 # http://www.debian.org/doc/manuals/developers-reference/pkgs.html#bug-security-upload
-allowed_distributions	= (?!UNRELEASED|.*-security|.*-backports)
+allowed_distributions	= (?!UNRELEASED|.*-security)
 
 # http://lists.debian.org/debian-project/2009/05/msg00036.html
 [ftp-eu]
@@ -37,7 +37,7 @@
 allow_dcut		= 1
 # Please, upload your package to the proper archive
 # http://www.debian.org/doc/manuals/developers-reference/pkgs.html#bug-security-upload
-allowed_distributions	= (?!UNRELEASED|.*-security|.*-backports)
+allowed_distributions	= (?!UNRELEASED|.*-security)
 
 # http://lists.debian.org/debian-devel-announce/2008/09/msg00007.html
 [ssh-upload]
@@ -49,7 +49,7 @@
 allow_dcut		= 1
 # Please, upload your package to the proper archive
 # http://www.debian.org/doc/manuals/developers-reference/pkgs.html#bug-security-upload
-allowed_distributions	= (?!UNRELEASED|.*-security|.*-backports)
+allowed_distributions	= (?!UNRELEASED|.*-security)
 
 # And if you want to override one of the defaults, add it here.
 # For example, comment out the next line
@@ -82,13 +82,6 @@
 incoming		= /pub/Incoming/upload
 login			= anonymous
 
-[backports]
-fqdn			= backports-master.debian.org
-method			= ftp
-incoming		= /pub/UploadQueue/
-login			= anonymous
-allow_dcut		= 1
-
 [ubuntu]
 fqdn			= upload.ubuntu.com
 method			= ftp