r52001 - in /desktop/unstable/gtk-doc/debian: changelog patches/0002-Fix-installation-of-HTML-images.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed Feb 15 06:34:38 2017
New Revision: 52001

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=52001
Log:
Fix installation of HTML images for out-of-tree builds.
See #656803 and bgo#674163.

Added:
    desktop/unstable/gtk-doc/debian/patches/0002-Fix-installation-of-HTML-images.patch
Modified:
    desktop/unstable/gtk-doc/debian/changelog
    desktop/unstable/gtk-doc/debian/patches/series

Modified: desktop/unstable/gtk-doc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk-doc/debian/changelog?rev=52001&op=diff
==============================================================================
--- desktop/unstable/gtk-doc/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gtk-doc/debian/changelog	[utf-8] Wed Feb 15 06:34:38 2017
@@ -1,3 +1,10 @@
+gtk-doc (1.25-7) UNRELEASED; urgency=medium
+
+  * Fix installation of HTML images for out-of-tree builds.
+    See #656803 and bgo#674163.
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 15 Feb 2017 07:34:21 +0100
+
 gtk-doc (1.25-6) unstable; urgency=medium
 
   * Upload to unstable.

Added: desktop/unstable/gtk-doc/debian/patches/0002-Fix-installation-of-HTML-images.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk-doc/debian/patches/0002-Fix-installation-of-HTML-images.patch?rev=52001&op=file
==============================================================================
--- desktop/unstable/gtk-doc/debian/patches/0002-Fix-installation-of-HTML-images.patch	(added)
+++ desktop/unstable/gtk-doc/debian/patches/0002-Fix-installation-of-HTML-images.patch	[utf-8] Wed Feb 15 06:34:38 2017
@@ -0,0 +1,41 @@
+From e3cbae722613658eb50db1f213d358d5700149fa Mon Sep 17 00:00:00 2001
+From: Michael Biebl <biebl at debian.org>
+Date: Wed, 15 Feb 2017 03:53:19 +0100
+Subject: [PATCH 2/2] Fix installation of HTML images
+
+This affects out-of-tree builds where the configure script is run via an
+absolute path.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=674163
+---
+ gtk-doc.make        | 1 +
+ gtk-doc.notmpl.make | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/gtk-doc.make b/gtk-doc.make
+index d7c5fea..c9fc4d6 100644
+--- a/gtk-doc.make
++++ b/gtk-doc.make
+@@ -219,6 +219,7 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_con
+ 	  if test -f $(abs_builddir)/$$file ; then \
+ 	    cp $(abs_builddir)/$$file $(abs_builddir)/html; \
+ 	  fi; \
++	  test -f $$file && cp $$file $(abs_builddir)/html; \
+ 	done;
+ 	$(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+ 	$(AM_V_at)touch html-build.stamp
+diff --git a/gtk-doc.notmpl.make b/gtk-doc.notmpl.make
+index e4a12a5..2454c28 100644
+--- a/gtk-doc.notmpl.make
++++ b/gtk-doc.notmpl.make
+@@ -196,6 +196,7 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_con
+ 	  if test -f $(abs_builddir)/$$file ; then \
+ 	    cp $(abs_builddir)/$$file $(abs_builddir)/html; \
+ 	  fi; \
++	  test -f $$file && cp $$file $(abs_builddir)/html; \
+ 	done;
+ 	$(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+ 	$(AM_V_at)touch html-build.stamp
+-- 
+2.11.0
+

Modified: desktop/unstable/gtk-doc/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk-doc/debian/patches/series?rev=52001&op=diff
==============================================================================
--- desktop/unstable/gtk-doc/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gtk-doc/debian/patches/series	[utf-8] Wed Feb 15 06:34:38 2017
@@ -1 +1,2 @@
 0001-mkpdf-fix-exitcode.patch
+0002-Fix-installation-of-HTML-images.patch