diff -Nru gtk-doc-1.25/debian/changelog gtk-doc-1.25/debian/changelog --- gtk-doc-1.25/debian/changelog 2016-10-21 01:52:07.000000000 +0000 +++ gtk-doc-1.25/debian/changelog 2017-02-15 06:34:42.000000000 +0000 @@ -1,3 +1,10 @@ +gtk-doc (1.25-7) unstable; urgency=medium + + * Fix installation of HTML images for out-of-tree builds. + See #656803 and bgo#674163. + + -- Michael Biebl Wed, 15 Feb 2017 07:34:42 +0100 + gtk-doc (1.25-6) unstable; urgency=medium * Upload to unstable. diff -Nru gtk-doc-1.25/debian/control gtk-doc-1.25/debian/control --- gtk-doc-1.25/debian/control 2016-10-21 01:52:07.000000000 +0000 +++ gtk-doc-1.25/debian/control 2017-02-15 06:34:42.000000000 +0000 @@ -6,7 +6,7 @@ Section: gnome Priority: optional Maintainer: Debian GNOME Maintainers -Uploaders: Andreas Henriksson , Dmitry Shachnev , Emilio Pozuelo Monfort , Iain Lane , Michael Biebl +Uploaders: Dmitry Shachnev , Emilio Pozuelo Monfort , Iain Lane , Michael Biebl Standards-Version: 3.9.8 Build-Depends: debhelper (>= 10), gnome-pkg-tools (>= 0.10) diff -Nru gtk-doc-1.25/debian/patches/0002-Fix-installation-of-HTML-images.patch gtk-doc-1.25/debian/patches/0002-Fix-installation-of-HTML-images.patch --- gtk-doc-1.25/debian/patches/0002-Fix-installation-of-HTML-images.patch 1970-01-01 00:00:00.000000000 +0000 +++ gtk-doc-1.25/debian/patches/0002-Fix-installation-of-HTML-images.patch 2017-02-15 03:06:37.000000000 +0000 @@ -0,0 +1,41 @@ +From e3cbae722613658eb50db1f213d358d5700149fa Mon Sep 17 00:00:00 2001 +From: Michael Biebl +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 + diff -Nru gtk-doc-1.25/debian/patches/series gtk-doc-1.25/debian/patches/series --- gtk-doc-1.25/debian/patches/series 2016-04-20 11:53:38.000000000 +0000 +++ gtk-doc-1.25/debian/patches/series 2017-02-15 03:06:55.000000000 +0000 @@ -1 +1,2 @@ 0001-mkpdf-fix-exitcode.patch +0002-Fix-installation-of-HTML-images.patch