tags 604825 + pending thanks Dear maintainer,
I've prepared an NMU for inkscape (versioned as 0.48.0-1.1) and uploaded it to DELAYED/7. Please feel free to tell me if I should delay it longer. Regards. Grüße/Regards, Rene
diff -u inkscape-0.48.0/debian/control inkscape-0.48.0/debian/control --- inkscape-0.48.0/debian/control +++ inkscape-0.48.0/debian/control @@ -5,7 +5,9 @@ Vcs-Browser: http://git.debian.org/?p=git/collab-maint/inkscape.git Homepage: http://www.inkscape.org/ Maintainer: Wolfram Quester <[email protected]> -Build-Depends: debhelper (>= 7.0.0), +Build-Depends: autoconf, + automake, + debhelper (>= 7.0.0), dpatch, intltool, libart-2.0-dev (>= 2.3.10), @@ -26,7 +28,8 @@ libpopt-dev, libsigc++-2.0-dev (>= 2.0.16-2), libtool, - libwpg-dev, + libwpd-dev (>= 0.9.0), + libwpg-dev (>= 0.2.0), libxml-parser-perl, libxml2-dev (>= 2-2.4.24), libxslt1-dev, diff -u inkscape-0.48.0/debian/changelog inkscape-0.48.0/debian/changelog --- inkscape-0.48.0/debian/changelog +++ inkscape-0.48.0/debian/changelog @@ -1,3 +1,10 @@ +inkscape (0.48.0-1.1) unstable; urgency=low + + * Non-maintainer upload. + * build against libwpg 0.2.0 (closes: #604825) + + -- Rene Engelhard <[email protected]> Mon, 07 Feb 2011 15:24:22 +0000 + inkscape (0.48.0-1) experimental; urgency=low * [cae07a3] New Upstream version 0.48.0 diff -u inkscape-0.48.0/debian/patches/00list inkscape-0.48.0/debian/patches/00list --- inkscape-0.48.0/debian/patches/00list +++ inkscape-0.48.0/debian/patches/00list @@ -2 +2 @@ - +02-libwpg0.2 only in patch2: unchanged: --- inkscape-0.48.0.orig/debian/patches/02-libwpg0.2.dpatch +++ inkscape-0.48.0/debian/patches/02-libwpg0.2.dpatch @@ -0,0 +1,99 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_libwpd0_9.dpatch by <[email protected]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.0~/configure.ac inkscape-0.48.0/configure.ac +--- inkscape-0.48.0~/configure.ac 2010-08-04 18:45:00.000000000 +0200 ++++ inkscape-0.48.0/configure.ac 2010-11-24 15:57:38.000000000 +0100 +@@ -678,7 +678,7 @@ + dnl Check for libwpg for extension + dnl ****************************** + +-PKG_CHECK_MODULES(LIBWPG, libwpg-0.1 libwpg-stream-0.1, with_libwpg=yes, with_libwpg=no) ++PKG_CHECK_MODULES(LIBWPG, libwpg-0.2 libwpd-0.9 libwpd-stream-0.9, with_libwpg=yes, with_libwpg=no) + if test "x$with_libwpg" = "xyes"; then + AC_DEFINE(WITH_LIBWPG,1,[Build in libwpg]) + fi +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.0~/configure inkscape-0.48.0/configure +--- inkscape-0.48.0~/configure 2010-08-04 18:46:39.000000000 +0200 ++++ inkscape-0.48.0/configure 2010-11-24 15:59:19.000000000 +0100 +@@ -10297,12 +10297,12 @@ + pkg_cv_LIBWPG_CFLAGS="$LIBWPG_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwpg-0.1 libwpg-stream-0.1\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "libwpg-0.1 libwpg-stream-0.1") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwpg-0.2 libwpd-0.9 libwpd-stream-0.9\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libwpg-0.2 libwpd-0.9 libwpd-stream-0.9") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_LIBWPG_CFLAGS=`$PKG_CONFIG --cflags "libwpg-0.1 libwpg-stream-0.1" 2>/dev/null` ++ pkg_cv_LIBWPG_CFLAGS=`$PKG_CONFIG --cflags "libwpg-0.2 libwpd-0.9 libwpd-stream-0.9" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -10315,12 +10315,12 @@ + pkg_cv_LIBWPG_LIBS="$LIBWPG_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwpg-0.1 libwpg-stream-0.1\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "libwpg-0.1 libwpg-stream-0.1") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwpg-0.2 libwpd-0.9 libwpd-stream-0.9\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libwpg-0.2 libwpd-0.9 libwpd-stream-0.9") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_LIBWPG_LIBS=`$PKG_CONFIG --libs "libwpg-0.1 libwpg-stream-0.1" 2>/dev/null` ++ pkg_cv_LIBWPG_LIBS=`$PKG_CONFIG --libs "libwpg-0.2 libwpd-0.9 libwpd-stream-0.9" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -10339,9 +10339,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- LIBWPG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libwpg-0.1 libwpg-stream-0.1"` ++ LIBWPG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libwpg-0.2 libwpd-0.9 libwpd-stream-0.9"` + else +- LIBWPG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libwpg-0.1 libwpg-stream-0.1"` ++ LIBWPG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libwpg-0.2 libwpd-0.9 libwpd-stream-0.9"` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBWPG_PKG_ERRORS" >&5 +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.0~/src/extension/internal/wpg-input.cpp inkscape-0.48.0/src/extension/internal/wpg-input.cpp +--- inkscape-0.48.0~/src/extension/internal/wpg-input.cpp 2010-07-13 05:48:40.000000000 +0200 ++++ inkscape-0.48.0/src/extension/internal/wpg-input.cpp 2010-11-24 15:57:38.000000000 +0100 +@@ -49,7 +49,7 @@ + #include "document.h" + + #include "libwpg/libwpg.h" +-#include "libwpg/WPGStreamImplementation.h" ++#include "libwpd-stream/libwpd-stream.h" + + + using namespace libwpg; +@@ -61,9 +61,9 @@ + + SPDocument * + WpgInput::open(Inkscape::Extension::Input * mod, const gchar * uri) { +- WPXInputStream* input = new libwpg::WPGFileStream(uri); ++ WPXInputStream* input = new WPXFileStream(uri); + if (input->isOLEStream()) { +- WPXInputStream* olestream = input->getDocumentOLEStream(); ++ WPXInputStream* olestream = input->getDocumentOLEStream("PerfectOffice_MAIN"); + if (olestream) { + delete input; + input = olestream; +@@ -78,7 +78,7 @@ + return NULL; + } + +- libwpg::WPGString output; ++ WPXString output; + if (!libwpg::WPGraphics::generateSVG(input, output)) { + delete input; + return NULL;
