diff -u inkscape-0.47.0/debian/control inkscape-0.47.0/debian/control --- inkscape-0.47.0/debian/control +++ inkscape-0.47.0/debian/control @@ -6,7 +6,7 @@ Homepage: http://www.inkscape.org/ Maintainer: Ubuntu Core Developers XSBC-Original-Maintainer: Wolfram Quester -Build-Depends: debhelper (>= 7.0.0), dpatch, intltool, libart-2.0-dev (>= 2.3.10), libboost-dev, libgc-dev (>= 1:6.8), libglib2.0-dev, libgnomevfs2-dev, libgtk2.0-dev (>= 2.10.0), libgtkmm-2.4-dev, libgtkspell-dev, libgsl0-dev, liblcms1-dev, libmagick++9-dev, libpango1.0-dev, libpng12-dev, libpoppler-glib-dev (>= 0.12.2-1), libpopt-dev, libsigc++-2.0-dev (>= 2.0.16-2), libtool, libwpg-dev, libxml-parser-perl, libxml2-dev (>= 2-2.4.24), libxslt1-dev, pkg-config, python-dev, zlib1g-dev +Build-Depends: debhelper (>= 7.0.0), dpatch, intltool, libart-2.0-dev (>= 2.3.10), libaspell-dev, libboost-dev, libgc-dev (>= 1:6.8), libglib2.0-dev, libgnomevfs2-dev, libgtk2.0-dev (>= 2.10.0), libgtkmm-2.4-dev, libgtkspell-dev, libgsl0-dev, liblcms1-dev, libmagick++9-dev, libpango1.0-dev, libpng12-dev, libpoppler-glib-dev (>= 0.12.2-1), libpopt-dev, libsigc++-2.0-dev (>= 2.0.16-2), libtool, libwpg-dev, libxml-parser-perl, libxml2-dev (>= 2-2.4.24), libxslt1-dev, pkg-config, python-dev, zlib1g-dev Standards-Version: 3.8.1 Package: inkscape @@ -14,7 +14,7 @@ Homepage: http://www.inkscape.org/ Depends: ${shlibs:Depends} Suggests: dia | dia-gnome, ruby, libgnomevfs2-extra, libsvg-perl, libxml-xql-perl, python, skencil, ttf-bitstream-vera, pstoedit -Recommends: libwmf-bin, imagemagick, perlmagick, python-numpy, python-lxml, python-uniconvertor +Recommends: aspell, libwmf-bin, imagemagick, perlmagick, python-numpy, python-lxml, python-uniconvertor Description: vector-based drawing program Inkscape loads and saves a subset of the SVG (Scalable Vector Graphics) format, a standard maintained by the WWW consortium. @@ -35 +35,4 @@ - You must have these packages to make full use of all extensions and effects. + You must have these packages to make full use of all extensions and effects. + . + If you want to use the spellchecker, you have to install aspell and the + respective language-pack, e.g. aspell-en or aspell-de. diff -u inkscape-0.47.0/debian/changelog inkscape-0.47.0/debian/changelog --- inkscape-0.47.0/debian/changelog +++ inkscape-0.47.0/debian/changelog @@ -1,3 +1,32 @@ +inkscape (0.47.0-2ubuntu1) lucid; urgency=low + + * Merge from debian testing (LP: #533584, LP: #486425). Remaining changes: + - debian/control: + - drop libssl-dev, no longer needed (Closes: #573338). + - 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). + * 50-poppler-API.patch, debian/control: poppler 0.12.2 changed the + GfxColorSpace API (LP: #487038). + + -- Alexander Valavanis Wed, 10 Mar 2010 17:45:24 +0000 + +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 + + -- Wolfram Quester Fri, 19 Feb 2010 19:21:33 +0100 + inkscape (0.47.0-1ubuntu2) lucid; urgency=low * Brown paper bag update: actually use the correct version of the diff -u inkscape-0.47.0/debian/patches/00list inkscape-0.47.0/debian/patches/00list --- inkscape-0.47.0/debian/patches/00list +++ inkscape-0.47.0/debian/patches/00list @@ -1,2 +1,3 @@ +01-fix-manpage.dpatch 04-only-use-valid-font-families-in-text-tool 50-poppler-API only in patch2: unchanged: --- inkscape-0.47.0.orig/debian/patches/01-fix-manpage.dpatch +++ inkscape-0.47.0/debian/patches/01-fix-manpage.dpatch @@ -0,0 +1,70 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01-fix-manpage.dpatch by Wolfram Quester +## +## DP: update man-page +## DP: (closes: #570494) + +@DPATCH@ + +diff --git a/inkscape.pod b/inkscape.pod +index 1da1933..0406eab 100644 +--- a/inkscape.pod ++++ b/inkscape.pod +@@ -17,7 +17,7 @@ options: + + -e, --export-png=FILENAME + -a, --export-area=x0:y0:x1:y1 +- -C, --export-area-canvas ++ -C, --export-area-page + -D, --export-area-drawing + --export-area-snap + -i, --export-id=ID +@@ -106,13 +106,13 @@ In PNG export, set the exported area in SVG user units (anonymous length units n + in Inkscape SVG). The default is to export the entire document canvas. The point (0,0) + is the lower-left corner. + +-=item B<-C>, B<--export-area-canvas> ++=item B<-C>, B<--export-area-page> + +-In PNG, PDF, PS, and EPS export, exported area is the canvas (page). This is the default ++In PNG, PDF, PS, and EPS export, exported area is the page. This is the default + for PNG, PDF, and PS, so you don't need to specify this unless you are using --export-id + to export a specific object. In EPS, however, this is not the default; moreover, for EPS, + the specification of the format does not allow its bounding box to extend beyond its content. +-This means that when --export-area-canvas is used with EPS export, the canvas bounding box ++This means that when --export-area-page is used with EPS export, the canvas bounding box + will be trimmed inwards to the bounding box of the content if it is smaller. + + =item B<-D>, B<--export-area-drawing> +@@ -170,7 +170,7 @@ This value overrides the --export-dpi setting (or the DPI hint if used with --ex + For PNG, PS, EPS, and PDF export, the id attribute value of the object that you want + to export from the document; all other objects are not exported. By + default the exported area is the bounding box of the object; you can override this using +---export-area (PNG only) or --export-area-canvas. ++--export-area (PNG only) or --export-area-page. + + =item B<-j>, B<--export-id-only> + +@@ -253,11 +253,11 @@ then the value of 255 (full opacity) will be used. + + Export document(s) to PostScript format. Note that PostScript does not support transparency, so any transparent objects in the original SVG will be automatically rasterized. Used fonts are subset and embedded. The default export area is canvas; you can set it to drawing by --export-area-drawing. You can + specify --export-id to export a single object (all other are hidden); in that case +-export area is that object's bounding box, but can be set to canvas by --export-area-canvas. ++export area is that object's bounding box, but can be set to page by --export-area-page. + + =item B<-E> I, B<--export-eps>=I + +-Export document(s) to Encapsulated PostScript format. Note that PostScript does not support transparency, so any transparent objects in the original SVG will be automatically rasterized. Used fonts are subset and embedded. The default export area is drawing; you can set it to canvas, however see --export-area-canvas for applicable limitation. You can specify --export-id to export a single object (all other are hidden). ++Export document(s) to Encapsulated PostScript format. Note that PostScript does not support transparency, so any transparent objects in the original SVG will be automatically rasterized. Used fonts are subset and embedded. The default export area is drawing; you can set it to canvas, however see --export-area-page for applicable limitation. You can specify --export-id to export a single object (all other are hidden). + + =item B<-A> I, B<--export-pdf>=I + +@@ -265,7 +265,7 @@ Export document(s) to PDF format. This format preserves the + transparency in the original SVG. Used fonts are subset and embedded. + The default export area is canvas; you can set it to drawing by --export-area-drawing. You can + specify --export-id to export a single object (all other are hidden); in that case +-export area is that object's bounding box, but can be set to canvas by --export-area-canvas. ++export area is that object's bounding box, but can be set to canvas by --export-area-page. + + =item B<-T>, B<--export-text-to-path> +