Merge packaging changes from Debian
Bug #680946 reported by
Michael Terry
This bug affects 1 person
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| cheetah (Ubuntu) |
Fix Released
|
Undecided
|
Michael Terry | ||
Bug Description
This is a break-out bug from bug 663343.
There are two Debian releases of cheetah that included some packaging changes that we haven't picked up: 2.4.1-1 and then 2.4.2.1-1. We've moved past those versions in terms of the upstream, but when we did so, we didn't sync with Debian's packaging. We should do so now.
Clint Byrum has a branch, originally in bug 663343, that should do the trick.
Related branches
lp:~clint-fewbar/ubuntu/natty/cheetah/natty-merge-with-debian
- Mathias Gug: Needs Fixing
- Barry Warsaw (community): Approve
- Ubuntu branches: Pending requested
-
Diff: 217390 lines (+130/-217180)7 files modifieddebian/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)
| Changed in cheetah (Ubuntu): | |
| assignee: | nobody → Michael Terry (mterry) |
| status: | New → In Progress |
Revision history for this message
| Launchpad Janitor (janitor) wrote | #1 |
| Changed in cheetah (Ubuntu): | |
| status: | In Progress → Fix Released |
Revision history for this message
| Clint Byrum (clint-fewbar) wrote | #2 |
To post a comment you must log in.
This bug was fixed in the package cheetah - 2.4.3-0ubuntu2
---------------
cheetah (2.4.3-0ubuntu2) natty; urgency=low
[ Clint Byrum ]
* Merge from debian unstable. (LP: #680946) Remaining changes:
- debian/rules: Add PATH=$(
and PYTHONPATH=
testsuite.
- debian/rules: Run testsuite cheetah/
- src/Tests/Test.py was renamed to cheetah/
- debian/control: Rename Vcs-* to XS-Debian-Vcs-*.
* Dropped changes:
- debian/
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/
debian/
- 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 <email address hidden> Wed, 24 Nov 2010 12:47:40 -0500