[SCM] libav/master: normalize fields with wrap-and-sort -s

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jan 15 15:25:47 UTC 2012 

The following commit has been merged in the master branch:
commit e3aed19e20376a0b875195c17384798999ba6af3
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 15 16:22:19 2012 +0100

    normalize fields with wrap-and-sort -s
    
    Git-Dch: ignore

diff --git a/debian/control b/debian/control
index 6336ec0..4a80876 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,8 @@ Source: libav
 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>,
+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>,
@@ -13,8 +14,10 @@ Standards-Version: 3.9.2
 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-Indep: doxygen
-Build-Depends: debhelper (>= 8.1.3~),
+Build-Depends-Indep:
+ doxygen
+Build-Depends:
+ debhelper (>= 8.1.3~),
  libasound2-dev [linux-any],
  libbz2-dev,
  libdc1394-22-dev [linux-any],
@@ -39,7 +42,7 @@ Build-Depends: debhelper (>= 8.1.3~),
  libx11-dev,
  libx264-dev,
  libxext-dev,
- libxfixes-dev, 
+ libxfixes-dev,
  libxvidcore-dev,
  libxvmc-dev,
  texi2html,
@@ -49,11 +52,14 @@ Build-Depends: debhelper (>= 8.1.3~),
 Package: libav-tools
 Section: video
 Architecture: any
-Replaces: libavcodec53 (<< ${source:Version}),
- libavcodec-extra-53 (<< 4:0.6~)
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Conflicts: ffprobe
+Replaces:
+ libavcodec-extra-53 (<< 4:0.6~),
+ libavcodec53 (<< ${source:Version})
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Conflicts:
+ ffprobe
 Description: Multimedia player, server, encoder and transcoder
  This package contains the avplay multimedia player, the avserver
  streaming server, the avconv audio and video encoder, and the avprobe
@@ -64,9 +70,10 @@ Description: Multimedia player, server, encoder and transcoder
 Package: ffmpeg
 Section: video
 Architecture: all
-Depends: ${shlibs:Depends},
+Depends:
+ libav-tools,
  ${misc:Depends},
- libav-tools
+ ${shlibs:Depends}
 Description: Multimedia player, server, encoder and transcoder (transitional package)
  This package is only used for transitional purposes and can be safely
  removed when no other packages depend on this package.
@@ -75,7 +82,8 @@ Package: ffmpeg-dbg
 Section: debug
 Priority: extra
 Architecture: any
-Depends: libav-dbg,
+Depends:
+ libav-dbg,
  ${misc:Depends}
 Description: Debug symbols for Libav related packages
  This package contains debug data of the Libav related shared libraries.
@@ -90,13 +98,14 @@ Package: libav-dbg
 Section: debug
 Priority: extra
 Architecture: any
-Depends: libavutil51 (= ${binary:Version}),
+Depends:
+ libav-tools (= ${binary:Version}),
  libavcodec53 (= ${binary:Version}),
  libavdevice53 (= ${binary:Version}),
- libpostproc52 (= ${binary:Version}),
  libavformat53 (= ${binary:Version}),
+ libavutil51 (= ${binary:Version}),
+ libpostproc52 (= ${binary:Version}),
  libswscale2 (= ${binary:Version}),
- libav-tools (= ${binary:Version}),
  ${misc:Depends}
 Description: Debug symbols for Libav related packages
  This package contains debug data of the Libav related shared libraries.
@@ -107,7 +116,8 @@ Description: Debug symbols for Libav related packages
 Package: libav-source
 Architecture: all
 Section: devel
-Depends: ${misc:Depends}
+Depends:
+ ${misc:Depends}
 Description: Patched Libav sources
  This package contains a tarball the source file that were used to produce
  this package, containing all modifications that have been applied inline.
@@ -118,7 +128,8 @@ Description: Patched Libav sources
 Package: ffmpeg-doc
 Section: doc
 Architecture: all
-Depends: libav-doc,
+Depends:
+ libav-doc,
  ${misc:Depends}
 Description: Documentation of the Libav API (transitional package)
  This package contains the html doxygen documentation of the Libav API.
@@ -131,9 +142,12 @@ Description: Documentation of the Libav API (transitional package)
 Package: libav-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}
-Breaks: ffmpeg-doc (<< ${binary:Version})
-Replaces: ffmpeg-doc (<< ${binary:Version})
+Depends:
+ ${misc:Depends}
+Breaks:
+ ffmpeg-doc (<< ${binary:Version})
+Replaces:
+ ffmpeg-doc (<< ${binary:Version})
 Description: Documentation of the Libav API
  This package contains the html doxygen documentation of the Libav API.
  .
@@ -143,8 +157,9 @@ Package: libavutil51
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends},
- ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: Libav utility library
  This is the common utility library from Libav. It contains shared code
  used by all other Libav libraries.
@@ -153,8 +168,9 @@ Package: libavcodec53
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends},
- ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: Libav codec library
  This is the codec library from Libav (both encoding and decoding).
  .
@@ -164,8 +180,9 @@ Package: libavdevice53
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends},
- ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: Libav device handling library
  This is the device handling library from Libav.
 
@@ -173,8 +190,9 @@ Package: libavformat53
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends},
- ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: Libav file format library
  This is the library for handling file formats from Libav.
  .
@@ -185,8 +203,9 @@ Package: libavfilter2
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends},
- ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: Libav video filtering library
  This is the video filtering library from Libav.
 
@@ -194,8 +213,9 @@ Package: libpostproc52
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends},
- ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: Libav video postprocessing library
  This is the video postprocessing library from Libav.
 
@@ -203,16 +223,18 @@ Package: libswscale2
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends},
- ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: Libav video scaling library
  This is the video software scaling library from Libav.
 
 Package: libavutil-dev
 Section: libdevel
 Architecture: any
-Depends: libavutil51 (>= ${binary:Version}) | libavutil-extra-51 (>= ${source:Upstream-Version}),
+Depends:
  libavutil51 (<= ${source:Upstream-Version}-99) | libavutil-extra-51 (<= ${source:Upstream-Version}.99),
+ libavutil51 (>= ${binary:Version}) | libavutil-extra-51 (>= ${source:Upstream-Version}),
  ${misc:Depends}
 Description: Development files for libavutil
  This is the common utility library from Libav.
@@ -223,11 +245,13 @@ Description: Development files for libavutil
 Package: libavcodec-dev
 Section: libdevel
 Architecture: any
-Depends: libavcodec53 (>= ${binary:Version}) | libavcodec-extra-53 (>= ${source:Upstream-Version}),
+Depends:
  libavcodec53 (<= ${source:Upstream-Version}-99) | libavcodec-extra-53 (<= ${source:Upstream-Version}.99),
+ libavcodec53 (>= ${binary:Version}) | libavcodec-extra-53 (>= ${source:Upstream-Version}),
  libavutil-dev (= ${binary:Version}),
  ${misc:Depends}
-Suggests: libfaad-dev,
+Suggests:
+ libfaad-dev,
  libgsm1-dev,
  libogg-dev,
  libschroedinger-dev,
@@ -248,8 +272,9 @@ Description: Development files for libavcodec
 Package: libavdevice-dev
 Section: libdevel
 Architecture: any
-Depends: libavdevice53 (>= ${binary:Version}) | libavdevice-extra-53 (>= ${source:Upstream-Version}),
+Depends:
  libavdevice53 (<= ${source:Upstream-Version}-99) | libavdevice-extra-53 (<= ${source:Upstream-Version}.99),
+ libavdevice53 (>= ${binary:Version}) | libavdevice-extra-53 (>= ${source:Upstream-Version}),
  libavformat-dev (= ${binary:Version}),
  ${misc:Depends}
 Description: Development files for libavdevice
@@ -261,9 +286,11 @@ Description: Development files for libavdevice
 Package: libavformat-dev
 Section: libdevel
 Architecture: any
-Depends: libavformat53 (>= ${binary:Version}) | libavformat-extra-53 (>= ${source:Upstream-Version}),
+Depends:
+ libavcodec-dev (= ${binary:Version}),
  libavformat53 (<= ${source:Upstream-Version}-99) | libavformat-extra-53 (<= ${source:Upstream-Version}.99),
- libavcodec-dev (= ${binary:Version}), libavutil-dev (= ${binary:Version}),
+ libavformat53 (>= ${binary:Version}) | libavformat-extra-53 (>= ${source:Upstream-Version}),
+ libavutil-dev (= ${binary:Version}),
  ${misc:Depends}
 Description: Development files for libavformat
  This is the demuxer library from Libav. It supports most
@@ -275,9 +302,10 @@ Description: Development files for libavformat
 Package: libavfilter-dev
 Section: libdevel
 Architecture: any
-Depends: libavfilter2 (>= ${binary:Version}) | libavfilter-extra-2 (>= ${source:Upstream-Version}),
- libavfilter2 (<= ${source:Upstream-Version}-99) | libavfilter-extra-2 (<= ${source:Upstream-Version}.99),
+Depends:
  libavcodec-dev (= ${binary:Version}),
+ libavfilter2 (<= ${source:Upstream-Version}-99) | libavfilter-extra-2 (<= ${source:Upstream-Version}.99),
+ libavfilter2 (>= ${binary:Version}) | libavfilter-extra-2 (>= ${source:Upstream-Version}),
  ${misc:Depends}
 Description: Development files for libavfilter
  This is the video filtering library from Libav.
@@ -288,9 +316,10 @@ Description: Development files for libavfilter
 Package: libpostproc-dev
 Section: libdevel
 Architecture: any
-Depends: libpostproc52 (>= ${binary:Version}) | libpostproc-extra-52 (>= ${source:Upstream-Version}),
- libpostproc52 (<= ${source:Upstream-Version}-99) | libpostproc-extra-52 (<= ${source:Upstream-Version}.99),
+Depends:
  libavutil-dev (= ${binary:Version}),
+ libpostproc52 (<= ${source:Upstream-Version}-99) | libpostproc-extra-52 (<= ${source:Upstream-Version}.99),
+ libpostproc52 (>= ${binary:Version}) | libpostproc-extra-52 (>= ${source:Upstream-Version}),
  ${misc:Depends}
 Description: Development files for libpostproc
  This is the video postprocessing library from Libav.
@@ -301,9 +330,10 @@ Description: Development files for libpostproc
 Package: libswscale-dev
 Section: libdevel
 Architecture: any
-Depends: libswscale2 (>= ${binary:Version}) | libswscale-extra-2 (>= ${source:Upstream-Version}),
- libswscale2 (<= ${source:Upstream-Version}-99) | libswscale-extra-2 (<= ${source:Upstream-Version}.99),
+Depends:
  libavutil-dev (= ${binary:Version}),
+ libswscale2 (<= ${source:Upstream-Version}-99) | libswscale-extra-2 (<= ${source:Upstream-Version}.99),
+ libswscale2 (>= ${binary:Version}) | libswscale-extra-2 (>= ${source:Upstream-Version}),
  ${misc:Depends}
 Description: Development files for libswscale
  This is the video scaling library from Libav.
diff --git a/debian/copyright b/debian/copyright
index 9a96243..6e01e3f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -92,4 +92,3 @@ The rest of the code is licensed under the GNU LGPL:
 On Debian GNU/Linux systems, the complete text of the GNU General Public
 License can be found in `/usr/share/common-licenses/GPL' and the text of the
 GNU Lesser General Public License is in `/usr/share/common-licenses/LGPL'.
-
diff --git a/debian/libav-tools.install b/debian/libav-tools.install
index 2b5ee17..3889019 100644
--- a/debian/libav-tools.install
+++ b/debian/libav-tools.install
@@ -1,4 +1,4 @@
 etc
 usr/bin
-usr/share/man
 usr/share/avconv/*.avpreset
+usr/share/man

-- 
Libav/FFmpeg packaging

More information about the pkg-multimedia-commits mailing list