[SCM] libva/master: normalize fields with wrap-and-sort(1)

Mon Oct 31 19:52:39 UTC 2011

The following commit has been merged in the master branch:
commit 82bc6188563bbfbee75f57d2d04739a8482d77ff
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Oct 31 20:52:14 2011 +0100

    normalize fields with wrap-and-sort(1)

diff --git a/debian/control b/debian/control
index 9116dd9..344737e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,15 +1,18 @@
 Source: libva
 Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Uploaders: Andres Mejia <amejia at debian.org>, Reinhard Tartler <siretart at tauware.de>
-Build-Depends: debhelper (>= 7.0.50),
-               dh-autoreconf,
-               pkg-config,
-               libdrm-dev (>= 2.4.23),
-               libxext-dev,
-               libxfixes-dev,
-               libx11-dev,
-               libgl1-mesa-dev | libgl-dev,
+Uploaders:
+ Andres Mejia <amejia at debian.org>,
+ Reinhard Tartler <siretart at tauware.de>
+Build-Depends:
+ debhelper (>= 7.0.50),
+ dh-autoreconf,
+ libdrm-dev (>= 2.4.23),
+ libgl1-mesa-dev | libgl-dev,
+ libx11-dev,
+ libxext-dev,
+ libxfixes-dev,
+ pkg-config
 Standards-Version: 3.9.1
 Section: libs
 Homepage: http://www.freedesktop.org/wiki/Software/vaapi
@@ -20,16 +23,17 @@ DM-Upload-Allowed: yes
 Package: libva-dev
 Section: libdevel
 Architecture: all
-Depends: libva1 (>= ${source:Upstream-Version}),
-         libva1 (<< ${source:Upstream-Version}+1~),
-         libva-x11-1 (>= ${source:Upstream-Version}),
-         libva-x11-1 (<< ${source:Upstream-Version}+1~),
-         libva-tpi1 (>= ${source:Upstream-Version}),
-         libva-tpi1 (<< ${source:Upstream-Version}+1~),
-         libva-glx1 (>= ${source:Upstream-Version}),
-         libva-glx1 (<< ${source:Upstream-Version}+1~),
-         ${shlibs:Depends},
-         ${misc:Depends}
+Depends:
+ libva-glx1 (<< ${source:Upstream-Version}+1~),
+ libva-glx1 (>= ${source:Upstream-Version}),
+ libva-tpi1 (<< ${source:Upstream-Version}+1~),
+ libva-tpi1 (>= ${source:Upstream-Version}),
+ libva-x11-1 (<< ${source:Upstream-Version}+1~),
+ libva-x11-1 (>= ${source:Upstream-Version}),
+ libva1 (<< ${source:Upstream-Version}+1~),
+ libva1 (>= ${source:Upstream-Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: Video Acceleration (VA) API for Linux -- development files
  Video Acceleration API (VA API) is a library ("libVA") and API specification
  which enables and provides access to graphics hardware (GPU) acceleration for
@@ -44,8 +48,11 @@ Description: Video Acceleration (VA) API for Linux -- development files
 
 Package: libva1
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: vlc-nox (<< 1.1.5-3)
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Breaks:
+ vlc-nox (<< 1.1.5-3)
 Description: Video Acceleration (VA) API for Linux -- runtime
  Video Acceleration API (VA API) is a library ("libVA") and API specification
  which enables and provides access to graphics hardware (GPU) acceleration for
@@ -60,7 +67,9 @@ Description: Video Acceleration (VA) API for Linux -- runtime
 
 Package: libva-x11-1
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: Video Acceleration (VA) API for Linux -- X11 runtime
  Video Acceleration API (VA API) is a library ("libVA") and API specification
  which enables and provides access to graphics hardware (GPU) acceleration for
@@ -75,7 +84,9 @@ Description: Video Acceleration (VA) API for Linux -- X11 runtime
 
 Package: libva-glx1
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: Video Acceleration (VA) API for Linux -- GLX runtime
  Video Acceleration API (VA API) is a library ("libVA") and API specification
  which enables and provides access to graphics hardware (GPU) acceleration for
@@ -90,7 +101,9 @@ Description: Video Acceleration (VA) API for Linux -- GLX runtime
 
 Package: libva-tpi1
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: Video Acceleration (VA) API for Linux -- TPI runtime
  Video Acceleration API (VA API) is a library ("libVA") and API specification
  which enables and provides access to graphics hardware (GPU) acceleration for
@@ -104,9 +117,12 @@ Description: Video Acceleration (VA) API for Linux -- TPI runtime
  This package provides the libva-tpi library.
 
 Package: i965-va-driver
-Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64
-Provides: va-driver
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
+Provides:
+ va-driver
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: Video Acceleration (VA) API for Linux -- i965 VA driver
  Video Acceleration API (VA API) is a library ("libVA") and API specification
  which enables and provides access to graphics hardware (GPU) acceleration for
@@ -121,7 +137,9 @@ Description: Video Acceleration (VA) API for Linux -- i965 VA driver
 
 Package: vainfo
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: Video Acceleration (VA) API for Linux -- info program
  Video Acceleration API (VA API) is a library ("libVA") and API specification
  which enables and provides access to graphics hardware (GPU) acceleration for
diff --git a/debian/copyright b/debian/copyright
index ec11b65..1f04082 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,12 +5,12 @@ Fri, 12 Feb 2010 13:03:16 -0500
 
 It was downloaded from <http://cgit.freedesktop.org/libva/>
 
-Upstream Author(s): 
+Upstream Authors:
 
     Waldo Bastian <waldo.bastian at intel.com>
     Jonathan Bian <jonathan.bian at intel.com>
 
-Copyright: 
+Copyright:
 
     Copyright © 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
     Copyright © 2000 VA Linux Systems, Inc.
@@ -30,11 +30,11 @@ License:
     distribute, sub license, and/or sell copies of the Software, and to
     permit persons to whom the Software is furnished to do so, subject to
     the following conditions:
-    
+
     The above copyright notice and this permission notice (including the
     next paragraph) shall be included in all copies or substantial portions
     of the Software.
-    
+
     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
     OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
     MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
diff --git a/debian/libva-dev.install b/debian/libva-dev.install
index a88d8e8..c0a6087 100644
--- a/debian/libva-dev.install
+++ b/debian/libva-dev.install
@@ -1,6 +1,6 @@
 usr/include
-usr/lib/libva.so
-usr/lib/libva-x11.so
 usr/lib/libva-glx.so
 usr/lib/libva-tpi.so
+usr/lib/libva-x11.so
+usr/lib/libva.so
 usr/lib/pkgconfig
diff --git a/debian/libva1.install b/debian/libva1.install
index e7ebe1a..01da472 100644
--- a/debian/libva1.install
+++ b/debian/libva1.install
@@ -1,2 +1,2 @@
-usr/lib/libva.so.*
 usr/lib/dri/dummy_drv_video.so
+usr/lib/libva.so.*

-- 
libva packaging

