lp:~clint-fewbar/ubuntu/natty/cheetah/natty-merge-with-debian

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/natty/cheetah at revision 14

Mathias Gug: Needs Fixing on 2010-11-17

Barry Warsaw (community): Approve on 2010-11-08

Ubuntu branches: Pending requested 2010-11-02

Diff: 217390 lines (+130/-217180)

7 files modified

debian/changelog (+59/-0)
debian/control (+13/-11)
debian/patches/fix_ftbfs_c_extension_python25.patch (+48/-0)
debian/patches/series (+2/-0)
debian/rules (+7/-8)
debian/source/format (+1/-0)
test.strace (+0/-217161)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #663343: Please merge cheetah 2.4.2.1-1 (main) from Debian unstable (main)	Undecided	Fix Released
Bug #680946: Merge packaging changes from Debian	Undecided	Fix Released

Link a bug report

Related blueprints

17. By Clint Byrum on 2010-11-02

make dist natty

16. By Clint Byrum on 2010-11-02

Removing test.strace which is not in 2.4.3 upstream source

15. By Clint Byrum on 2010-11-02

re-adding missing files from sid

14. By Clint Byrum on 2010-11-02

* Merge from debian unstable. (LP: #663343) 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

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.

10. By Loïc Minier on 2009-09-25

Run testsuite src/Tests/Test.py during build but don't fail the build
right now as it's failing 30 tests out of 2066.

9. By Loïc Minier on 2009-09-24

* Rename Vcs-* to XS-Debian-Vcs-*.
* Add ${misc:Depends}.
* Fix typos notably in patch name in previous changelog entry.

8. By Chuck Short on 2009-03-31

debian/patches/ptyhon-2.6-warning-fix.patch: Fix depreciation warning
whne using ptyhon 2.6