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

Viewing all changes in revision 8.

  • Committer: Bazaar Package Importer
  • Author(s): Stefan Lesicnik
  • Date: 2009-01-08 16:32:54 UTC
  • mfrom: (1.1.4 upstream) (3.2.1 lenny)
  • Revision ID: james.westby@ubuntu.com-20090108163254-r55ca5u7ee4vvinm
Tags: 0.4.8~dfsg-3ubuntu1
* Merge from debian unstable, remaining changes:
  - Fix build dependencies for Ubuntu: change xulrunner-dev to
    xulrunner-1.9-dev, remove python-xpcom (built into xulrunner-1.9-dev)
  - Add hulahop transitional package for upgrades (should be kept until
    after the next LTS) (LP: #286764)
  - Add Conflicts/Replaces to make the transitional package work
    correctly.
* Drop debian patch 1001 & 2001 as it is Debian specific.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: