← Back to branch summary

~ubuntu-branches/ubuntu/vivid/gpgme1.0/vivid

« back to all changes in this revision

Viewing changes to src/engine-uiserver.c

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2014-10-31 10:54:12 UTC
  • mfrom: (13.1.8 sid)
  • Revision ID: package-import@ubuntu.com-20141031105412-76uoahn8g7rp0f4z
Tags: 1.5.1-6ubuntu1
* Merge from debian unstable. Remaining changes:
  - debian/rules: Switch back to using /usr/bin/gpg and add back gnupg
    build dependency, as we don't install gnupg2 by default. 
  - debian/control: Depends on "gnupg | gnupg2" rather than gnupg2,
    default to the old version since the new one depends on gpg-agent,
    pinentry-gtk2, and a bunch of other packages we don't need/want in
    the default installation
* Dropped changes:
  - debian/patches/CVE-2014-3564.patch: upstream
  - debian/patches/test_engine_ignore_filename.diff: upstream
  - debian/rules: Fix build failure by running the tests without
    parallelization: handled in Debian by using newer automake

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/engine-uiserver.c
1340
1340
    uiserver_cancel,
1341
1341
    NULL,               /* cancel_op */
1342
1342
    NULL,               /* passwd */
1343
 
    NULL                /* set_pinentry_mode */
 
1343
    NULL,                /* set_pinentry_mode */
 
1344
    NULL                /* opspawn */
1344
1345
  };