Merge lp:~ubuntu-branches/ubuntu/saucy/dh-python/saucy-201308281516 into lp:ubuntu/saucy/dh-python

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/saucy/dh-python reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/saucy/dh-python/saucy-201308281516. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

Unmerged revisions

13. By Dimitri John Ledkov on 2013-08-28

releasing package dh-python version 1.20130819-1ubuntu3

12. By Dimitri John Ledkov on 2013-08-28

* Set executable bit on debian/tests/* to ease local testing.
* Bump doctests s/3.2/3.3/

11. By Dmitry Shachnev on 2013-08-28

Merge lp:ubuntu/pybuild

10. By Dmitry Shachnev on 2013-08-28

* Rename dh_python3 autopkgtest to dh-python, and add python-all-dev
  and pypy to Depends.
* Disable tests that require python2.6.
* Add one more sed call to make dh-python test working.
* Add nosetests autopkgtest.

9. By Dimitri John Ledkov on 2013-08-25

Fix autopkgtest for the updated test harness.

8. By Dimitri John Ledkov on 2013-08-25

Adjust supported & default python versions in the test harness to
match those of ubuntu.

7. By Dimitri John Ledkov on 2013-08-25

Hopefully unbreak pybuild by properly pushing array arguments to
@result array-ref. (LP: #1214553)