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

Viewing all changes in revision 57.

  • Committer: Chris Coulson
  • Date: 2011-06-06 15:53:03 UTC
  • mfrom: (56.1.2 fix-791728)
  • Revision ID: chrisccoulson@ubuntu.com-20110606155303-6khs9ze3670ljpxl
* Merge from Debian Unstable (LP: #791728).  Remaining changes:
  - debian/control:
    + Ubuntu maintainers
    + Promote python-lxml, python-numpy, python-uniconvertor to Recommends.
    + Demote pstoedit to Suggests (universe package).
    + Suggest transfig to allow import of xfig files (LP: #668300)
    + Drop unnecessary python and skencil suggestions (LP: #762541)
  - Handle translation tasks for Ubuntu main (LP: #726850):
    + debian/rules: Add dh_translations to binary-arch rule
    + debian/control: Build-Depends dh-translations
  - debian/patches/01_add_unity_quicklist_support.patch: add "New Drawing" 
    to Unity quicklist (LP: #676886)
  - debian/patches/fix-fontforge-glyph-template.dpatch: Cherry-pick
    patch from uptream trunk to fix layer structure in template (LP: #565296)
  - debian/patches/02-add-shebangs-and-fix-permissions.dpatch: No longer mark
    JavaScript extension files as standalone executables (LP: #602005):
    + share/extensions/*.js: Revert addition of shebangs
    + share/extensions/Makefile.am: Install *.js using _DATA rule rather
      than _SCRIPTS rule to avoid giving executable permission
* debian/patches/fix-datamatrix-ui.dpatch: Prevent invalid input in
  Datamatrix extension dialog (LP: #738108)
* Non-maintainer upload.
* Fix FTBFS with gcc 4.6 (Closes: #624770), Thanks to Alex Valavanis
  for the patch.
  - added 04-fix-build-with-gcc4.6.dpatch
* Fix build issues due to missing includes (Closes: #628226), patch
  taken from upstream.
  - added 05-add-missing-includes.dpatch

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: