[SCM] ffmpeg/ubuntu.extra: Switch to libav packages

Sun Mar 20 10:15:03 UTC 2011

The following commit has been merged in the ubuntu.extra branch:
commit 72e85c143b8513ec9532ca2dd6e2b6446d8891e5
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Mar 20 10:43:15 2011 +0100

    Switch to libav packages
    
    ffmpeg-doc -> libav-doc
    ffmpeg-dbg -> libav-dbg

diff --git a/debian/changelog b/debian/changelog
index 09d522a..4f8eceb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libav-extra (4:0.6.2-0ubuntu1) natty; urgency=low
+
+  * rename to libav-extra
+
+ -- Reinhard Tartler <siretart at tauware.de>  Sun, 20 Mar 2011 10:48:16 +0100
+
 ffmpeg-extra (4:0.6.1-2ubuntu1) natty; urgency=low
 
   * merge from 'main' package. Changes:
diff --git a/debian/control b/debian/control
index 296d635..45d2576 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: ffmpeg-extra
+Source: libav-extra
 Section: libs
 Priority: optional
 Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss at lists.ubuntu.com>
@@ -11,9 +11,9 @@ Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>,
  Jonas Smedegaard <dr at jones.dk>
 DM-Upload-Allowed: yes
 Standards-Version: 3.9.1
-Vcs-Git: git://git.debian.org/git/pkg-multimedia/ffmpeg.git
-Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/ffmpeg.git;a=summary
-Homepage: http://ffmpeg.org/
+Vcs-Git: git://git.debian.org/git/pkg-multimedia/libav.git
+Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/libav.git;a=summary
+Homepage: http://libav.org/
 Build-Depends: debhelper (>= 7),
  libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  libbz2-dev,
@@ -53,9 +53,9 @@ Depends: ${shlibs:Depends},
          ${misc:Depends}
 Conflicts: libavutil50
 Replaces: libavutil50
-Description: ffmpeg utility library
- This is the common utility library from the ffmpeg project. It is required
- by all other ffmpeg libraries.
+Description: Libav utility library
+ This is the common utility library from the Libav project. It is required
+ by all other Libav libraries.
  .
  This package contains a unrestricted version of the libavutil shared
  object that should only be used by Debian packages.
@@ -67,9 +67,11 @@ Depends: ${shlibs:Depends},
 Suggests: libfaad0
 Conflicts: libavcodec52
 Replaces: libavcodec52, ffmpeg (<< 4:0.5.1-1)
-Description: ffmpeg codec library
- This is the codec library from the ffmpeg project. It supports most existing
- encoding formats (MPEG, DivX, MPEG4, AC3, DV...).
+Description: Libav codec library
+ This package contains the ffplay multimedia player, the ffserver streaming
+ server and the Libav audio and video encoder. They support most existing
+ file formats (AVI, MPEG, OGG, Matroska, ASF...) and encoding formats (MPEG,
+ DivX, MPEG4, AC3, DV...).
  .
  This package contains a unrestricted version of the libavcodec shared
  object that should only be used by Debian packages.
@@ -80,8 +82,8 @@ Depends: ${shlibs:Depends},
  ${misc:Depends}
 Conflicts: libavdevice52
 Replaces: libavdevice52
-Description: ffmpeg device handling library
- This is the device handling library from the ffmpeg project.
+Description: Libav device handling library
+ This is the device handling library from the Libav project.
  .
  This package contains a unrestricted version of the libavdevice shared
  object that should only be used by Debian packages.
@@ -92,8 +94,8 @@ Depends: ${shlibs:Depends},
  ${misc:Depends}
 Conflicts: libavfilter1
 Replaces: libavfilter1
-Description: ffmpeg video filtering library
- This is the video filtering library from the ffmpeg project.
+Description: Libav video postprocessing library
+ This is the video postprocessing library from Libav.
  .
  This package contains a unrestricted version of the libavfilter shared
  object that should only be used by Debian packages.
@@ -104,8 +106,8 @@ Depends: ${shlibs:Depends},
  ${misc:Depends}
 Conflicts: libpostproc51
 Replaces: libpostproc51
-Description: ffmpeg video postprocessing library
- This is the video postprocessing library from the ffmpeg project.
+Description: Libav video postprocessing library
+ This is the video postprocessing library from the Libav project.
  .
  This package contains a unrestricted version of the libpostproc shared
  object that should only be used by Debian packages.
@@ -117,8 +119,8 @@ Depends: ${shlibs:Depends},
 Conflicts: libavformat52
 Replaces: libavformat52
 Breaks: libavcodec51, mplayer (<< 2:1.0~rc4~)
-Description: ffmpeg file format library
- This is the demuxer library from the ffmpeg project. It supports most
+Description: Libav file format library
+ This is the demuxer library from the Libav project. It supports most
  existing file formats (AVI, MPEG, OGG, Matroska, ASF...).
  .
  This package contains a unrestricted version of the libavformat shared
@@ -130,8 +132,8 @@ Depends: ${shlibs:Depends},
  ${misc:Depends}
 Conflicts: libswscale0
 Replaces: libswscale0
-Description: ffmpeg video scaling library
- This is the video scaling library from the ffmpeg project.
+Description: Libav video scaling library
+ This is the video scaling library from the Libav project.
  .
  This package contains a unrestricted version of the libswscale shared
  object that should only be used by Debian packages.
diff --git a/debian/ffmpeg-doc.docs b/debian/ffmpeg-doc.docs
deleted file mode 100644
index 068472e..0000000
--- a/debian/ffmpeg-doc.docs
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/share/doc/ffmpeg-doc/html
diff --git a/debian/ffmpeg-doc.doc-base b/debian/libav-doc.doc-base
similarity index 65%
rename from debian/ffmpeg-doc.doc-base
rename to debian/libav-doc.doc-base
index 19b81c8..014a90b 100644
--- a/debian/ffmpeg-doc.doc-base
+++ b/debian/libav-doc.doc-base
@@ -5,5 +5,5 @@ 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
+Index: /usr/share/doc/libav-doc/html/index.html
+Files: /usr/share/doc/libav-doc/html/*.html
diff --git a/debian/libav-doc.docs b/debian/libav-doc.docs
new file mode 100644
index 0000000..18e0681
--- /dev/null
+++ b/debian/libav-doc.docs
@@ -0,0 +1 @@
+debian/tmp/usr/share/doc/libav-doc/html

-- 
Libav/FFmpeg packaging

