tags 518633 + patch
thanks

Dear maintainer,

I've prepared an NMU for inkscape (versioned as 0.46-5.1) and uploaded it
to unstable, since it is blocking the evolution-data-server transition.

Cheers,
-- 
 .''`.      Debian 5.0 "Lenny" has been released!
: :' :
`. `'   Last night, Darth Vader came down from planet Vulcan and told
  `-    me that if you don't install Lenny, he'd melt your brain.
diff -u inkscape-0.46/debian/changelog inkscape-0.46/debian/changelog
--- inkscape-0.46/debian/changelog
+++ inkscape-0.46/debian/changelog
@@ -1,3 +1,11 @@
+inkscape (0.46-5.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * 03-gtk-includes.dpatch: patch from Ubuntu to fix FTBFS caused by 
+    wrong GTK+ includes. Closes: #518633.
+
+ -- Josselin Mouette <[email protected]>  Mon, 23 Mar 2009 20:35:51 +0100
+
 inkscape (0.46-5) unstable; urgency=low
 
   * Fix error in bash completion file introduced in the last upload.
diff -u inkscape-0.46/debian/patches/00list inkscape-0.46/debian/patches/00list
--- inkscape-0.46/debian/patches/00list
+++ inkscape-0.46/debian/patches/00list
@@ -1,6 +1,7 @@
 01_mips
 02-poppler-0.8.3
 03-chinese-inkscape
+03-gtk-includes.dpatch
 04-only-use-valid-font-families-in-text-tool
 05_fix_latex_patch
 06_gcc-4.4
only in patch2:
unchanged:
--- inkscape-0.46.orig/debian/patches/03-gtk-includes.dpatch
+++ inkscape-0.46/debian/patches/03-gtk-includes.dpatch
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03-gtk-includes.dpatch by  <[email protected]>
+##
+## DP: Work around https://launchpad.net/bugs/247909 FTBFS
+
+...@dpatch@
+diff -urNad inkscape-0.46~/src/widgets/sp-xmlview-attr-list.h inkscape-0.46/src/widgets/sp-xmlview-attr-list.h
+--- inkscape-0.46~/src/widgets/sp-xmlview-attr-list.h	2008-03-11 05:20:13.000000000 +0100
++++ inkscape-0.46/src/widgets/sp-xmlview-attr-list.h	2008-08-11 12:31:37.000000000 +0200
+@@ -13,7 +13,7 @@
+  */
+ 
+ #include <stdio.h>
+-#include <gtk/gtkclist.h>
++#include <gtk/gtk.h>
+ #include "../xml/repr.h"
+ 
+ #include <glib.h>

Reply via email to