diff -Nru cheetah-2.4.4/debian/changelog cheetah-2.4.4/debian/changelog --- cheetah-2.4.4/debian/changelog 2011-04-13 16:46:47.000000000 +0100 +++ cheetah-2.4.4/debian/changelog 2011-06-11 09:00:14.000000000 +0100 @@ -1,3 +1,20 @@ +cheetah (2.4.4-2ubuntu1) oneiric; urgency=low + + * 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. + + -- Scott Moser Fri, 10 Jun 2011 15:55:11 -0400 + cheetah (2.4.4-2) unstable; urgency=low * Upload to unstable. @@ -22,6 +39,58 @@ -- Arnaud Fontaine Sat, 25 Dec 2010 14:14:19 +0900 +cheetah (2.4.3-0ubuntu3) natty; urgency=low + + * debian/control: + - Drop Build-Depends on python-markup, as it's in universe and only + used -- if available -- for tests + + -- Michael Terry Fri, 03 Dec 2010 08:43:41 -0500 + +cheetah (2.4.3-0ubuntu2) natty; urgency=low + + [ 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 + + -- Michael Terry Wed, 24 Nov 2010 12:47:40 -0500 + +cheetah (2.4.3-0ubuntu1) natty; urgency=low + + * 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 + + -- Barry Warsaw Tue, 19 Oct 2010 15:11:11 -0400 + cheetah (2.4.2.1-1) unstable; urgency=low * New upstream release. @@ -58,6 +127,55 @@ -- Arnaud Fontaine Wed, 10 Feb 2010 02:27:47 +0000 +cheetah (2.0.1-2ubuntu7) lucid; urgency=low + + * Rebuild dropping the extension for python2.5. + + -- Matthias Klose Mon, 01 Feb 2010 22:04:53 +0000 + +cheetah (2.0.1-2ubuntu6) karmic; urgency=low + + * 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. + + -- Loïc Minier Sun, 27 Sep 2009 13:31:05 +0200 + +cheetah (2.0.1-2ubuntu5) karmic; urgency=low + + * 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. + + -- Loïc Minier Fri, 25 Sep 2009 00:33:38 +0200 + +cheetah (2.0.1-2ubuntu4) karmic; urgency=low + + * Rename Vcs-* to XS-Debian-Vcs-*. + * Add ${misc:Depends}. + * Fix typos notably in patch name in previous changelog entry. + + -- Loïc Minier Thu, 24 Sep 2009 21:11:22 +0200 + +cheetah (2.0.1-2ubuntu3) jaunty; urgency=low + + * debian/patches/python-2.6-warning-fix.patch: Fix deprecation warning + when using python 2.6 + + -- Chuck Short Tue, 31 Mar 2009 10:31:22 -0400 + +cheetah (2.0.1-2ubuntu2) jaunty; urgency=low + + * Fix spelling of Original in the control file. + + -- Steve Kowalik Sun, 29 Mar 2009 21:45:47 +1100 + +cheetah (2.0.1-2ubuntu1) jaunty; urgency=low + + * Rebuild for python2.6 transition. + + -- Chuck Short Sun, 01 Mar 2009 18:26:56 -0500 + cheetah (2.0.1-2) unstable; urgency=low [ Arnaud Fontaine ] diff -Nru cheetah-2.4.4/debian/control cheetah-2.4.4/debian/control --- cheetah-2.4.4/debian/control 2010-12-26 09:43:23.000000000 +0000 +++ cheetah-2.4.4/debian/control 2011-06-11 09:00:14.000000000 +0100 @@ -1,18 +1,18 @@ Source: cheetah Section: python Priority: optional -Maintainer: Arnaud Fontaine +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Arnaud Fontaine Uploaders: Debian Python Modules Team Build-Depends: debhelper (>= 5.0.37.2), cdbs (>= 0.4.43), python-all-dev (>= 2.6.6-9), python-support (>= 1.0.12), python-setuptools (>= 0.6.14-5), - python-markdown (>= 2.0.1) Standards-Version: 3.9.1 Homepage: http://www.cheetahtemplate.org/ -Vcs-Svn: svn://svn.debian.org/python-modules/packages/cheetah/trunk/ -Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/cheetah/trunk/ +XS-Vcs-Svn: svn://svn.debian.org/python-modules/packages/cheetah/trunk/ +XS-Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/cheetah/trunk/?op=log Package: python-cheetah Architecture: any