Please merge inkscape 0.47.0-2 from Debian testing

Bug Description

Binary package hint: inkscape

Debian has a new package version, which fixes bug #486425 and moves a few Ubuntu patches upstream.

inkscape (0.47.0-2) unstable; urgency=low

* Build depend on libaspell-dev, recommend aspell, add explanation to
package description (closes: #562060)
* update debian/watch patch by Kees Cook, many thanks to him
(closes: #562225)
* process DEB_BUILD_OPTIONS for "parallel=N" flag patch by Kees Cook,
many thanks to him. (Closes: #562226)
* Add patch to update man-page (closes:#570494)
* remove old unneeded patches
* upload sponsored by Guido Guenther <email address hidden>

-- Wolfram Quester <email address hidden> 2010年2月19日 19:21:33 +0100

Where can I review the patch that merges Debian's and Ubuntu's changes?

Unsubscribing sponsors for now. please resubscribe when ready.

Sorry about the delay. Uploading two debdiffs now:

debdiff inkscape_0.47.0-1ubuntu2.dsc inkscape_0.47.0-2ubuntu1.dsc > oldubuntu-newubuntu.debdiff

debdiff inkscape_0.47.0-2.dsc inkscape_0.47.0-2ubuntu1.dsc > debian-newubuntu.debdiff

Resubscribed sponsors. I'm pretty new to packaging, so please check my work carefully, and hopefully forgive any mistakes!

uploaded. I made some small changes:
* update-maintainer
* drop deprecated dh_desktop from debian/rules
* remove empty line from debian/changelog
* indent the 50-poppler-API.patch entry in debian/changelog to show that this change is a "Remaining change" and not a new one.

Here is the applied diff.

Fixed in 0.47.0-2ubuntu1