Branches for Vivid

Author: Marc Deslauriers
Revision Date: 2014-07-16 13:05:53 UTC

* Merge with Debian, remaining changes:
  - debian/rules: Add x32 support.
  - debian/control, debian/libnss3-nssdb.*, debian/libnss3.symbols,
    debian/pkcs11.txt, debian/rules: Add back support for shared cert
    and key databases.
* Dropped patches:
  - debian/patches/CVE-2014-1492.patch: upstream
  - debian/patches/95_add_spi_certs.patch: now equivalent to
    95_add_spi+cacert_ca_certs.patch
  - debian/patches/38_x32.patch: equivalent included upstream (except
    USE_X32 instead of USE_x32)
* debian/rules: also ship blapi.h and alghmac.h in libnss3-dev.