~ubuntu-branches/ubuntu/oneiric/inkscape/oneiric

Viewing all changes in revision 51.

  • Committer: Bazaar Package Importer
  • Author(s): Alex Valavanis
  • Date: 2011-02-20 12:07:30 UTC
  • mfrom: (2.5.1 sid)
  • Revision ID: james.westby@ubuntu.com-20110220120730-p7o6sq6i6wwt4398
Tags: 0.48.1-2ubuntu1
* Merge with Debian unstable (LP: #719648, LP: #278307).  Remaining changes:
* debian/control: 
  - Ubuntu maintainers
  - Promote python-lxml, python-numpy, python-uniconvertor to Recommends.
  - Demote pstoedit to Suggests (universe package).
* debian/rules:
  - Run intltool-update on build (Ubuntu-specific).
  - Add translation domain to .desktop files (Ubuntu-specific)
* debian/patches/01_add_unity_quicklist_support.patch:
  - add unity quicklist support for a new entry to inkscape (LP: #676886)

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: