r30902 - in /desktop/experimental/gtk+3.0/debian: changelog patches/70-Fix-document-generation-in-out-of-tree-builds.patch patches/series

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Fri Oct 21 14:56:15 2011
New Revision: 30902

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=30902
Log:
* debian/patches/70-Fix-document-generation-in-out-of-tree-builds.patch:
  + Added, fix documentation when build out of tree

Added:
    desktop/experimental/gtk+3.0/debian/patches/70-Fix-document-generation-in-out-of-tree-builds.patch
Modified:
    desktop/experimental/gtk+3.0/debian/changelog
    desktop/experimental/gtk+3.0/debian/patches/series

Modified: desktop/experimental/gtk+3.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/changelog?rev=30902&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/changelog [utf-8] Fri Oct 21 14:56:15 2011
@@ -24,8 +24,10 @@
   * debian/libgtk-3-0.symbols: Update symbols
   * Remove libgail-3-common package. Modules have been integrated directly into
     Gtk
-
- -- Sjoerd Simons <sjoerd at debian.org>  Mon, 17 Oct 2011 17:37:58 +0100
+  * debian/patches/70-Fix-document-generation-in-out-of-tree-builds.patch:
+    + Added, fix documentation when build out of tree
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Fri, 21 Oct 2011 16:55:47 +0200
 
 gtk+3.0 (3.0.12-3) unstable; urgency=low
 

Added: desktop/experimental/gtk+3.0/debian/patches/70-Fix-document-generation-in-out-of-tree-builds.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/70-Fix-document-generation-in-out-of-tree-builds.patch?rev=30902&op=file
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/70-Fix-document-generation-in-out-of-tree-builds.patch (added)
+++ desktop/experimental/gtk+3.0/debian/patches/70-Fix-document-generation-in-out-of-tree-builds.patch [utf-8] Fri Oct 21 14:56:15 2011
@@ -1,0 +1,53 @@
+From 34053dc5def2f393a92eb17814682b2e9b73ef27 Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <sjoerd at luon.net>
+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
+

Modified: desktop/experimental/gtk+3.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/series?rev=30902&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/series [utf-8] Fri Oct 21 14:56:15 2011
@@ -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