diff --git a/debian/changelog b/debian/changelog index 5b54c481f0..f5bbc8c72e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,8 +24,10 @@ gtk+3.0 (3.2.1-1) UNRELEASED; urgency=low * debian/libgtk-3-0.symbols: Update symbols * Remove libgail-3-common package. Modules have been integrated directly into Gtk + * debian/patches/70-Fix-document-generation-in-out-of-tree-builds.patch: + + Added, fix documentation when build out of tree - -- Sjoerd Simons Mon, 17 Oct 2011 17:37:58 +0100 + -- Sjoerd Simons Fri, 21 Oct 2011 16:55:47 +0200 gtk+3.0 (3.0.12-3) unstable; urgency=low diff --git a/debian/patches/70-Fix-document-generation-in-out-of-tree-builds.patch b/debian/patches/70-Fix-document-generation-in-out-of-tree-builds.patch new file mode 100644 index 0000000000..a18e71d685 --- /dev/null +++ b/debian/patches/70-Fix-document-generation-in-out-of-tree-builds.patch @@ -0,0 +1,53 @@ +From 34053dc5def2f393a92eb17814682b2e9b73ef27 Mon Sep 17 00:00:00 2001 +From: Sjoerd Simons +Date: Fri, 21 Oct 2011 15:55:50 +0200 +Subject: [PATCH] Fix document generation in out of tree builds + +--- + docs/reference/gdk/Makefile.am | 2 +- + docs/reference/gtk/Makefile.am | 2 +- + docs/reference/libgail-util/Makefile.am | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/docs/reference/gdk/Makefile.am b/docs/reference/gdk/Makefile.am +index aab34e3..e73c955 100644 +--- a/docs/reference/gdk/Makefile.am ++++ b/docs/reference/gdk/Makefile.am +@@ -12,7 +12,7 @@ DOC_MAIN_SGML_FILE=gdk-docs.sgml + SCAN_OPTIONS=--deprecated-guards="GDK_ENABLE_BROKEN|GDK_DISABLE_DEPRECATED" + + # The directory containing the source code. Relative to $(srcdir) +-DOC_SOURCE_DIR=../../../gdk ../../../gdk/x11 ++DOC_SOURCE_DIR=$(top_srcdir)/gdk $(top_srcdir)/gdk/x11 + + # Used for dependencies + HFILE_GLOB=$(top_srcdir)/gdk/*.h $(top_srcdir)/gdk/x11/gdkx.h +diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am +index 153ecfc..4e64367 100644 +--- a/docs/reference/gtk/Makefile.am ++++ b/docs/reference/gtk/Makefile.am +@@ -12,7 +12,7 @@ DOC_MAIN_SGML_FILE=gtk-docs.sgml + SCAN_OPTIONS=--deprecated-guards="GTK_ENABLE_BROKEN|GTK_DISABLE_DEPRECATED" + + # The directory containing the source code. Relative to $(srcdir) +-DOC_SOURCE_DIR=../../../gtk ++DOC_SOURCE_DIR=$(top_srcdir)/gtk + + # Used for dependencies + HFILE_GLOB=$(top_srcdir)/gtk/*.h +diff --git a/docs/reference/libgail-util/Makefile.am b/docs/reference/libgail-util/Makefile.am +index 3b52a0f..79bb551 100644 +--- a/docs/reference/libgail-util/Makefile.am ++++ b/docs/reference/libgail-util/Makefile.am +@@ -9,7 +9,7 @@ DOC_MODULE=gail-libgail-util3 + DOC_MAIN_SGML_FILE=gail-libgail-util-docs.sgml + + # The directory containing the source code (if it contains documentation). +-DOC_SOURCE_DIR=../../../libgail-util ++DOC_SOURCE_DIR=$(top_srcdir)/libgail-util + + # Used for dependencies + HFILE_GLOB = $(top_srcdir)/libgail-util/*.h +-- +1.7.7 + diff --git a/debian/patches/series b/debian/patches/series index 4266e09e15..533249d2d6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,3 +7,4 @@ 043_notebook_scroll.patch 044_tracker_fts.patch 060_ignore-random-icons.patch +70-Fix-document-generation-in-out-of-tree-builds.patch