[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 108ff6368a7e127c11c40cebdac6ba0f6e5102b9
Author: Andres Mejia <mcitadel at gmail.com>
Date: Tue May 12 23:07:36 2009 -0400
Update to control files.
Add myself to Uploaders field.
Add DM-Upload-Allowed: yes field.
Bumped Standards-Version to 3.8.1.
Add Build-Depends of libopenjpeg-dev and libbz2-dev.
Drop redundant use of Section: libs from binary packages.
Specify a version for Breaks field in libavformat52 package.
Add Depends entries found in debian/control to debian/control.ffmpeg-debian.
Regenerate debian/control.
diff --git a/debian/control b/debian/control
index 3df7dd3..96b684b 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,10 @@ Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at l
Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>,
Loic Minier <lool at dooz.org>,
Reinhard Tartler <siretart at tauware.de>,
- Fabian Greffrath <fabian at debian-unofficial.org>
-Standards-Version: 3.8.0
+ Fabian Greffrath <fabian at debian-unofficial.org>,
+ Andres Mejia <mcitadel at gmail.com>
+DM-Upload-Allowed: yes
+Standards-Version: 3.8.1
Vcs-Git: git://git.debian.org/git/pkg-multimedia/ffmpeg-debian.git
Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/ffmpeg-debian.git;a=summary
Homepage: http://ffmpeg.org/
@@ -24,12 +26,14 @@ Build-Depends: debhelper (>= 5.0.0),
libspeex-dev,
libtheora-dev (>> 0.0.0.alpha4),
libvorbis-dev,
+ libopenjpeg-dev,
libx11-dev,
libxext-dev,
libxvmc-dev,
quilt,
texi2html,
- zlib1g-dev
+ zlib1g-dev,
+ libbz2-dev
Package: ffmpeg
Section: video
@@ -67,7 +71,6 @@ Description: documentation of the ffmpeg API
This package contains the html doxygen documentation of the ffmpeg API.
Package: libavutil49
-Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -79,7 +82,6 @@ Description: ffmpeg utility library
object that should only be used by Debian packages.
Package: libavcodec52
-Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -91,7 +93,6 @@ Description: ffmpeg codec library
object that should only be used by Debian packages.
Package: libavdevice52
-Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -102,11 +103,10 @@ Description: ffmpeg device handling library
object that should only be used by Debian packages.
Package: libavformat52
-Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
-Breaks: libavcodec51
+Breaks: libavcodec51 (<< 3:0.svn20090303-1)
Description: ffmpeg file format library
This is the demuxer library from the ffmpeg project. It supports most
existing file formats (AVI, MPEG, OGG, Matroska, ASF...).
@@ -115,7 +115,6 @@ Description: ffmpeg file format library
object that should only be used by Debian packages.
Package: libavfilter0
-Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -126,7 +125,6 @@ Description: ffmpeg video filtering library
object that should only be used by Debian packages.
Package: libpostproc51
-Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -137,7 +135,6 @@ Description: ffmpeg video postprocessing library
object that should only be used by Debian packages.
Package: libswscale0
-Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -151,7 +148,7 @@ Package: libavutil-dev
Section: libdevel
Architecture: any
Depends: libavutil49 (>= ${binary:Version}) | libavutil-unstripped-49 (>= ${binary:Version}),
- libavutil49 (<= ${source:Upstream-Version}-99) | libavutil-unstripped-49 (<= ${source:Upstream-Version}-99)
+ libavutil49 (<= ${source:Upstream-Version}-99) | libavutil-unstripped-49 (<= ${source:Upstream-Version}-99),
Description: development files for libavutil
This is the common utility library from the ffmpeg project. It is required
by all other ffmpeg libraries.
@@ -164,7 +161,6 @@ Section: libdevel
Architecture: any
Depends: libavcodec52 (>= ${binary:Version}) | libavcodec-unstripped-52 (>= ${binary:Version}),
libavcodec52 (<= ${source:Upstream-Version}-99) | libavcodec-unstripped-52 (<= ${source:Upstream-Version}-99),
- libavutil-dev (= ${binary:Version})
Suggests: libfaad-dev,
libgsm1-dev,
libogg-dev,
@@ -188,7 +184,6 @@ Section: libdevel
Architecture: any
Depends: libavdevice52 (>= ${binary:Version}) | libavdevice-unstripped-52 (>= ${binary:Version}),
libavdevice52 (<= ${source:Upstream-Version}-99) | libavdevice-unstripped-52 (<= ${source:Upstream-Version}-99),
- libavformat-dev (= ${binary:Version})
Description: development files for libavdevice
This is the device handling library from the ffmpeg project.
.
@@ -200,7 +195,6 @@ Section: libdevel
Architecture: any
Depends: libavformat52 (>= ${binary:Version}) | libavformat-unstripped-52 (>= ${binary:Version}),
libavformat52 (<= ${source:Upstream-Version}-99) | libavformat-unstripped-52 (<= ${source:Upstream-Version}-99),
- libavcodec-dev (= ${binary:Version})
Description: development files for libavformat
This is the demuxer library from the ffmpeg project. It supports most
existing file formats (AVI, MPEG, OGG, Matroska, ASF...).
@@ -213,7 +207,6 @@ Section: libdevel
Architecture: any
Depends: libavfilter0 (>= ${binary:Version}) | libavfilter-unstripped-0 (>= ${binary:Version}),
libavfilter0 (<= ${source:Upstream-Version}-99) | libavfilter-unstripped-0 (<= ${source:Upstream-Version}-99),
- libavcodec-dev (= ${binary:Version})
Description: development files for libavfilter
This is the video filtering library from the ffmpeg project.
.
@@ -225,7 +218,6 @@ Section: libdevel
Architecture: any
Depends: libpostproc51 (>= ${binary:Version}) | libpostproc-unstripped-51 (>= ${binary:Version}),
libpostproc51 (<= ${source:Upstream-Version}-99) | libpostproc-unstripped-51 (<= ${source:Upstream-Version}-99),
- libavutil-dev (= ${binary:Version})
Description: development files for libpostproc
This is the video postprocessing library from the ffmpeg project.
.
@@ -237,7 +229,6 @@ Section: libdevel
Architecture: any
Depends: libswscale0 (>= ${binary:Version}) | libswscale-unstripped-0 (>= ${binary:Version}),
libswscale0 (<= ${source:Upstream-Version}-99) | libswscale-unstripped-0 (<= ${source:Upstream-Version}-99),
- libavutil-dev (= ${binary:Version})
Description: development files for libswscale
This is the video scaling library from the ffmpeg project.
.
diff --git a/debian/control.common b/debian/control.common
index a99c916..321e77e 100644
--- a/debian/control.common
+++ b/debian/control.common
@@ -4,8 +4,10 @@ Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at l
Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>,
Loic Minier <lool at dooz.org>,
Reinhard Tartler <siretart at tauware.de>,
- Fabian Greffrath <fabian at debian-unofficial.org>
-Standards-Version: 3.8.0
+ Fabian Greffrath <fabian at debian-unofficial.org>,
+ Andres Mejia <mcitadel at gmail.com>
+DM-Upload-Allowed: yes
+Standards-Version: 3.8.1
Vcs-Git: git://git.debian.org/git/pkg-multimedia/ffmpeg-debian.git
Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/ffmpeg-debian.git;a=summary
Homepage: http://ffmpeg.org/
diff --git a/debian/control.ffmpeg b/debian/control.ffmpeg
index b68b1e6..2994a32 100644
--- a/debian/control.ffmpeg
+++ b/debian/control.ffmpeg
@@ -11,15 +11,16 @@ Build-Depends: debhelper (>= 5.0.0),
libspeex-dev,
libtheora-dev (>> 0.0.0.alpha4),
libvorbis-dev,
+ libopenjpeg-dev,
libx11-dev,
libxext-dev,
libxvmc-dev,
quilt,
texi2html,
- zlib1g-dev
+ zlib1g-dev,
+ libbz2-dev
Package: libavutil-unstripped-49
-Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -33,7 +34,6 @@ Description: ffmpeg utility library
object that should only be used by Debian packages.
Package: libavcodec-unstripped-52
-Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -48,7 +48,6 @@ Description: ffmpeg codec library
object that should only be used by Debian packages.
Package: libavdevice-unstripped-52
-Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -61,7 +60,6 @@ Description: ffmpeg device handling library
object that should only be used by Debian packages.
Package: libavfilter-unstripped-0
-Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -72,7 +70,6 @@ Description: ffmpeg video filtering library
object that should only be used by Debian packages.
Package: libpostproc-unstripped-51
-Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -85,13 +82,12 @@ Description: ffmpeg video postprocessing library
object that should only be used by Debian packages.
Package: libavformat-unstripped-52
-Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
Conflicts: libavformatcvs52, libavformat52
Replaces: libavformatcvs52, libavformat52
-Breaks: libavcodec51
+Breaks: libavcodec51 (<< 3:0.svn20090303-1)
Description: ffmpeg file format library
This is the demuxer library from the ffmpeg project. It supports most
existing file formats (AVI, MPEG, OGG, Matroska, ASF...).
@@ -100,7 +96,6 @@ Description: ffmpeg file format library
object that should only be used by Debian packages.
Package: libswscale-unstripped-0
-Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -111,4 +106,3 @@ Description: ffmpeg video scaling library
.
This package contains a unrestricted version of the libswscale shared
object that should only be used by Debian packages.
-
diff --git a/debian/control.ffmpeg-debian b/debian/control.ffmpeg-debian
index 7a6a935..e13eb22 100644
--- a/debian/control.ffmpeg-debian
+++ b/debian/control.ffmpeg-debian
@@ -11,12 +11,14 @@ Build-Depends: debhelper (>= 5.0.0),
libspeex-dev,
libtheora-dev (>> 0.0.0.alpha4),
libvorbis-dev,
+ libopenjpeg-dev,
libx11-dev,
libxext-dev,
libxvmc-dev,
quilt,
texi2html,
- zlib1g-dev
+ zlib1g-dev,
+ libbz2-dev
Package: ffmpeg
Section: video
@@ -54,7 +56,6 @@ Description: documentation of the ffmpeg API
This package contains the html doxygen documentation of the ffmpeg API.
Package: libavutil49
-Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -66,7 +67,6 @@ Description: ffmpeg utility library
object that should only be used by Debian packages.
Package: libavcodec52
-Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -78,7 +78,6 @@ Description: ffmpeg codec library
object that should only be used by Debian packages.
Package: libavdevice52
-Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -89,11 +88,10 @@ Description: ffmpeg device handling library
object that should only be used by Debian packages.
Package: libavformat52
-Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
-Breaks: libavcodec51
+Breaks: libavcodec51 (<< 3:0.svn20090303-1)
Description: ffmpeg file format library
This is the demuxer library from the ffmpeg project. It supports most
existing file formats (AVI, MPEG, OGG, Matroska, ASF...).
@@ -102,7 +100,6 @@ Description: ffmpeg file format library
object that should only be used by Debian packages.
Package: libavfilter0
-Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -113,7 +110,6 @@ Description: ffmpeg video filtering library
object that should only be used by Debian packages.
Package: libpostproc51
-Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -124,7 +120,6 @@ Description: ffmpeg video postprocessing library
object that should only be used by Debian packages.
Package: libswscale0
-Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -137,7 +132,8 @@ Description: ffmpeg video scaling library
Package: libavutil-dev
Section: libdevel
Architecture: any
-Depends: libavutil49 (= ${binary:Version})
+Depends: libavutil49 (>= ${binary:Version}) | libavutil-unstripped-49 (>= ${binary:Version}),
+ libavutil49 (<= ${source:Upstream-Version}-99) | libavutil-unstripped-49 (<= ${source:Upstream-Version}-99),
Description: development files for libavutil
This is the common utility library from the ffmpeg project. It is required
by all other ffmpeg libraries.
@@ -148,8 +144,8 @@ Description: development files for libavutil
Package: libavcodec-dev
Section: libdevel
Architecture: any
-Depends: libavcodec52 (= ${binary:Version}),
- libavutil-dev (= ${binary:Version})
+Depends: libavcodec52 (>= ${binary:Version}) | libavcodec-unstripped-52 (>= ${binary:Version}),
+ libavcodec52 (<= ${source:Upstream-Version}-99) | libavcodec-unstripped-52 (<= ${source:Upstream-Version}-99),
Suggests: libfaad-dev,
libgsm1-dev,
libogg-dev,
@@ -171,8 +167,8 @@ Description: development files for libavcodec
Package: libavdevice-dev
Section: libdevel
Architecture: any
-Depends: libavdevice52 (= ${binary:Version}),
- libavformat-dev (= ${binary:Version})
+Depends: libavdevice52 (>= ${binary:Version}) | libavdevice-unstripped-52 (>= ${binary:Version}),
+ libavdevice52 (<= ${source:Upstream-Version}-99) | libavdevice-unstripped-52 (<= ${source:Upstream-Version}-99),
Description: development files for libavdevice
This is the device handling library from the ffmpeg project.
.
@@ -182,8 +178,8 @@ Description: development files for libavdevice
Package: libavformat-dev
Section: libdevel
Architecture: any
-Depends: libavformat52 (= ${binary:Version}),
- libavcodec-dev (= ${binary:Version})
+Depends: libavformat52 (>= ${binary:Version}) | libavformat-unstripped-52 (>= ${binary:Version}),
+ libavformat52 (<= ${source:Upstream-Version}-99) | libavformat-unstripped-52 (<= ${source:Upstream-Version}-99),
Description: development files for libavformat
This is the demuxer library from the ffmpeg project. It supports most
existing file formats (AVI, MPEG, OGG, Matroska, ASF...).
@@ -194,8 +190,8 @@ Description: development files for libavformat
Package: libavfilter-dev
Section: libdevel
Architecture: any
-Depends: libavfilter0 (= ${binary:Version}),
- libavcodec-dev (= ${binary:Version})
+Depends: libavfilter0 (>= ${binary:Version}) | libavfilter-unstripped-0 (>= ${binary:Version}),
+ libavfilter0 (<= ${source:Upstream-Version}-99) | libavfilter-unstripped-0 (<= ${source:Upstream-Version}-99),
Description: development files for libavfilter
This is the video filtering library from the ffmpeg project.
.
@@ -205,8 +201,8 @@ Description: development files for libavfilter
Package: libpostproc-dev
Section: libdevel
Architecture: any
-Depends: libpostproc51 (= ${binary:Version}),
- libavutil-dev (= ${binary:Version})
+Depends: libpostproc51 (>= ${binary:Version}) | libpostproc-unstripped-51 (>= ${binary:Version}),
+ libpostproc51 (<= ${source:Upstream-Version}-99) | libpostproc-unstripped-51 (<= ${source:Upstream-Version}-99),
Description: development files for libpostproc
This is the video postprocessing library from the ffmpeg project.
.
@@ -216,8 +212,8 @@ Description: development files for libpostproc
Package: libswscale-dev
Section: libdevel
Architecture: any
-Depends: libswscale0 (= ${binary:Version}),
- libavutil-dev (= ${binary:Version})
+Depends: libswscale0 (>= ${binary:Version}) | libswscale-unstripped-0 (>= ${binary:Version}),
+ libswscale0 (<= ${source:Upstream-Version}-99) | libswscale-unstripped-0 (<= ${source:Upstream-Version}-99),
Description: development files for libswscale
This is the video scaling library from the ffmpeg project.
.
--
FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list