~ubuntu-branches/ubuntu/lucid/sugar-hulahop/lucid

Viewing all changes in revision 12.

  • Committer: Bazaar Package Importer
  • Author(s): Andres Rodriguez
  • Date: 2009-06-25 11:17:47 UTC
  • mfrom: (1.1.5 upstream) (3.2.2 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090625111747-jbecfd2avl9bqi6y
Tags: 0.4.9-1ubuntu1
* Merge from debian unstable (LP: #391850), remaining changes:
  - debian/rules: Replace dependency on python-xpcom with xulrunner-1.9.
  - debian/control:
    + Fix build dependencies for Ubuntu: change xulrunner-dev to 
      xulrunner-1.9-dev, remove python-xpcom (built into xulrunner-1.9-dev)
    + Add Conflicts/Replaces to make the transitional package work correctly.
  - debian/{control,control.in}, debian/python-hulahop.install:
    + Add hulahop transitional package for upgrades (should be kept until
      after the next LTS) (LP: #286764)
  - Drop debian patch 1001 as it is Debian specific.
* debian/patches/1002_python2.6.patch:
  - Added support for python2.6.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: