[SCM] ffmpeg/master: Update doc-make-apidoc-output-independent-of-SRC_PATH.patch.

[aca-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 59082419c03d3cf360e212c7cb965fa398b30d46
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Fri Jan 15 19:51:14 2016 +0100

    Update doc-make-apidoc-output-independent-of-SRC_PATH.patch.

diff --git a/debian/patches/doc-make-apidoc-output-independent-of-SRC_PATH.patch b/debian/patches/doc-make-apidoc-output-independent-of-SRC_PATH.patch
index e402cac..64b8009 100644
--- a/debian/patches/doc-make-apidoc-output-independent-of-SRC_PATH.patch
+++ b/debian/patches/doc-make-apidoc-output-independent-of-SRC_PATH.patch
@@ -1,18 +1,18 @@
-From 1a7fb319f598efb0f67ae1a3a6fa9ac730efa9cb Mon Sep 17 00:00:00 2001
 From: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
 Date: Sun, 20 Dec 2015 22:20:57 +0100
-Subject: [PATCH] doc: make apidoc output independent of SRC_PATH
+Subject: doc: make apidoc output independent of SRC_PATH
 
 Previously it included the SRC_PATH in every title.
 
+Reviewed-by: Michael Niedermayer <michael at niedermayer.cc>
 Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
 ---
  doc/Makefile        |  7 ++++---
- doc/doxy-wrapper.sh | 11 ++++++-----
- 2 files changed, 10 insertions(+), 8 deletions(-)
+ doc/doxy-wrapper.sh | 10 +++++-----
+ 2 files changed, 9 insertions(+), 8 deletions(-)
 
 diff --git a/doc/Makefile b/doc/Makefile
-index 3e67c2a..afa7e22 100644
+index 3e67c2a..4a77aac 100644
 --- a/doc/Makefile
 +++ b/doc/Makefile
 @@ -124,11 +124,12 @@ $(DOCS) doc/doxy/html: | doc/
@@ -27,15 +27,15 @@ index 3e67c2a..afa7e22 100644
 -doc/doxy/html: $(SRC_PATH)/doc/Doxyfile $(SRC_PATH)/doc/doxy-wrapper.sh $(DOXY_INPUT)
 -	$(M)$(SRC_PATH)/doc/doxy-wrapper.sh $(SRC_PATH) $< $(DOXYGEN) $(DOXY_INPUT)
 +doc/doxy/html: $(SRC_PATH)/doc/Doxyfile $(SRC_PATH)/doc/doxy-wrapper.sh $(DOXY_INPUT_DEPS)
-+	OUT_DIR=$$PWD/doc/doxy; cd $(SRC_PATH); $(M)./doc/doxy-wrapper.sh $$OUT_DIR $< $(DOXYGEN) $(DOXY_INPUT);
++	$(M)OUT_DIR=$$PWD/doc/doxy; cd $(SRC_PATH); ./doc/doxy-wrapper.sh $$OUT_DIR $< $(DOXYGEN) $(DOXY_INPUT);
  
  install-doc: install-html install-man
  
 diff --git a/doc/doxy-wrapper.sh b/doc/doxy-wrapper.sh
-index 9720e54..0c02777 100755
+index 9720e54..fe0102b 100755
 --- a/doc/doxy-wrapper.sh
 +++ b/doc/doxy-wrapper.sh
-@@ -1,21 +1,22 @@
+@@ -1,21 +1,21 @@
  #!/bin/sh
  
 -SRC_PATH="${1}"
@@ -58,11 +58,7 @@ index 9720e54..0c02777 100755
  @INCLUDE        = ${DOXYFILE}
  INPUT           = $@
 -EXAMPLE_PATH    = ${SRC_PATH}/doc/examples
-+EXAMPLE_PATH    = doc/examples
  HTML_TIMESTAMP  = NO
  PROJECT_NUMBER  = $VERSION
 +OUTPUT_DIRECTORY = $OUT_DIR
  EOF
--- 
-2.6.2
-

-- 
ffmpeg packaging