diff -Nru gtk+3.0-3.10.7/debian/changelog gtk+3.0-3.10.7/debian/changelog --- gtk+3.0-3.10.7/debian/changelog 2014-02-15 13:20:29.000000000 +0000 +++ gtk+3.0-3.10.7/debian/changelog 2014-02-27 22:50:50.000000000 +0000 @@ -1,3 +1,11 @@ +gtk+3.0 (3.10.7-1+rpi1) jessie-staging; urgency=medium + + * debian/patches/git_new_gtkdoc_build.patch: + - backport commit to fix the build with the new gtk-doc (lp: #1283226) + - Patch taken from version 3.10.7-0ubuntu3 thanks to Sebastien Bacher + + -- Peter Michael Green Thu, 27 Feb 2014 22:50:00 +0000 + gtk+3.0 (3.10.7-1) unstable; urgency=low * debian/libgtk-3-bin.install: diff -Nru gtk+3.0-3.10.7/debian/patches/git_new_gtkdoc_build.patch gtk+3.0-3.10.7/debian/patches/git_new_gtkdoc_build.patch --- gtk+3.0-3.10.7/debian/patches/git_new_gtkdoc_build.patch 1970-01-01 00:00:00.000000000 +0000 +++ gtk+3.0-3.10.7/debian/patches/git_new_gtkdoc_build.patch 2014-02-27 22:49:33.000000000 +0000 @@ -0,0 +1,49 @@ +From f5db0e7c75e9db6f76f1196fc3d12c8be43911b5 Mon Sep 17 00:00:00 2001 +From: William Jon McCann +Date: Sat, 01 Feb 2014 09:35:54 +0000 +Subject: docs: remove spurious para + +--- +Index: gtk+3.0-3.10.7/gtk/deprecated/gtkactiongroup.c +=================================================================== +--- gtk+3.0-3.10.7.orig/gtk/deprecated/gtkactiongroup.c 2014-02-25 11:38:50.647645945 +0100 ++++ gtk+3.0-3.10.7/gtk/deprecated/gtkactiongroup.c 2014-02-25 11:38:50.643645945 +0100 +@@ -43,7 +43,7 @@ + * actions that act on that document (eg. save, cut/copy/paste, etc). Each + * window's menus would be constructed from a combination of two action + * groups. +- * ++ * + * + * Accelerators are handled by the GTK+ accelerator map. All actions are + * assigned an accelerator path (which normally has the form +@@ -52,6 +52,7 @@ + * and toolitems take on this accelerator path. The GTK+ accelerator map + * code makes sure that the correct shortcut is displayed next to the menu + * item. ++ * + * + * + * GtkActionGroup as GtkBuildable +Index: gtk+3.0-3.10.7/gtk/gtkmain.c +=================================================================== +--- gtk+3.0-3.10.7.orig/gtk/gtkmain.c 2014-02-25 11:38:50.647645945 +0100 ++++ gtk+3.0-3.10.7/gtk/gtkmain.c 2014-02-25 11:38:50.643645945 +0100 +@@ -52,7 +52,7 @@ + * example, when an Open button is clicked you might display a + * #GtkFileChooserDialog. After a callback finishes, GTK+ will return to the + * main loop and await more user input. +- * ++ * + * + * Typical <function>main()</function> function for a GTK+ application + * +@@ -82,7 +82,7 @@ + * } + * + * +- * ++ * + * It's OK to use the GLib main loop directly instead of gtk_main(), though it + * involves slightly more typing. See #GMainLoop in the GLib documentation. + */ diff -Nru gtk+3.0-3.10.7/debian/patches/series gtk+3.0-3.10.7/debian/patches/series --- gtk+3.0-3.10.7/debian/patches/series 2014-02-15 13:14:46.000000000 +0000 +++ gtk+3.0-3.10.7/debian/patches/series 2014-02-27 22:49:49.000000000 +0000 @@ -12,3 +12,4 @@ 061_multiarch_module_fallback.patch 071_fix-installation-of-HTML-images.patch 080_disable-parallel-docs-build.patch +git_new_gtkdoc_build.patch