r30903 - in /desktop/experimental/glib2.0/debian: changelog patches/80_gtk_doc_out_of_tree.patch patches/series

sjoerd at users.alioth.debian.org sjoerd at users.alioth.debian.org
Fri Oct 21 14:57:48 UTC 2011


Author: sjoerd
Date: Fri Oct 21 14:57:47 2011
New Revision: 30903

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=30903
Log:
* debian/patches/80_gtk_doc_out_of_tree.patch:
  - Added. Fix documentation generation when build out of tree

Added:
    desktop/experimental/glib2.0/debian/patches/80_gtk_doc_out_of_tree.patch
Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/patches/series

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=30903&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Fri Oct 21 14:57:47 2011
@@ -1,9 +1,14 @@
 glib2.0 (2.30.1-2) UNRELEASED; urgency=low
 
+  [ Martin Pitt ]
   * debian/patches/01_gettext-desktopfiles.patch:
     - Translate X-GNOME-FullName and X-GNOME-Keywords, too.
 
- -- Martin Pitt <mpitt at debian.org>  Fri, 21 Oct 2011 12:35:24 +0200
+  [ Sjoerd Simons ]
+  * debian/patches/80_gtk_doc_out_of_tree.patch:
+    - Added. Fix documentation generation when build out of tree
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Fri, 21 Oct 2011 16:57:26 +0200
 
 glib2.0 (2.30.1-1) experimental; urgency=low
 

Added: desktop/experimental/glib2.0/debian/patches/80_gtk_doc_out_of_tree.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/80_gtk_doc_out_of_tree.patch?rev=30903&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/80_gtk_doc_out_of_tree.patch (added)
+++ desktop/experimental/glib2.0/debian/patches/80_gtk_doc_out_of_tree.patch [utf-8] Fri Oct 21 14:57:47 2011
@@ -1,0 +1,39 @@
+From d01bdc2ab3e13ad6843363a679d56b31b8969780 Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <sjoerd at luon.net>
+Date: Fri, 21 Oct 2011 15:40:56 +0200
+Subject: [PATCH] Fix document generation in out of tree builds
+
+---
+ docs/reference/glib/Makefile.am    |    2 +-
+ docs/reference/gobject/Makefile.am |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/docs/reference/glib/Makefile.am b/docs/reference/glib/Makefile.am
+index 72bfc81..b9a305e 100644
+--- a/docs/reference/glib/Makefile.am
++++ b/docs/reference/glib/Makefile.am
+@@ -10,7 +10,7 @@ DOC_MODULE=glib
+ DOC_MAIN_SGML_FILE=glib-docs.sgml
+ 
+ # The directory containing the source code. Relative to $(srcdir)
+-DOC_SOURCE_DIR=../../../glib ../../../gmodule
++DOC_SOURCE_DIR=$(top_srcdir)/glib $(top_srcdir)/gmodule
+ 
+ # Extra options to supply to gtkdoc-scan
+ SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED" --ignore-decorators="GLIB_VAR"
+diff --git a/docs/reference/gobject/Makefile.am b/docs/reference/gobject/Makefile.am
+index a326f81..d387014 100644
+--- a/docs/reference/gobject/Makefile.am
++++ b/docs/reference/gobject/Makefile.am
+@@ -10,7 +10,7 @@ DOC_MODULE=gobject
+ DOC_MAIN_SGML_FILE=gobject-docs.sgml
+ 
+ # The directory containing the source code. Relative to $(srcdir)
+-DOC_SOURCE_DIR=../../../gobject
++DOC_SOURCE_DIR=$(top_srcdir)/gobject
+ 
+ # Extra options to supply to gtkdoc-scan
+ SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED" \
+-- 
+1.7.7
+

Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=30903&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series [utf-8] Fri Oct 21 14:57:47 2011
@@ -4,3 +4,4 @@
 04_homedir_env.patch
 61_glib-compile-schemas-path.patch
 70-fix-race-in-gdbus-connection-test.patch
+80_gtk_doc_out_of_tree.patch




More information about the pkg-gnome-commits mailing list