-
Committer:
Bazaar Package Importer
-
Author(s):
Scott Moser
-
Date:
2011-06-10 15:55:11 UTC
-
mfrom:
(1.1.7 upstream)
(5.1.3 sid)
-
Revision ID:
james.westby@ubuntu.com-20110610155511-w5apepok2sh5lut7
Tags: 2.4.4-2ubuntu1
* Merge from debian unstable. (LP: #795714) Remaining changes:
- debian/control: Rename Vcs-* to XS-Debian-Vcs-*.
- Drop Build-Depends on python-markup, as it's in universe and only
used -- if available -- for tests
* Dropped changes:
- debian/rules: Run testsuite cheetah/Tests/Test.py during build
- debian/rules: Add PATH=$(CURDIR)/build/scripts-$buildver:$PATH
and PYTHONPATH=$(CURDIR)/build/lib.*-$buildver when running
testsuitej
+ debian runs test suite now
- Add debian/patches/02_fedora_cheetah_2.7_compat.patch from Fedora to
+ This is fixed in upstream cheetah now.