-
Committer:
Bazaar Package Importer
-
Author(s):
Michael Terry, Clint Byrum, Michael Terry
-
Date:
2010-11-24 12:47:40 UTC
-
Revision ID:
james.westby@ubuntu.com-20101124124740-igvx6cxy6lspa4zi
Tags: 2.4.3-0ubuntu2
[ Clint Byrum ]
* Merge from debian unstable. (LP: #680946) Remaining changes:
- debian/rules: Add PATH=$(CURDIR)/build/scripts-$buildver:$PATH
and PYTHONPATH=$(CURDIR)/build/lib.*-$buildver when running
testsuite.
- debian/rules: Run testsuite cheetah/Tests/Test.py during build
- src/Tests/Test.py was renamed to cheetah/Tests/Test.py upstream
- debian/control: Rename Vcs-* to XS-Debian-Vcs-*.
* Dropped changes:
- debian/patches/python-2.6-warning-fix.patch: Fix deprecation
warning when using python 2.6 -- Applied upstream
- debian/control: Add ${misc:Depends}. -- in debian package now
- Run testsuite but don't fail the build right now -- All tests
pass now, and testsuite always returns 0 anyway
- debian/rules: Ignore failures of individual runs rather than of
the for loop; allows testing all python versions when the
testsuite fails. -- tests seem to always return 0
* Re-adding changelog entries dropped in 2.4.3-0ubuntu1
* Removing test.strace which is not in 2.4.3 upstream source
[ Michael Terry ]
* debian/control.in, debian/patches/01_eggify.patch,
debian/pycompat:
- Dropped, as they were dropped in Debian
* debian/copyright, debian/watch:
- Update to what's in Debian
* debian/control:
- Drop python:Provides and python:Versions as Debian did