lp://staging/~logan/ubuntu/raring/dput/debian-merge
- Get this branch:
- bzr branch lp://staging/~logan/ubuntu/raring/dput/debian-merge
Branch merges
- Benjamin Drung: Approve
- Ubuntu branches: Pending requested
-
Diff: 143 lines (+69/-12)4 files modifieddcut.1 (+13/-0)
debian/changelog (+45/-0)
debian/control (+2/-2)
dput.cf (+9/-10)
Branch information
- Owner:
- Logan Rosen
- Status:
- Merged
Recent revisions
- 31. By Logan Rosen
-
* 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.
* Non-maintainer upload.
* Discourage people to upload packages to the wrong archive (Closes: #561678)
* Deleted obsolete comment about gluck (Closes: #674585)
* Use case and example about dcut added to man page. Thanks
Hideki Yamane <email address hidden> (Closes: #688871)
* volatile archive has been discontinued (Closes: #661374)
* Change Vcs-Browser to anonscm.d.o from git.d.o
* Update Standards-Version to 3.9.3 (no changes required) - 29. By Martin Pitt
-
* sftp.py:
- Add support for a progress indicator to the sftp method (LP: #633109)
- Delete trailing whitespace
* debian/control:
- Suggest python-bzrlib instead of bzr - 28. By Lorenzo De Liso
-
* Merge from debian unstable (LP: #775587), remaining changes:
- debian/control: Added suggests on bzr (as we use the bzrlib.transport)
- debian/rules: Updated to install sftp.py
- sftp.py: Support for uploads via sftp transport
- dput.cf:
+ Set 'default_main_host = ubuntu'
+ Set 'progress_indicator = 2'
+ Updated ppa stanza to make use of argument support
- 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.cf.5: Updated to note support for sftp transport and host args
- dput.1: Updated to document host argument feature and sftp support.
- Don't incorrectly assume that HTTPResonse.reason is an integer when
generating an error message - 27. By Bhavani Shankar
-
* Merge from debian unstable (LP: #606153). Remaining changes:
- debian/control: Added suggests on bzr (as we use the bzrlib.transport)
- debian/rules: Updated to install sftp.py
- sftp.py: Support for uploads via sftp transport
- dput.cf:
+ set 'default_main_host = ubuntu'
+ set 'progress_indicator = 2'
+ Updated ppa stanza to make use of argument support
- 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 (LP: #327239)
- dput.cf.5: Updated to note support for sftp transport and host args
- dput.1: Updated to document host argument feature and sftp support.
- Don't incorrectly assume that HTTPResonse.reason is an integer when
generating an error message (LP: #380940)
* Dropped change:
- Compute md5 sums (merged in debian) - 26. By Bhavani Shankar
-
* Merge from debian testing. Remaining changes: LP: #507068
- debian/control: Added suggests on bzr (as we use the bzrlib.transport)
- debian/rules: Updated to install sftp.py
- sftp.py: Support for uploads via sftp transport
- dput.cf:
+ set 'default_main_host = ubuntu'
+ set 'progress_indicator = 2'
+ Updated ppa stanza to make use of argument support
- 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 (Fixes LP: #327239)
- dput.cf.5: Updated to note support for sftp transport and host args
- dput.1: Updated to document host argument feature and sftp support.
- Don't incorrectly assume that HTTPResonse.reason is an integer when
generating an error message (LP: #380940).
- Compute md5 sum - 24. By Evan
-
Don't incorrectly assume that HTTPResonse.reason is an integer when
generating an error message (LP: #380940). - 23. By Muharem Hrnjadovic
-
* Merge from debian unstable (LP: #388939), remaining changes:
- debian/control: Added suggests on bzr (as we use the bzrlib.transport)
- debian/rules: Updated to install sftp.py
- Be more careful about setting a variable in a section that does not
exist in host argument handling (Fixes LP: #327239)
- 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)
- 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.
- 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.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://staging/ubuntu/raring/dput