Branches for Trusty

Author: Jackson Doak
Revision Date: 2013-10-26 05:55:46 UTC

* Merge with Debian; remaining changes:
    - debian/patches/01_support_alternatives.patch:
      - Put XvMCConfig in usr/lib/xvmcconfig-standard.
      - Make the library look for /lib/XvMCConfig (which will be the
        link that alternatives will set).
    - debian/patches/ld.gold.diff:
      Resolve unresolved symbols in shared library
  * Drop CVE patches, fixed upstream

Author: Artur Rona
Revision Date: 2013-11-03 01:40:21 UTC

* Merge from Debian unstable. (LP: #1247502) Remaining changes:
  - debian/patches/01_support_alternatives.patch,
    debian/libxvmc1.install, debian/rules:
    + Put XvMCConfig in usr/lib/xvmcconfig-standard.
    + Make the library look for /lib/XvMCConfig (which will be
      the link that alternatives will set).
* Drop debian/patches/ld.gold.diff: not need anymore.
* Drop debian/patches/CVE* patches, both are fixed upstream.
* Re-apply mistakenly dropped delta in latest merge:
  - debian/libxvmc1.install, debian/rules

Author: Artur Rona
Revision Date: 2013-11-03 01:40:21 UTC

* Merge from Debian unstable. (LP: #1247502) Remaining changes:
  - debian/patches/01_support_alternatives.patch,
    debian/libxvmc1.install, debian/rules:
    + Put XvMCConfig in usr/lib/xvmcconfig-standard.
    + Make the library look for /lib/XvMCConfig (which will be
      the link that alternatives will set).
* Drop debian/patches/ld.gold.diff: not need anymore.
* Drop debian/patches/CVE* patches, both are fixed upstream.
* Re-apply mistakenly dropped delta in latest merge:
  - debian/libxvmc1.install, debian/rules