lp:~smoser/ubuntu/oneiric/cheetah/merge-debian-2.4.4-2

Branch merges

Propose for merging

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #795714: Please merge cheetah 2.4.4-2 (main) from debian unstable (main)

Low

Fix Released

Link a bug report

Related blueprints

20. By Scott Moser on 2011-06-10

update changelog release to oneiric

19. By Scott Moser on 2011-06-10

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.

18. By Scott Moser on 2011-06-10

merge debian 2.4.4-2 and ubuntu 2.4.3-0ubuntu3

17. By Scott Moser on 2011-06-10

Merging shared upstream rev into target branch.

16. By Scott Moser on 2011-06-10

Merging shared upstream rev into target branch.

15. By Michael Terry on 2010-12-03

* debian/control:
  - Drop Build-Depends on python-markup, as it's in universe and only
    used -- if available -- for tests

14. By Michael Terry on 2010-11-24

[ 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

13. By Barry Warsaw on 2010-10-19

* New upstream release.
  - Update debian/rules for new test path
  - Add debian/patches/02_fedora_cheetah_2.7_compat.patch from Fedora to
    fix Python 2.7 compatibility
  - Drop debian/patches/02_clean_modules.patch and
    03_ptyhon-2.6-warning-fix.patch

12. By Matthias Klose on 2010-02-01

Rebuild dropping the extension for python2.5.

11. By Loïc Minier on 2009-09-27

* Add PATH=$(CURDIR)/build/scripts-$buildver:$PATH and
  PYTHONPATH=$(CURDIR)/build/lib.*-$buildver when running testsuite.
* Ignore failures of individual runs rather than of the for loop; allows
  testing all python versions when the testsuite fails.