[SCM] x264/ubuntu: normalize fields with wrap-and-sort(1)

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Mon Oct 31 19:00:25 UTC 2011


The following commit has been merged in the ubuntu branch:
commit f9daea3d2dfb35ededde2533fb1461a9fbcb92bf
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Oct 31 19:52:25 2011 +0100

    normalize fields with wrap-and-sort(1)

diff --git a/debian/control b/debian/control
index d6702f8..27c69d2 100644
--- a/debian/control
+++ b/debian/control
@@ -2,20 +2,21 @@ Source: x264
 Section: libs
 Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Uploaders: Reinhard Tartler <siretart at tauware.de>,
-           Fabian Greffrath <fabian+debian at greffrath.com>,
-           Andres Mejia <amejia at debian.org>
-Build-Depends: debhelper (>= 8.1.3~),
-               libavcodec-dev (>= 4:0.7~),
-               libavformat-dev (>= 4:0.7~),
-               libavutil-dev (>= 4:0.7~),
-               libpostproc-dev (>= 4:0.7~),
-               libswscale-dev (>= 4:0.7~),
-               libffms2-dev,
-               yasm [any-i386 any-amd64],
-               libffms2-dev,
-               libgpac-dev,
-               libx11-dev
+Uploaders:
+ Reinhard Tartler <siretart at tauware.de>,
+ Fabian Greffrath <fabian+debian at greffrath.com>,
+ Andres Mejia <amejia at debian.org>
+Build-Depends:
+ debhelper (>= 8.1.3~),
+ libavcodec-dev (>= 4:0.7~),
+ libavformat-dev (>= 4:0.7~),
+ libavutil-dev (>= 4:0.7~),
+ libffms2-dev,
+ libgpac-dev,
+ libpostproc-dev (>= 4:0.7~),
+ libswscale-dev (>= 4:0.7~),
+ libx11-dev,
+ yasm [any-i386 any-amd64]
 Standards-Version: 3.9.2
 DM-Upload-Allowed: yes
 Vcs-Git: git://anonscm.debian.org/pkg-multimedia/x264.git
@@ -25,10 +26,13 @@ Homepage: http://www.videolan.org/developers/x264.html
 Package: x264
 Section: graphics
 Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Conflicts: x264-bin
-Replaces: x264-bin
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Conflicts:
+ x264-bin
+Replaces:
+ x264-bin
 Description: video encoder for the H.264/MPEG-4 AVC standard
  x264 is an advanced commandline encoder for creating H.264 (MPEG-4 AVC)
  video streams.
@@ -56,8 +60,9 @@ Package: libx264-118
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: x264 video coding library
  libx264 is an advanced encoding library for creating H.264 (MPEG-4 AVC)
  video streams.
@@ -67,8 +72,9 @@ Description: x264 video coding library
 Package: libx264-dev
 Section: libdevel
 Architecture: any
-Depends: libx264-118 (= ${binary:Version}),
-         ${misc:Depends} 
+Depends:
+ libx264-118 (= ${binary:Version}),
+ ${misc:Depends}
 Description: development files for libx264
  libx264 is an advanced encoding library for creating H.264 (MPEG-4 AVC)
  video streams.

-- 
x264 packaging



More information about the pkg-multimedia-commits mailing list