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

[pochu at users.alioth.debian.org]

Author: pochu
Date: Sat Sep 16 10:08:16 2017
New Revision: 53978

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=53978
Log:
* debian/patches/0002-Fix-installation-of-HTML-images.patch:
  + Refreshed.

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

Modified: desktop/unstable/gtk-doc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk-doc/debian/changelog?rev=53978&op=diff
==============================================================================
--- desktop/unstable/gtk-doc/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gtk-doc/debian/changelog	[utf-8] Sat Sep 16 10:08:16 2017
@@ -6,6 +6,8 @@
     + Dropped, obsolete.
   * d/patches/0001-tests-label-parts-with-decimals-not-roman-numerals.patch:
     + New patch from upstream git, fix some test cases.
+  * debian/patches/0002-Fix-installation-of-HTML-images.patch:
+    + Refreshed.
 
  -- Emilio Pozuelo Monfort <pochu at debian.org>  Tue, 12 Sep 2017 19:01:31 +0200
 

Modified: 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=53978&op=diff
==============================================================================
--- desktop/unstable/gtk-doc/debian/patches/0002-Fix-installation-of-HTML-images.patch	[utf-8] (original)
+++ desktop/unstable/gtk-doc/debian/patches/0002-Fix-installation-of-HTML-images.patch	[utf-8] Sat Sep 16 10:08:16 2017
@@ -1,7 +1,7 @@
-From e3cbae722613658eb50db1f213d358d5700149fa Mon Sep 17 00:00:00 2001
+From 84a7814ae572cb484424b61aafbc70d91b19f409 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
+Subject: [PATCH] Fix installation of HTML images
 
 This affects out-of-tree builds where the configure script is run via an
 absolute path.
@@ -9,29 +9,29 @@
 https://bugzilla.gnome.org/show_bug.cgi?id=674163
 ---
  gtk-doc.make        | 1 +
- gtk-doc.notmpl.make | 1 +
+ gtk-doc.flat.make | 1 +
  2 files changed, 2 insertions(+)
 
 diff --git a/gtk-doc.make b/gtk-doc.make
-index d7c5fea..c9fc4d6 100644
+index b091d88..26dd188 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; \
+@@ -215,6 +215,7 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_con
+ 	for file in $(HTML_IMAGES) ; do \
+ 	  test -f $(abs_srcdir)/$$file && cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
+ 	  test -f $(abs_builddir)/$$file && cp $(abs_builddir)/$$file $(abs_builddir)/html; \
 +	  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; \
+diff --git a/gtk-doc.flat.make b/gtk-doc.flat.make
+index 5709b54..dfcc7dd 100644
+--- a/gtk-doc.flat.make
++++ b/gtk-doc.flat.make
+@@ -191,6 +191,7 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_con
+ 	for file in $(HTML_IMAGES) ; do \
+ 	  test -f $(abs_srcdir)/$$file && cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
+ 	  test -f $(abs_builddir)/$$file && cp $(abs_builddir)/$$file $(abs_builddir)/html; \
 +	  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)