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

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Thu May 14 07:06:18 UTC 2009


The following commit has been merged in the master branch:
commit 7919bb1d575f70d25422aeb7784366824a442328
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu May 14 07:43:27 2009 +0200

    remove debian/control.* mechanism
    
    as discussed on pkg-multimedia, maintaining the flavors in control.*
    does cause more maintenance overhead than its worth. They have already
    been removed in the mplayer package, and are now being removed in the
    ffmpeg package. The unstripped variants should be built from the
    master.unstripped branch instead.

diff --git a/debian/control.common b/debian/control.common
deleted file mode 100644
index 321e77e..0000000
--- a/debian/control.common
+++ /dev/null
@@ -1,14 +0,0 @@
-Section: libs
-Priority: optional
-Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-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>,
-           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/
-Build-Depends-Indep: doxygen
diff --git a/debian/control.ffmpeg b/debian/control.ffmpeg
deleted file mode 100644
index a5ebe67..0000000
--- a/debian/control.ffmpeg
+++ /dev/null
@@ -1,108 +0,0 @@
-Build-Depends: debhelper (>= 6.0.7~),
-               libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
-               libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
-               libfaad-dev | libfaad2-dev,
-               libfreetype6-dev,
-               libgsm1-dev,
-               libimlib2-dev,
-               libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
-               libsdl1.2-dev,
-               libschroedinger-dev,
-               libspeex-dev,
-               libtheora-dev (>> 0.0.0.alpha4),
-               libvorbis-dev,
-               libopenjpeg-dev,
-               libx11-dev,
-               libxext-dev,
-               libxvmc-dev,
-               quilt,
-               texi2html,
-               zlib1g-dev,
-               libbz2-dev
-
-Package: libavutil-unstripped-49
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Conflicts: libavutilcvs49, libavutil49
-Replaces: libavutilcvs49, libavutil49
-Description: ffmpeg utility library
- This is the common utility library from the ffmpeg project. It is required
- by all other ffmpeg libraries.
- .
- This package contains a unrestricted version of the libavutil shared
- object that should only be used by Debian packages.
-
-Package: libavcodec-unstripped-52
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Suggests: libfaad0
-Conflicts: libavcodec52
-Replaces: libavcodec52
-Description: ffmpeg codec library
- This is the codec library from the ffmpeg project. It supports most existing
- 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.
-
-Package: libavdevice-unstripped-52
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Conflicts: libavdevicecvs52, libavdevice52
-Replaces: libavdevicecvs52, libavdevice52
-Description: ffmpeg device handling library
- This is the device handling library from the ffmpeg project.
- .
- This package contains a unrestricted version of the libavdevice shared
- object that should only be used by Debian packages.
-
-Package: libavfilter-unstripped-0
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Description: ffmpeg video filtering library
- This is the video filtering library from the ffmpeg project.
- .
- This package contains a unrestricted version of the libavfilter shared
- object that should only be used by Debian packages.
-
-Package: libpostproc-unstripped-51
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Conflicts: libpostproccvs51, libpostproc51
-Replaces: libpostproccvs51, libpostproc51
-Description: ffmpeg video postprocessing library
- This is the video postprocessing library from the ffmpeg project.
- .
- This package contains a unrestricted version of the libpostproc shared
- object that should only be used by Debian packages.
-
-Package: libavformat-unstripped-52
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Conflicts: libavformatcvs52, libavformat52
-Replaces: libavformatcvs52, libavformat52
-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...).
- .
- This package contains a unrestricted version of the libavformat shared
- object that should only be used by Debian packages.
-
-Package: libswscale-unstripped-0
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Conflicts: libswscalecvs0, libswscale0
-Replaces: libswscalecvs0, libswscale0
-Description: ffmpeg video scaling library
- This is the video scaling library from the ffmpeg project.
- .
- 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
deleted file mode 100644
index fb21704..0000000
--- a/debian/control.ffmpeg-debian
+++ /dev/null
@@ -1,221 +0,0 @@
-Build-Depends: debhelper (>= 6.0.7~),
-               libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
-               libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
-               libfaad-dev | libfaad2-dev,
-               libfreetype6-dev,
-               libgsm1-dev,
-               libimlib2-dev,
-               libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
-               libsdl1.2-dev,
-               libschroedinger-dev,
-               libspeex-dev,
-               libtheora-dev (>> 0.0.0.alpha4),
-               libvorbis-dev,
-               libopenjpeg-dev,
-               libx11-dev,
-               libxext-dev,
-               libxvmc-dev,
-               quilt,
-               texi2html,
-               zlib1g-dev,
-               libbz2-dev
-
-Package: ffmpeg
-Section: video
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Description: multimedia player, server and encoder
- This package contains the ffplay multimedia player, the ffserver streaming
- server and the ffmpeg audio and video encoder. They support most existing
- file formats (AVI, MPEG, OGG, Matroska, ASF...) and encoding formats (MPEG,
- DivX, MPEG4, AC3, DV...).
-
-Package: ffmpeg-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: libavutil49 (= ${binary:Version}),
-         libavcodec52 (= ${binary:Version}),
-         libavdevice52 (= ${binary:Version}),
-         libpostproc51 (= ${binary:Version}),
-         libavformat52 (= ${binary:Version}),
-         libswscale0 (= ${binary:Version}),
-         ffmpeg (= ${binary:Version})
-Description: Debug symbols for ffmpeg related packages
- This package contains debug data of the ffmpeg related shared libraries.
- .
- Most people will not need this package. Please install it to produce useful
- stacktraces to help debugging the ffmpeg library.
-
-Package: ffmpeg-doc
-Section: doc
-Architecture: all
-Depends: ${misc:Depends}
-Description: documentation of the ffmpeg API
- This package contains the html doxygen documentation of the ffmpeg API.
-
-Package: libavutil49
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Description: ffmpeg utility library
- This is the common utility library from the ffmpeg project. It is required
- by all other ffmpeg libraries.
- .
- This package contains a Debian-specific version of the libavutil shared
- object that should only be used by Debian packages.
-
-Package: libavcodec52
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Description: ffmpeg codec library
- This is the codec library from the ffmpeg project. It supports most existing
- encoding formats (MPEG, DivX, MPEG4, AC3, DV...).
- .
- This package contains a Debian-specific version of the libavcodec shared
- object that should only be used by Debian packages.
-
-Package: libavdevice52
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Description: ffmpeg device handling library
- This is the device handling library from the ffmpeg project.
- .
- This package contains a Debian-specific version of the libavdevice shared
- object that should only be used by Debian packages.
-
-Package: libavformat52
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-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...).
- .
- This package contains a Debian-specific version of the libavformat shared
- object that should only be used by Debian packages.
-
-Package: libavfilter0
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Description: ffmpeg video filtering library
- This is the video filtering library from the ffmpeg project.
- .
- This package contains a Debian-specific version of the libavfilter shared
- object that should only be used by Debian packages.
-
-Package: libpostproc51
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Description: ffmpeg video postprocessing library
- This is the video postprocessing library from the ffmpeg project.
- .
- This package contains a Debian-specific version of the libpostproc shared
- object that should only be used by Debian packages.
-
-Package: libswscale0
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Description: ffmpeg video scaling library
- This is the video scaling library from the ffmpeg project.
- .
- This package contains a Debian-specific version of the libswscale shared
- object that should only be used by Debian packages.
-
-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),
-Description: development files for libavutil
- This is the common utility library from the ffmpeg project. It is required
- by all other ffmpeg libraries.
- .
- This package contains the header files and static libraries needed to
- compile applications or shared objects that use libavutil.
-
-Package: libavcodec-dev
-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),
-Suggests: libfaad-dev,
-          libgsm1-dev,
-          libogg-dev,
-          libschroedinger-dev,
-          libspeex-dev,
-          libtheora-dev (>> 0.0.0.alpha4),
-          libvorbis-dev,
-          libx11-dev,
-          libxext-dev,
-          zlib1g-dev,
-          ${lib1394-dev}
-Description: development files for libavcodec
- This is the codec library from the ffmpeg project. It supports most existing
- encoding formats (MPEG, DivX, MPEG4, AC3, DV...).
- .
- This package contains the header files and static libraries needed to
- compile applications or shared objects that use libavcodec.
-
-Package: libavdevice-dev
-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),
-Description: development files for libavdevice
- This is the device handling library from the ffmpeg project.
- .
- This package contains the header files and static libraries needed to
- compile applications or shared objects that use libavdevice.
-
-Package: libavformat-dev
-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),
-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...).
- .
- This package contains the header files and static libraries needed to
- compile applications or shared objects that use libavformat.
-
-Package: libavfilter-dev
-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),
-Description: development files for libavfilter
- This is the video filtering library from the ffmpeg project.
- .
- This package contains the header files and static libraries needed to
- compile applications or shared objects that use libavfilter.
-
-Package: libpostproc-dev
-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),
-Description: development files for libpostproc
- This is the video postprocessing library from the ffmpeg project.
- .
- This package contains the header files and static libraries needed to
- compile applications or shared objects that use libpostproc.
-
-Package: libswscale-dev
-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),
-Description: development files for libswscale
- This is the video scaling library from the ffmpeg project.
- .
- This package contains the header files and static libraries needed to
- compile applications or shared objects that use libswscale.
diff --git a/debian/rules b/debian/rules
index fbf2966..74f402c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,12 +35,6 @@ internalencoders := $(findstring internalencoders,$(DEB_BUILD_OPTIONS))
 
 include debian/confflags
 
-debian/control: debian/changelog $(wildcard debian/control.*)
-	dh_testdir
-	dpkg-parsechangelog | head -1 > $@
-	cat debian/control.common >> $@
-	cat debian/control.$(DEB_SOURCE) >> $@
-
 $(info FLAVORS = $(FLAVORS))
 $(info DEB_BUILD_OPTIONS = $(DEB_BUILD_OPTIONS))
 $(info CFLAGS = $(CFLAGS))

-- 
FFmpeg packaging



More information about the pkg-multimedia-commits mailing list