← Back to branch summary

~noskcaj/ubuntu/trusty/gpgme1.0/1.4.3

« back to all changes in this revision

Viewing changes to src/Makefile.am

  • Committer: Jackson Doak
  • Date: 2013-10-23 07:02:39 UTC
  • mfrom: (13.1.1 sid)
  • Revision ID: noskcaj@ubuntu.com-20131023070239-bbtonk3q5jdsnamr
http://bugs.debian.org/712813
* 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. This was missing in the
    previous upload, and unbreaks nautilus-dropbox, seahorse, bzr, and other
    libgpgme consumers.
  - 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
* NMU
* New upstream release.
* debian/control (Build-Depends): Dropped dirmngr (closes: #712813). It is
  not necessary for the build.
  (Vcs-Browser, Vcs-Svn): Fixed vcs-field-not-canonical.
* debian/libgpgme11.symbols: Updated symbols file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Makefile.am
103
103
# unresolved symbols to the thread module.
104
104
main_sources =                                                          \
105
105
        util.h conversion.c get-env.c context.h ops.h                   \
 
106
        parsetlv.c parsetlv.h                                           \
106
107
        data.h data.c data-fd.c data-stream.c data-mem.c data-user.c    \
107
 
        data-compat.c                                                   \
 
108
        data-compat.c data-identify.c                                   \
108
109
        signers.c sig-notation.c                                        \
109
110
        wait.c wait-global.c wait-private.c wait-user.c wait.h          \
110
111
        op-support.c                                                    \
118
119
        $(uiserver_components)                                          \
119
120
        $(g13_components) vfs-mount.c vfs-create.c                      \
120
121
        gpgconf.c                                                       \
121
 
        sema.h priv-io.h $(system_components) dirinfo.c                 \
 
122
        sema.h priv-io.h $(system_components) sys-util.h dirinfo.c      \
122
123
        debug.c debug.h gpgme.c version.c error.c
123
124
 
124
125
libgpgme_la_SOURCES = $(main_sources)                                   \