~ubuntu-branches/ubuntu/natty/pitivi/natty

Viewing all changes in revision 24.

  • Committer: Bazaar Package Importer
  • Author(s): Sebastian Dröge
  • Date: 2010-09-17 13:09:17 UTC
  • mfrom: (3.1.19 experimental)
  • Revision ID: james.westby@ubuntu.com-20100917130917-8c8nbqgv2i9lujj1
Tags: 0.13.5-1ubuntu1
* Merge with Debian experimental, remaining Ubuntu changes:
* debian/control:
  - Add Vcs-Bzr link
  - Build-depend on python-launchpad-integration
  - Drop hal from Recommends to Suggests. This version has the patch applied
    to not crash without hal. Hal-B-gone from our CDs!
* debian/rules:
  - Use gnome.mk so a translation template is built
* debian/patches/01_lpi.patch:
  - launchpad integration 

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: