~ubuntu-branches/ubuntu/oneiric/pitivi/oneiric

Viewing all changes in revision 31.

  • Committer: Bazaar Package Importer
  • Author(s): Steve Langasek
  • Date: 2011-06-22 09:48:16 UTC
  • mfrom: (6.1.8 sid)
  • Revision ID: james.westby@ubuntu.com-20110622094816-l62wlri1ha8n0d27
Tags: 0.14.0-2ubuntu1
* Merge from Debian unstable, remaining changes:
  - Migrate from python-central to dh_python2.
  - debian/control: Depend on python-launchpad-integration
  - debian/patches/01_lpi.patch: launchpad integration  
  - debian/rules: Use gnome.mk so a translation template is built
* Dropped changes, merged in Debian:
  - Drop hal from Recommends to Suggests. This version has the patch
    applied to not crash without hal.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: