Merge dput 0.9.2.36 from debian unstable (main)

dput (0.9.2.36ubuntu1) jaunty; urgency=low

  * Merge from debian unstable, remaining changes:
    + sftp.py: Support for uploads via sftp transport
    + dput.cf:
      - set ubuntu as default_host_main
      - set 'progress_indicator = 2'
    + dput:
      - Recognize 0ubuntu1 as a debian version that requires
        orig.tar.gz to be included in the upload.
    + debian/control: Added suggests on bzr (as we use the bzrlib.transport)
    + debian/rules: Updated to install sftp.py
    + dput:
      - Added ability to pass an argument to the host configuration by placing
         a colon after the hostname. The variable with the same name of the host
         will be replaced with the string following the colon. (LP: #196797)
      - Properly check to see if config stanza exists for host. (LP: #196786)
    + dput.cf: Updated ppa stanza to make use of argument support.
    + dput.cf.5: Updated to note support for sftp transport and host args
    + dput.1: Updated to document host argument feature and sftp support.

 -- Cody A.W. Somerville <email address hidden> Mon, 22 Dec 2008 17:16:38 -0500

set local as default_host_main to help prevent accidentally uploads after quick consultation in #ubuntu-devel and also updated changelog to close this bug. :)

dput (0.9.2.36ubuntu1) jaunty; urgency=low

  * Merge from debian unstable, remaining changes: (LP: #310754)
    + sftp.py: Support for uploads via sftp transport
    + dput.cf:
      - set 'progress_indicator = 2'
    + dput:
      - Recognize 0ubuntu1 as a debian version that requires
        orig.tar.gz to be included in the upload.
    + debian/control: Added suggests on bzr (as we use the bzrlib.transport)
    + debian/rules: Updated to install sftp.py
    + dput:
      - Added ability to pass an argument to the host configuration by placing
         a colon after the hostname. The variable with the same name of the host
         will be replaced with the string following the colon. (LP: #196797)
      - Properly check to see if config stanza exists for host. (LP: #196786)
    + dput.cf: Updated ppa stanza to make use of argument support.
    + dput.cf.5: Updated to note support for sftp transport and host args
    + dput.1: Updated to document host argument feature and sftp support.
  * dput.cf: Set local as default_host_main to help prevent accidentally uploads

 -- Cody A.W. Somerville <email address hidden> Mon, 22 Dec 2008 17:16:38 -0500

patch looks fine, although I suspect some of these changes should probably go to debian as well.

I'm also unconvinced about changing the default host - this has been uploading directly to ubuntu since edgy, and seems to work for a lot of people. I know that various people who are less confident (or take less risks) decide to manually change it themselves - but I suspect that these people are fewer than those people who are confident, and want it to Just Work, like it has done so previously. Having things work out of the box is usually a good idea!

It'll continue to work out of the box, you simply must specify two arguments from now on: the host (aka distro) and the source changefiles.

I don't feel strongly about this but I've gotten mixed opinions about this one. Maybe we should leave as is for now and start a thread on ubuntu-devel?

You seem to drop a bunch of changelog entries. Other than that the merge looks good.

Merge-o-matic screwed the merge of the changelog file up. I assumed that MoM would continue to do so on further merges so I figured the old changelog entries could be safely be dropped. If you'd like, I could take the time to fix it up and retain them.

This bug was fixed in the package dput - 0.9.2.36ubuntu1

---------------
dput (0.9.2.36ubuntu1) jaunty; urgency=low

  * Merge from debian unstable, remaining changes: (LP: #310754)
    + sftp.py: Support for uploads via sftp transport
    + dput.cf:
      - set 'default_main_host = ubuntu'
      - set 'progress_indicator = 2'
    + dput:
      - Recognize 0ubuntu1 as a debian version that requires
        orig.tar.gz to be included in the upload.
    + debian/control: Added suggests on bzr (as we use the bzrlib.transport)
    + debian/rules: Updated to install sftp.py
    + dput:
      - Added ability to pass an argument to the host configuration by placing
         a colon after the hostname. The variable with the same name of the host
         will be replaced with the string following the colon. (LP: #196797)
      - Properly check to see if config stanza exists for host. (LP: #196786)
    + dput.cf: Updated ppa stanza to make use of argument support.
    + dput.cf.5: Updated to note support for sftp transport and host args
    + dput.1: Updated to document host argument feature and sftp support.

 -- <email address hidden> (Cody A.W. Somerville) Mon, 22 Dec 2008 17:16:38 -0500