Ubuntu
inkscape package

Merge lp://qastaging/~valavanisalex/ubuntu/oneiric/inkscape/inkscape_0.48.1-2.1ubuntu1 into lp://qastaging/ubuntu/oneiric/inkscape

Proposed by Alex Valavanis on 2011-06-02

Status:	Merged
Merged at revision:	57
Proposed branch:	lp://qastaging/~valavanisalex/ubuntu/oneiric/inkscape/inkscape_0.48.1-2.1ubuntu1
Merge into:	lp://qastaging/ubuntu/oneiric/inkscape
Diff against target:	5343 lines (+1005/-4302) 6 files modified debian/changelog (+38/-0) debian/patches/00list (+3/-1) debian/patches/04-fix-build-with-gcc4.6.dpatch (+18/-0) debian/patches/04-fix-gcc4.6-ftbfs.dpatch (+0/-4301) debian/patches/05-add-missing-includes.dpatch (+799/-0) debian/patches/fix-datamatrix-ui.dpatch (+147/-0)
To merge this branch:	bzr merge lp://qastaging/~valavanisalex/ubuntu/oneiric/inkscape/inkscape_0.48.1-2.1ubuntu1
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Chris Coulson (community)		Approve on 2011-06-06
Ubuntu branches	2011-06-02	Pending
Review via email: mp+63205@code.qastaging.launchpad.net

This is a merge with the latest Debian package version. Debian has now accepted one of the patches that was applied in Ubuntu.

58. By Alex Valavanis on 2011-06-02:   - 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"
  - debian/patches/fix-fontforge-glyph-template.dpatch: Cherry-pick
  - 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
* debian/patches/fix-datamatrix-ui.dpatch: Prevent invalid input in
  Datamatrix extension dialog (LP: #738108)