Merge packaging changes from Debian

Bug #680946 reported by Michael Terry on 2010-11-24
This bug affects 1 person
Affects Status Importance Assigned to Milestone
cheetah (Ubuntu)
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 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

Mathias Gug: Needs Fixing on 2010-11-17
Barry Warsaw: Approve on 2010-11-08
Ubuntu branches: Pending requested 2010-11-02
Michael Terry (mterry) on 2010-11-24
Changed in cheetah (Ubuntu):
assignee: nobody → Michael Terry (mterry)
status: New → In Progress
Launchpad Janitor (janitor) wrote :

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=$(CURDIR)/build/scripts-$buildver:$PATH
      and PYTHONPATH=$(CURDIR)/build/lib.*-$buildver when running
    - debian/rules: Run testsuite cheetah/Tests/ during build
      - src/Tests/ was renamed to cheetah/Tests/ 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/, debian/patches/01_eggify.patch,
    - 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

Changed in cheetah (Ubuntu):
status: In Progress → Fix Released
Clint Byrum (clint-fewbar) wrote :

Michael, thanks for taking this on and getting it uploaded!

To post a comment you must log in.
This report contains Public information  Edit
Everyone can see this information.

Other bug subscribers