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

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Wed Jan 25 20:58:10 UTC 2012 

The following commit has been merged in the master branch:
commit 631d7b7b9dc820f4280b3364b7c0b8a79f390d3b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jan 24 07:55:29 2012 +0100

    normalize fields with wrap-and-sort -as

diff --git a/debian/control b/debian/control
index 7049d39..e8a8711 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,8 @@ Source: libav-extra
 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,7 +14,8 @@ Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/git/pkg-multimedia/libav-extra.git
 Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/libav-extra.git;a=summary
 Homepage: http://libav.org/
-Build-Depends: debhelper (>= 8.1.3~),
+Build-Depends:
+ debhelper (>= 8.1.3~),
  libasound2-dev [linux-any],
  libav-source (>= 4:0.8~beta2~),
  libbz2-dev,
@@ -53,10 +55,13 @@ Package: libavutil-extra-51
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Conflicts: libavutil51
-Replaces: libavutil51
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Conflicts:
+ libavutil51
+Replaces:
+ libavutil51
 Built-Using: ${libav:Built-Using}
 Description: Libav utility library
  This is the common utility library from the Libav project. It is required
@@ -69,11 +74,15 @@ Package: libavcodec-extra-53
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Suggests: libfaad0
-Conflicts: libavcodec53
-Replaces: libavcodec53
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Suggests:
+ libfaad0
+Conflicts:
+ libavcodec53
+Replaces:
+ libavcodec53
 Built-Using: ${libav:Built-Using}
 Description: Libav codec library
  This package contains the ffplay multimedia player, the ffserver streaming
@@ -88,10 +97,13 @@ Package: libavdevice-extra-53
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Conflicts: libavdevice53
-Replaces: libavdevice53
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Conflicts:
+ libavdevice53
+Replaces:
+ libavdevice53
 Built-Using: ${libav:Built-Using}
 Description: Libav device handling library
  This is the device handling library from the Libav project.
@@ -103,10 +115,13 @@ Package: libavfilter-extra-2
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Conflicts: libavfilter2
-Replaces: libavfilter2
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Conflicts:
+ libavfilter2
+Replaces:
+ libavfilter2
 Built-Using: ${libav:Built-Using}
 Description: Libav filter library
  This is the video postprocessing library from Libav.
@@ -118,10 +133,13 @@ Package: libpostproc-extra-52
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Conflicts: libpostproc52
-Replaces: libpostproc52
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Conflicts:
+ libpostproc52
+Replaces:
+ libpostproc52
 Built-Using: ${libav:Built-Using}
 Description: Libav video postprocessing library
  This is the video postprocessing library from the Libav project.
@@ -133,10 +151,13 @@ Package: libavformat-extra-53
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Conflicts: libavformat53
-Replaces: libavformat53
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Conflicts:
+ libavformat53
+Replaces:
+ libavformat53
 Built-Using: ${libav:Built-Using}
 Description: Libav file format library
  This is the demuxer library from the Libav project. It supports most
@@ -149,10 +170,15 @@ Package: libswscale-extra-2
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Conflicts: libswscale-extra-1 (>> 4:0.7~), libswscale2
-Replaces: libswscale-extra-1 (>> 4:0.7~), libswscale2
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Conflicts:
+ libswscale-extra-1 (>> 4:0.7~),
+ libswscale2
+Replaces:
+ libswscale-extra-1 (>> 4:0.7~),
+ libswscale2
 Built-Using: ${libav:Built-Using}
 Description: Libav video scaling library
  This is the video scaling library from the Libav project.
diff --git a/debian/copyright b/debian/copyright
index ce610c3..650dad9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -96,4 +96,3 @@ GNU Lesser General Public License is in `/usr/share/common-licenses/LGPL'.
 Note: Because this package links against libraries that are licensed
 under Apache License 2.0, the resulting binary packages from the
 libav-extra source package are distributed under the GPL version 3.
-
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
diff --git a/debian/libavcodec-dev.install b/debian/libavcodec-dev.install
index 57ecd96..491521e 100644
--- a/debian/libavcodec-dev.install
+++ b/debian/libavcodec-dev.install
@@ -1,4 +1,4 @@
 usr/include/libavcodec
 usr/lib/*/libavcodec.a
-usr/lib/*/{,*/,*/*/}libavcodec.so
 usr/lib/*/pkgconfig/libavcodec.pc
+usr/lib/*/{,*/,*/*/}libavcodec.so
diff --git a/debian/libavdevice-dev.install b/debian/libavdevice-dev.install
index b38e4f0..3115322 100644
--- a/debian/libavdevice-dev.install
+++ b/debian/libavdevice-dev.install
@@ -1,4 +1,4 @@
 usr/include/libavdevice
 usr/lib/*/libavdevice.a
-usr/lib/*/{,*/,*/*/}libavdevice.so
 usr/lib/*/pkgconfig/libavdevice.pc
+usr/lib/*/{,*/,*/*/}libavdevice.so
diff --git a/debian/libavfilter-dev.install b/debian/libavfilter-dev.install
index f278a96..48dd61b 100644
--- a/debian/libavfilter-dev.install
+++ b/debian/libavfilter-dev.install
@@ -1,4 +1,4 @@
 usr/include/libavfilter
 usr/lib/*/libavfilter.a
-usr/lib/*/{,*/,*/*/}libavfilter.so
 usr/lib/*/pkgconfig/libavfilter.pc
+usr/lib/*/{,*/,*/*/}libavfilter.so
diff --git a/debian/libavformat-dev.install b/debian/libavformat-dev.install
index 93c742e..9eed5a0 100644
--- a/debian/libavformat-dev.install
+++ b/debian/libavformat-dev.install
@@ -1,4 +1,4 @@
 usr/include/libavformat
 usr/lib/*/libavformat.a
-usr/lib/*/{,*/,*/*/}libavformat.so
 usr/lib/*/pkgconfig/libavformat.pc
+usr/lib/*/{,*/,*/*/}libavformat.so
diff --git a/debian/libavutil-dev.install b/debian/libavutil-dev.install
index 2a410c7..52ca082 100644
--- a/debian/libavutil-dev.install
+++ b/debian/libavutil-dev.install
@@ -1,4 +1,4 @@
 usr/include/libavutil
 usr/lib/*/libavutil.a
-usr/lib/*/{,*/,*/*/}libavutil.so
 usr/lib/*/pkgconfig/libavutil.pc
+usr/lib/*/{,*/,*/*/}libavutil.so
diff --git a/debian/libpostproc-dev.install b/debian/libpostproc-dev.install
index de5d0f9..fad0a3c 100644
--- a/debian/libpostproc-dev.install
+++ b/debian/libpostproc-dev.install
@@ -1,4 +1,4 @@
 usr/include/libpostproc
 usr/lib/*/libpostproc.a
-usr/lib/*/{,*/,*/*/}libpostproc.so
 usr/lib/*/pkgconfig/libpostproc.pc
+usr/lib/*/{,*/,*/*/}libpostproc.so
diff --git a/debian/libswscale-dev.install b/debian/libswscale-dev.install
index b4d9715..61b171b 100644
--- a/debian/libswscale-dev.install
+++ b/debian/libswscale-dev.install
@@ -1,4 +1,4 @@
 usr/include/libswscale
 usr/lib/*/libswscale.a
-usr/lib/*/{,*/,*/*/}libswscale.so
 usr/lib/*/pkgconfig/libswscale.pc
+usr/lib/*/{,*/,*/*/}libswscale.so

-- 
libav-extra packaging

More information about the pkg-multimedia-commits mailing list