Last commit made on 2014-02-19
Get this branch:
git clone -b ubuntu/trusty-proposed https://git.launchpad.net/ubuntu/+source/gnupg2
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information


Recent commits

d3376a0... by Dimitri John Ledkov on 2014-02-19

Import patches-unapplied version 2.0.22-3ubuntu1 to ubuntu/trusty-proposed

Imported using git-ubuntu import.

Changelog parent: 8cc97ca251176fc48661d69ded61eb6932970165

New changelog entries:
  * Merge from Debian, remaining changes:
    - Drop sh prefix from openpgp test environment as it leads to exec
    invocations of sh /bin/bash leading to syntax errors from sh. Fixes
    FTBFS detected in Ubuntu saucy archive rebuild.
    - Add udev rules to give gpg access to some smartcard readers;
      Debian #543217.
    - debian/gnupg2.udev: udev rules to set ACLs on SCM smartcard readers.
    - Add upstart user job for gpg-agent.

8cc97ca... by Eric Dorland on 2014-01-02

Import patches-unapplied version 2.0.22-3 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 3ce2e51ffca8a013b1ea93776be417201663a2e7

New changelog entries:
  * debian/watch, debian/upstream-signing-key.pgp: Add upstream signing
    key for uscan verification.
  * debian/kbxutil.1, debian/rules: Add better description and regenerate
    the manpage.
  * debian/control: Remove version on gpg-idea conflict, add missing
    Breaks for gpgsm and convert Conflicts to Breaks for gpgv2.
  * debian/control: Move gnupg-agent to Depends for gpgsm instead of
    Replaces (which in turn should have been Recommends).
  * debian/control: Standards-Version to 3.9.5.
  * debian/copyright: Switch to a shiny DEP-5 copyright file.

3ce2e51... by Eric Dorland on 2013-12-01

Import patches-unapplied version 2.0.22-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 9b4877f6987752832323f94553fa5b632e9ab024

New changelog entries:
  * debian/control: Fix Build-Conflicts on newer automakes. Thanks Chris
    Boot. (Closes: #726015)
  * debian/control: IDEA is no longer patented, drop its metion from the
    description. Thanks brian m. carlson. (Closes: #726139)
  * debian/rules: Disable the test suite on mips and mipsel to work around

9b4877f... by Eric Dorland on 2013-10-05

Import patches-unapplied version 2.0.22-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 8ab3620edf5fbb2cc0bddd4d8376a1b94cc1b0cc

New changelog entries:
  * New upstream version. Fixes CVE-2013-4402 and CVE-2013-4351. (Closes:
    #725433, #722724)
  * debian/gnupg2.install: Install gnupg-card-architecture.png for the
    info file.

8ab3620... by Eric Dorland on 2013-09-01

Import patches-unapplied version 2.0.21-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: ee005a91985436321d045b7a9c377e398f035f87

New changelog entries:
  * debian/rules, debian/gnupg2.install: Switch libexecdir to
    /usr/lib/gnupg2 to install helper binaries to a non-multiarch specific
    location. (Closes: #717303)
  * debian/control, debian/gpgv2.install: Split out gpgv2 into its own
  * debian/control, debian/gnupg2.install, debian/kbxutil.1: Add rule and
    manpage for kbxutil using help2man. (Closes: #323494)
  * debian/patches/02-gpgv2-dont-link-libassuan.diff: Don't link gpgv2
    against libassuan as it's not used.
  * debian/rules: Install changelog for gpgv2.

ee005a9... by Eric Dorland on 2013-08-25

Import patches-unapplied version 2.0.21-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 480650e99316fdd9495ea75bfa568f6208963905

New changelog entries:
  * New upstream release. (Closes: #613465, #720369)
  * debian/patches/01-gnupg2-rename.diff: Refresh patch.
  * debian/control: Fix Vcs-Git path.
  * debian/control: Now depends on libgpg-error >= 1.11.
  * debian/control: Build-Depends on automake1.11 since the test suite
    fails on newer versions. (Closes: #713287)
  * debian/control: Also need a Build-Conflicts on automake (<= 1.12).

480650e... by Eric Dorland on 2013-05-11

Import patches-unapplied version 2.0.20-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 515e03b7e57cc652746e03c59d4412831196f236

New changelog entries:
  * New upstream release. (Closes: #691237, #583893)
  * debian/patches/02-cve-2012-6085.diff: Remove, merged upstream.
  * debian/control: Upgrade Standards-Version to 3.9.4.
  * debian/compat, debian/control: Upgrade to debhelper v9.
  * debian/control, debian/rules: Drop hardening-wrapper, now that we use
    debhelper v9.
  * debian/scdaemon.install: scdaemon has moved under $libexecdir.
  * debian/control: Tighten dependency on scdaemon.
  * debian/rules: Turn on all hardening options.
  * debian/patches/01-gnupg2-rename.diff: Refresh patch.
  * debian/gnupg-agent.install, debian/gnupg2.install,
    debian/scdaemon.install: Fix /usr/lib paths for multi-arch.
  * debian/rules: Pass ${pkglibdir} to --libexecdir since dh v9 passes
    ${libdir} by default.

515e03b... by Eric Dorland on 2013-01-04

Import patches-unapplied version 2.0.19-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: c970c3f1f7ff379293eabee3afa13063f41043ee

New changelog entries:
  * debian/patches/02-cve-2012-6085.diff: Patch from upstream to fix
    CVE-2012-6085, "gnupg key import memory corruption". (Closes: #697251)
  * debian/control: Use canonical addresses for VCS.
  * debian/control: Fix scdaemon short description.

c970c3f... by Eric Dorland on 2012-03-31

Import patches-unapplied version 2.0.19-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 2395abea9ffc5bce2b4041f29bc947db86c5124f

New changelog entries:
  * New upstream release. (Closes: #666092)
  * debian/control: Add Multi-Arch: foreign to all packages.
  * debian/rules: Update ChangeLog locations.

2395abe... by Eric Dorland on 2011-10-16

Import patches-unapplied version 2.0.18-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 3cb5383d6a994385285ad0fbd3e1a1b64757b43d

New changelog entries:
  * debian/control, debian/gpgsm.install, debian/scdaemon.install: Add a
    separate package for the scdaemon. (Closes: #416129)
  * debian/control, debian/gpgsm.install, debian/gnupg2.install,
    gnupg-agent.install: Move gpg-preset-passphrase and gpg-protect-tool
    into the gnupg-agent.
  * debian/control: Upgrade Standards-Version to 3.9.2.
  * debian/rules: Install ChangeLog for new scdaemon package.