[SCM] FFmpeg packaging branch, master.unstripped, updated. upstream/0.svn20090128-58-g849634c

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Tue Feb 3 08:55:15 UTC 2009


The following commit has been merged in the master.unstripped branch:
commit 849634cb3540a044828b516842d4f9ede400af5a
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Feb 3 09:54:37 2009 +0100

    regenerate debian/control

diff --git a/debian/changelog b/debian/changelog
index b148391..5ac3084 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ffmpeg-debian (3:0.svn20090128-1unstripped1) experimental; urgency=low
+ffmpeg (3:0.svn20090128-1unstripped1) experimental; urgency=low
 
   * rebuild using a clean, uncrippled ffmpeg tarball
 
diff --git a/debian/control b/debian/control
index 7c39713..56093d5 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: ffmpeg-debian
+Source: ffmpeg
 Section: libs
 Priority: optional
 Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
@@ -25,215 +25,100 @@ Build-Depends: debhelper (>= 5.0.0),
                libvorbis-dev,
                libx11-dev,
                libxext-dev,
-               libxvmc-dev,
                quilt,
                texi2html,
                zlib1g-dev
 
-Package: ffmpeg
-Section: graphics
-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: libs
-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
+Package: libavutil-unstripped-49
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Breaks: libavcodec51,
-	libavcodec52 (<= 3:0.svn20090119-1),
-	libavformat52 (<= 3:0.svn20090119-1)
+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 Debian-specific version of the libavutil shared
+ This package contains a unrestricted version of the libavutil shared
  object that should only be used by Debian packages.
 
-Package: libavcodec52
+Package: libavcodec-unstripped-52
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
+Suggests: liba52-0.7.4, 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 Debian-specific version of the libavcodec shared
+ This package contains a unrestricted version of the libavcodec shared
  object that should only be used by Debian packages.
 
-Package: libavdevice52
+Package: libavdevice-unstripped-52
 Section: libs
 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 Debian-specific version of the libavdevice shared
+ This package contains a unrestricted version of the libavdevice shared
  object that should only be used by Debian packages.
 
-Package: libavformat52
+Package: libavfilter-unstripped-0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-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...).
+Description: ffmpeg video filtering library
+ This is the video filtering library from the ffmpeg project.
  .
- This package contains a Debian-specific version of the libavformat shared
+ This package contains a unrestricted version of the libavfilter shared
  object that should only be used by Debian packages.
 
-Package: libavfilter0
+Package: libpostproc-unstripped-51
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Description: ffmpeg video filtering library
- This is the video filtering library from the ffmpeg project.
+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 Debian-specific version of the libavfilter shared
+ This package contains a unrestricted version of the libpostproc shared
  object that should only be used by Debian packages.
 
-Package: libpostproc51
+Package: libavformat-unstripped-52
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Description: ffmpeg video postprocessing library
- This is the video postprocessing library from the ffmpeg project.
+Conflicts: libavformatcvs52, libavformat52
+Replaces: libavformatcvs52, libavformat52
+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 libpostproc shared
+ This package contains a unrestricted version of the libavformat shared
  object that should only be used by Debian packages.
 
-Package: libswscale0
+Package: libswscale-unstripped-0
 Section: libs
 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 Debian-specific version of the libswscale shared
+ This package contains a unrestricted 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})
-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}),
-         libavutil-dev (= ${binary:Version})
-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}),
-         libavformat-dev (= ${binary:Version})
-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}),
-         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...).
- .
- 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}),
-         libavcodec-dev (= ${binary:Version})
-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}),
-         libavutil-dev (= ${binary:Version})
-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}),
-         libavutil-dev (= ${binary:Version})
-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.

-- 
FFmpeg packaging



More information about the pkg-multimedia-commits mailing list