[SCM] ffmpeg/master: Single-space indent continuated lines in control file.

js at users.alioth.debian.org js at users.alioth.debian.org
Mon Nov 1 13:03:29 UTC 2010


The following commit has been merged in the master branch:
commit 5b400bd4c1e701dc3d76e552597f52dd4c8659ee
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Nov 1 14:01:40 2010 +0100

    Single-space indent continuated lines in control file.

diff --git a/debian/control b/debian/control
index 86a0e38..5eeac88 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,10 @@ 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+debian at greffrath.com>,
-           Andres Mejia <mcitadel at gmail.com>
+ Loic Minier <lool at dooz.org>,
+ Reinhard Tartler <siretart at tauware.de>,
+ Fabian Greffrath <fabian+debian at greffrath.com>,
+ Andres Mejia <mcitadel at gmail.com>
 DM-Upload-Allowed: yes
 Standards-Version: 3.9.1
 Vcs-Git: git://git.debian.org/git/pkg-multimedia/ffmpeg.git
@@ -14,38 +14,38 @@ Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/ffmpeg.git;a=summary
 Homepage: http://ffmpeg.org/
 Build-Depends-Indep: doxygen
 Build-Depends: debhelper (>= 7),
-               libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
-               libbz2-dev,
-               libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
-               libdirac-dev,
-               libfaad-dev | libfaad2-dev,
-               libfreetype6-dev,
-               libgsm1-dev,
-               libimlib2-dev,
-               libopenjpeg-dev,
-               libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
-               libschroedinger-dev,
-               libsdl1.2-dev,
-               libspeex-dev,
-               libtheora-dev (>> 0.0.0.alpha4),
-               libvorbis-dev,
-               libx11-dev,
-               libxext-dev,
-               libxfixes-dev,
-               libvdpau-dev,
-               libxvmc-dev,
-               quilt,
-               texi2html,
-               yasm [i386 amd64],
-               zlib1g-dev
+ libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libbz2-dev,
+ libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libdirac-dev,
+ libfaad-dev | libfaad2-dev,
+ libfreetype6-dev,
+ libgsm1-dev,
+ libimlib2-dev,
+ libopenjpeg-dev,
+ libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libschroedinger-dev,
+ libsdl1.2-dev,
+ libspeex-dev,
+ libtheora-dev (>> 0.0.0.alpha4),
+ libvorbis-dev,
+ libx11-dev,
+ libxext-dev,
+ libxfixes-dev,
+ libvdpau-dev,
+ libxvmc-dev,
+ quilt,
+ texi2html,
+ yasm [i386 amd64],
+ zlib1g-dev
 
 Package: ffmpeg
 Section: video
 Replaces: libavcodec52 (<< 4:0.5.2-1),
-          libavcodec-extra-52 (<< 4:0.5.1-3)
+ libavcodec-extra-52 (<< 4:0.5.1-3)
 Architecture: any
 Depends: ${shlibs:Depends},
-         ${misc: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
@@ -57,13 +57,13 @@ 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}),
-         ${misc:Depends}
+ libavcodec52 (= ${binary:Version}),
+ libavdevice52 (= ${binary:Version}),
+ libpostproc51 (= ${binary:Version}),
+ libavformat52 (= ${binary:Version}),
+ libswscale0 (= ${binary:Version}),
+ ffmpeg (= ${binary:Version}),
+ ${misc:Depends}
 Description: Debug symbols for ffmpeg related packages
  This package contains debug data of the ffmpeg related shared libraries.
  .
@@ -80,7 +80,7 @@ Description: documentation of the ffmpeg API
 Package: libavutil49
 Architecture: any
 Depends: ${shlibs:Depends},
-         ${misc: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.
@@ -91,7 +91,7 @@ Description: ffmpeg utility library
 Package: libavcodec52
 Architecture: any
 Depends: ${shlibs:Depends},
-         ${misc:Depends}
+ ${misc:Depends}
 Replaces: ffmpeg (<< 4:0.5.1-1)
 Breaks: libavcodec51 (<< 3:0.svn20090303-1)
 Description: ffmpeg codec library
@@ -104,7 +104,7 @@ Description: ffmpeg codec library
 Package: libavdevice52
 Architecture: any
 Depends: ${shlibs:Depends},
-         ${misc:Depends}
+ ${misc:Depends}
 Description: ffmpeg device handling library
  This is the device handling library from the ffmpeg project.
  .
@@ -114,7 +114,7 @@ Description: ffmpeg device handling library
 Package: libavformat52
 Architecture: any
 Depends: ${shlibs:Depends},
-         ${misc: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...).
@@ -125,7 +125,7 @@ Description: ffmpeg file format library
 Package: libavfilter0
 Architecture: any
 Depends: ${shlibs:Depends},
-         ${misc:Depends}
+ ${misc:Depends}
 Description: ffmpeg video filtering library
  This is the video filtering library from the ffmpeg project.
  .
@@ -135,7 +135,7 @@ Description: ffmpeg video filtering library
 Package: libpostproc51
 Architecture: any
 Depends: ${shlibs:Depends},
-         ${misc:Depends}
+ ${misc:Depends}
 Description: ffmpeg video postprocessing library
  This is the video postprocessing library from the ffmpeg project.
  .
@@ -145,7 +145,7 @@ Description: ffmpeg video postprocessing library
 Package: libswscale0
 Architecture: any
 Depends: ${shlibs:Depends},
-         ${misc:Depends}
+ ${misc:Depends}
 Description: ffmpeg video scaling library
  This is the video scaling library from the ffmpeg project.
  .
@@ -156,8 +156,8 @@ Package: libavutil-dev
 Section: libdevel
 Architecture: any
 Depends: libavutil49 (>= ${binary:Version}) | libavutil-extra-49 (>= ${source:Upstream-Version}),
-         libavutil49 (<= ${source:Upstream-Version}-99) | libavutil-extra-49 (<= ${source:Upstream-Version}-99),
-         ${misc:Depends}
+ libavutil49 (<= ${source:Upstream-Version}-99) | libavutil-extra-49 (<= ${source:Upstream-Version}-99),
+ ${misc:Depends}
 Description: development files for libavutil
  This is the common utility library from the ffmpeg project. It is required
  by all other ffmpeg libraries.
@@ -169,20 +169,20 @@ Package: libavcodec-dev
 Section: libdevel
 Architecture: any
 Depends: libavcodec52 (>= ${binary:Version}) | libavcodec-extra-52 (>= ${source:Upstream-Version}),
-         libavcodec52 (<= ${source:Upstream-Version}-99) | libavcodec-extra-52 (<= ${source:Upstream-Version}-99),
-         libavutil-dev (= ${binary:Version}),
-         ${misc:Depends}
+ libavcodec52 (<= ${source:Upstream-Version}-99) | libavcodec-extra-52 (<= ${source:Upstream-Version}-99),
+ libavutil-dev (= ${binary:Version}),
+ ${misc:Depends}
 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}
+ 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...).
@@ -194,9 +194,9 @@ Package: libavdevice-dev
 Section: libdevel
 Architecture: any
 Depends: libavdevice52 (>= ${binary:Version}) | libavdevice-extra-52 (>= ${source:Upstream-Version}),
-         libavdevice52 (<= ${source:Upstream-Version}-99) | libavdevice-extra-52 (<= ${source:Upstream-Version}-99),
-         libavformat-dev (= ${binary:Version}),
-         ${misc:Depends}
+ libavdevice52 (<= ${source:Upstream-Version}-99) | libavdevice-extra-52 (<= ${source:Upstream-Version}-99),
+ libavformat-dev (= ${binary:Version}),
+ ${misc:Depends}
 Description: development files for libavdevice
  This is the device handling library from the ffmpeg project.
  .
@@ -207,9 +207,9 @@ Package: libavformat-dev
 Section: libdevel
 Architecture: any
 Depends: libavformat52 (>= ${binary:Version}) | libavformat-extra-52 (>= ${source:Upstream-Version}),
-         libavformat52 (<= ${source:Upstream-Version}-99) | libavformat-extra-52 (<= ${source:Upstream-Version}-99),
-         libavcodec-dev (= ${binary:Version}),
-         ${misc:Depends}
+ libavformat52 (<= ${source:Upstream-Version}-99) | libavformat-extra-52 (<= ${source:Upstream-Version}-99),
+ libavcodec-dev (= ${binary:Version}),
+ ${misc:Depends}
 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...).
@@ -221,9 +221,9 @@ Package: libavfilter-dev
 Section: libdevel
 Architecture: any
 Depends: libavfilter0 (>= ${binary:Version}) | libavfilter-extra-0 (>= ${source:Upstream-Version}),
-         libavfilter0 (<= ${source:Upstream-Version}-99) | libavfilter-extra-0 (<= ${source:Upstream-Version}-99),
-         libavcodec-dev (= ${binary:Version}),
-         ${misc:Depends}
+ libavfilter0 (<= ${source:Upstream-Version}-99) | libavfilter-extra-0 (<= ${source:Upstream-Version}-99),
+ libavcodec-dev (= ${binary:Version}),
+ ${misc:Depends}
 Description: development files for libavfilter
  This is the video filtering library from the ffmpeg project.
  .
@@ -234,9 +234,9 @@ Package: libpostproc-dev
 Section: libdevel
 Architecture: any
 Depends: libpostproc51 (>= ${binary:Version}) | libpostproc-extra-51 (>= ${source:Upstream-Version}),
-         libpostproc51 (<= ${source:Upstream-Version}-99) | libpostproc-extra-51 (<= ${source:Upstream-Version}-99),
-         libavutil-dev (= ${binary:Version}),
-         ${misc:Depends}
+ libpostproc51 (<= ${source:Upstream-Version}-99) | libpostproc-extra-51 (<= ${source:Upstream-Version}-99),
+ libavutil-dev (= ${binary:Version}),
+ ${misc:Depends}
 Description: development files for libpostproc
  This is the video postprocessing library from the ffmpeg project.
  .
@@ -247,9 +247,9 @@ Package: libswscale-dev
 Section: libdevel
 Architecture: any
 Depends: libswscale0 (>= ${binary:Version}) | libswscale-extra-0 (>= ${source:Upstream-Version}),
-         libswscale0 (<= ${source:Upstream-Version}-99) | libswscale-extra-0 (<= ${source:Upstream-Version}-99),
-         libavutil-dev (= ${binary:Version}),
-         ${misc:Depends}
+ libswscale0 (<= ${source:Upstream-Version}-99) | libswscale-extra-0 (<= ${source:Upstream-Version}-99),
+ libavutil-dev (= ${binary:Version}),
+ ${misc:Depends}
 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