Please merge python-webob 1.2.3-2 (main) from Debian unstable (main)

Delta from Debian and Ubuntu

The attachment "diff_1.2.3-2_1.2.3-2ubuntu1.diff" seems to be a debdiff. The ubuntu-sponsors team has been subscribed to the bug report so that they can review and hopefully sponsor the debdiff. If the attachment isn't a patch, please remove the "patch" flag from the attachment, remove the "patch" tag, and if you are member of the ~ubuntu-sponsors, unsubscribe the team.

[This is an automated message performed by a Launchpad user owned by ~brian-murray, for any issue please contact him.]

Can you please document or remove the other ubuntu deltas? (addition of quilt, debian/patches/fix_test_headers2.py, missing DEP-3 patch header). Also, these days one shouldn't use quilt but change the package to source format "3.0 (quilt)". Thanks!

Please also forward the python3 diff to Debian, it's applicable there and will remove our delta.

Updated changelog and fixed deltas.
Submitted diff between Debian and current Ubuntu version

The patch in comment #7 does not apply cleanly against the saucy source branch:

% patch --dry-run -p1 < ../python-webob_1.2.3-2_1.2.3-2ubuntu1.diff
checking file debian/changelog
Hunk #1 FAILED at 1.
Hunk #2 succeeded at 24 with fuzz 2 (offset 5 lines).
1 out of 2 hunks FAILED
checking file debian/control
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED
checking file debian/patches/fix_test_headers2.py
checking file debian/patches/series
checking file debian/rules
Hunk #1 FAILED at 28.
Hunk #2 FAILED at 46.
2 out of 2 hunks FAILED

But since I'm patch piloting today, I think I can clean that up, along with the outstanding comments made by Pitti in #5 (DEP-3 headers). If I can clean it up and it builds/installs locally, I'll sponsor it, but please do forward the Python 3 changes to Debian.

The test_requests.py patch should probably be forwarded to upstream.

Also, I'm keeping Ubuntu's debian/watch file since it points to pypi.

The B-D on quilt silences a lintian error:

Now running lintian...
E: python-webob source: missing-build-dependency quilt
Finished running lintian.

I just remember *I* can get these changes into Debian :). I'll do that if I get a clean local build.

This bug was fixed in the package python-webob - 1.2.3-2ubuntu1

---------------
python-webob (1.2.3-2ubuntu1) saucy; urgency=low

  [ Yolanda Robla ]
  * Merge from Debian unstable (LP: #1201323). Remaining changes:
    + Added python 3 support:
      - debian/control
      - debian/rules
    + debian/patches/fix_test_headers2.patch: Test should pass independently
      of the order of result.
    + debian/watch: Keep PyPI download.

  [ Barry Warsaw ]
  * Added DEP-3 headers to fix_test_headers2.patch.

python-webob (1.2.3-2) unstable; urgency=low

  [ Jakub Wilk ]
  * Use canonical URIs for Vcs-* fields.

  [ Thomas Goirand ]
  * Uploading to unstable.

python-webob (1.2.3-1) experimental; urgency=low

  * Team upload.
  * New upstream release.
  * Uploading to experimental.
  * Increase compat level and debhelper to 9.
  * Added missing --install-layout=deb when calling setup.py.
  * Bumped standard-version to 3.9.4 (no change).
 -- Barry Warsaw <email address hidden> Tue, 23 Jul 2013 17:55:26 -0400

Thanks for your comments and for fixing the pending issues.
I already forwarded the python 3 changes to Debian:

http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=717655

About fix_test_headers2.py that patch is already upstream.