[SCM] ffmpeg/master: Move documentatation from /u/s/d/ffmpeg-doc/ to /u/s/d/ffmpeg/.

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

The following commit has been merged in the master branch:
commit 4e50081af1324d9c8586604679f16a7cd32b69e5
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Tue Feb 2 23:16:01 2016 +0100

    Move documentatation from /u/s/d/ffmpeg-doc/ to /u/s/d/ffmpeg/.
    
    This is recommended by Debian Policy 3.9.7.

diff --git a/debian/copyright b/debian/copyright
index 7e7f703..9232322 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,7 +13,7 @@ Comment:
  For libavcodec an extra flavor is built, which links against external libraries
  licensed under the Apache License 2.0, which makes it effectively licensed
  under the GPL v3+
- The HTML documentation /usr/share/doc/ffmpeg-doc/manual/*.html in the ffmpeg-doc
+ The HTML documentation /usr/share/doc/ffmpeg/manual/*.html in the ffmpeg-doc
  package is effectively licensed under GPL-3+, because during its creation
  the GPL-3+ licensed file doc/t2h.pm is used.
  .
diff --git a/debian/ffmpeg-doc.doc-base b/debian/ffmpeg-doc.doc-base
index 3db2dee..8bd5937 100644
--- a/debian/ffmpeg-doc.doc-base
+++ b/debian/ffmpeg-doc.doc-base
@@ -5,5 +5,5 @@ Abstract: This is the API documentation for FFmpeg.
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/ffmpeg-doc/api/index.html
-Files: /usr/share/doc/ffmpeg-doc/api/*.html
+Index: /usr/share/doc/ffmpeg/api/index.html
+Files: /usr/share/doc/ffmpeg/api/*.html
diff --git a/debian/ffmpeg-doc.install b/debian/ffmpeg-doc.install
index ed81051..5c25eb5 100644
--- a/debian/ffmpeg-doc.install
+++ b/debian/ffmpeg-doc.install
@@ -1,9 +1,9 @@
-debian/standard/doc/doxy/html/*		usr/share/doc/ffmpeg-doc/api
-doc/examples/*.c					usr/share/doc/ffmpeg-doc/examples
-doc/examples/Makefile				usr/share/doc/ffmpeg-doc/examples
-doc/examples/README					usr/share/doc/ffmpeg-doc/examples
-debian/standard/doc/*.html			usr/share/doc/ffmpeg-doc/manual
-debian/standard/doc/style.min.css	usr/share/doc/ffmpeg-doc/manual
-doc/APIchanges						usr/share/doc/ffmpeg-doc/developer-info
-doc/*.txt							usr/share/doc/ffmpeg-doc/developer-info
+debian/standard/doc/doxy/html/*		usr/share/doc/ffmpeg/api
+doc/examples/*.c					usr/share/doc/ffmpeg/examples
+doc/examples/Makefile				usr/share/doc/ffmpeg/examples
+doc/examples/README					usr/share/doc/ffmpeg/examples
+debian/standard/doc/*.html			usr/share/doc/ffmpeg/manual
+debian/standard/doc/style.min.css	usr/share/doc/ffmpeg/manual
+doc/APIchanges						usr/share/doc/ffmpeg/developer-info
+doc/*.txt							usr/share/doc/ffmpeg/developer-info
 usr/share/man/man3
diff --git a/debian/ffmpeg-doc.links b/debian/ffmpeg-doc.links
index b46903f..8c3449f 100644
--- a/debian/ffmpeg-doc.links
+++ b/debian/ffmpeg-doc.links
@@ -1,2 +1,2 @@
-usr/share/javascript/jquery/jquery.min.js usr/share/doc/ffmpeg-doc/api/jquery.js
-usr/share/javascript/bootstrap/css/bootstrap.min.css usr/share/doc/ffmpeg-doc/manual/bootstrap.min.css
+usr/share/javascript/jquery/jquery.min.js usr/share/doc/ffmpeg/api/jquery.js
+usr/share/javascript/bootstrap/css/bootstrap.min.css usr/share/doc/ffmpeg/manual/bootstrap.min.css
diff --git a/debian/tests/examples b/debian/tests/examples
index 9dd8b02..06b5d2e 100755
--- a/debian/tests/examples
+++ b/debian/tests/examples
@@ -7,7 +7,7 @@ set -e
 echo "ADTTMP directory: $ADTTMP"
 cd "$ADTTMP"
 
-cp -r /usr/share/doc/ffmpeg-doc/examples ./
+cp -r /usr/share/doc/ffmpeg/examples ./
 cd examples
 
 echo "building the examples..."

-- 
ffmpeg packaging