[SCM] libva/master: Merge branch 'master' of ssh://git.debian.org/git/pkg-multimedia/libva

[siretart at users.alioth.debian.org]

Merge tag 'upstream/1.1.0'
Imported Upstream version 1.1.0
Rewrite README.Debian with relavant info about the package names for drivers.
Update changelog to prepare for new upload.
Change section of vainfo to utils.
Allow dev package to be multi-arch installable.
Keep changelog within width of 80 characters.
Update changelog.
Refreshed patches.
Remove test/demo programs from installation. This removes the libva-utils package.
Support parallel builds.
Use dh_auto_configure to pass in default+extra configure options.
Don't include Multi-Arch field for packages which are not shared libraries.
Include dpkg-source options in generated debian tarball.
debian/changelog: update after S-V bump
debian/control: Standards-Version bumped to 3.9.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: a27cd1c4708f6af48c1a8da76af89d06382c7b25
X-Git-Newrev: d37b4ce489af0ef6440e7e76c3e258a693cea410

The following commit has been merged in the master branch:
commit f4b88f6639494db0595a3aa67de54c2c95204876
Merge: 8320bfbf0711fc36a4c015223e706bb1e0a9dd4a a27cd1c4708f6af48c1a8da76af89d06382c7b25
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jan 15 20:41:22 2013 +0100

    Merge branch 'master' of ssh://git.debian.org/git/pkg-multimedia/libva
    
    Conflicts:
    	debian/changelog
    	debian/rules

diff --combined debian/changelog
index 9482610,f527f17..a15d0a2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,52 +1,56 @@@
+ libva (1.1.0-1) UNRELEASED; urgency=low
+ 
+   [ Andres Mejia ]
+   * Rewrite README.Debian with relavant info
+     about the package names for drivers.
+ 
+   [ Matteo F. Vescovi ]
+   * Imported Upstream version 1.1.0
+   * debian/patches/: patchset re-worked on new source
+   * debian/control: libegl1-mesa-dev b-dep added
+   * debian/control: obsolete DMUA flag dropped
+   * debian/control: S-V 3.9.3 => 3.9.4 (no changes needed)
+   * debian/watch: uscan path updated.
+     Thanks to Bart Martens (bartm) for the hint.
+ 
+  -- Andres Mejia <amejia004 at gmail.com>  Wed, 06 Jun 2012 18:00:24 +0200
+ 
+ libva (1.0.15-4) unstable; urgency=low
+ 
+   * Change section of vainfo to utils.
+ 
+  -- Andres Mejia <amejia at debian.org>  Sun, 18 Mar 2012 14:08:35 -0400
+ 
+ libva (1.0.15-3) unstable; urgency=low
+ 
+   * Allow dev package to be multi-arch installable.
+ 
+  -- Andres Mejia <amejia at debian.org>  Fri, 16 Mar 2012 11:56:24 -0400
+ 
  libva (1.0.15-2) unstable; urgency=low
  
    [ Matteo F. Vescovi ]
    * debian/control: vainfo's "Section:" field defined (Closes: #631970)
    * debian/control: libva-dev's arch from "all" to "any"
    * debian/control: libva-dev dependencies cleaned
+   * debian/control: Standards-Version bumped to 3.9.3
    * debian/rules: configure parameters added for M-A
    * debian/: Multi-Arch support added
  
 +  [ Reinhard Tartler ]
 +  * Enable parallel builds
 +  * Upload to unstable
 +
+   [ Andres Mejia ]
+   * Include dpkg-source options in generated debian tarball.
+   * Don't include Multi-Arch field for packages which are not shared libraries.
+   * Use dh_auto_configure to pass in default+extra configure options.
+   * Support parallel builds.
+   * Remove test/demo programs from installation. This removes the libva-utils
+     package.
+   * Refreshed patches.
+ 
 - -- Andres Mejia <amejia at debian.org>  Fri, 16 Mar 2012 11:10:01 -0400
 + -- Reinhard Tartler <siretart at tauware.de>  Mon, 20 Feb 2012 18:15:34 +0100
  
  libva (1.0.15-1) experimental; urgency=low
  

-- 
libva packaging