[SCM] FFmpeg packaging branch, master, updated. debian/0.5+svn20090420-2-17-gc8d8dad

ceros-guest at users.alioth.debian.org ceros-guest at users.alioth.debian.org
Wed May 13 04:10:31 UTC 2009


The following commit has been merged in the master branch:
commit 4bf3d79d802bddb86ef52f1759a849f8e6bf0743
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Tue May 12 23:33:06 2009 -0400

    Use <package>.docs files for installing documentation.
    Fix corresponding <package>.install files.
    Add ffmpeg-doc.doc-base file to register ffmpeg documentation with doc-base.

diff --git a/debian/ffmpeg-doc.doc-base b/debian/ffmpeg-doc.doc-base
new file mode 100644
index 0000000..19b81c8
--- /dev/null
+++ b/debian/ffmpeg-doc.doc-base
@@ -0,0 +1,9 @@
+Document: ffmpeg-doc
+Title: ffmpeg API Documentation
+Author: FFmpeg Developers
+Abstract: This is the main documentation for the ffmpeg API.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/ffmpeg-doc/html/index.html
+Files: /usr/share/doc/ffmpeg-doc/html/*.html
diff --git a/debian/ffmpeg-doc.docs b/debian/ffmpeg-doc.docs
new file mode 100644
index 0000000..068472e
--- /dev/null
+++ b/debian/ffmpeg-doc.docs
@@ -0,0 +1 @@
+debian/tmp/usr/share/doc/ffmpeg-doc/html
diff --git a/debian/ffmpeg-doc.install b/debian/ffmpeg-doc.install
deleted file mode 100644
index c6b16bf..0000000
--- a/debian/ffmpeg-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/ffmpeg-doc
diff --git a/debian/ffmpeg.docs b/debian/ffmpeg.docs
new file mode 100644
index 0000000..8a6ecc7
--- /dev/null
+++ b/debian/ffmpeg.docs
@@ -0,0 +1 @@
+debian/tmp/usr/share/doc/ffmpeg/html
diff --git a/debian/ffmpeg.install b/debian/ffmpeg.install
index c6671f4..98227ed 100644
--- a/debian/ffmpeg.install
+++ b/debian/ffmpeg.install
@@ -1,5 +1,4 @@
 etc
 usr/bin
-usr/share/doc/ffmpeg
 usr/share/man
 usr/share/ffmpeg/*.ffpreset

-- 
FFmpeg packaging



More information about the pkg-multimedia-commits mailing list