Merge lp://staging/~noskcaj/ubuntu/wily/gpgme1.0/merge into lp://staging/ubuntu/wily/gpgme1.0
Proposed by
Jackson Doak
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~noskcaj/ubuntu/wily/gpgme1.0/merge |
| Merge into: | lp://staging/ubuntu/wily/gpgme1.0 |
| Diff against target: |
24011 lines (+9295/-6599) 79 files modified
.pc/0001-avoid-identifying-as-beta.patch/configure.ac (+646/-0) .pc/0002-GPGME-remove-BUILD_TIMESTAMP.patch/configure.ac (+646/-0) .pc/0002-GPGME-remove-BUILD_TIMESTAMP.patch/src/version.c (+371/-0) .pc/0002-GPGME-remove-BUILD_TIMESTAMP.patch/src/versioninfo.rc.in (+52/-0) .pc/applied-patches (+2/-1) .pc/update-gpl.texi.patch/doc/gpl.texi (+0/-724) AUTHORS (+12/-2) ChangeLog (+139/-0) Makefile.am (+0/-1) Makefile.in (+197/-160) NEWS (+35/-0) README (+1/-1) VERSION (+1/-1) aclocal.m4 (+403/-286) build-aux/compile (+305/-57) build-aux/config.guess (+121/-230) build-aux/config.sub (+87/-53) build-aux/depcomp (+395/-193) build-aux/install-sh (+23/-15) build-aux/missing (+159/-275) config.h.in (+1/-1) configure (+386/-181) configure.ac (+16/-13) debian/changelog (+34/-0) debian/clean (+4/-0) debian/control (+4/-4) debian/gbp.conf (+1/-0) debian/libgpgme11-dev.install (+1/-0) debian/libgpgme11-dev.manpages (+1/-0) debian/patches/0001-avoid-identifying-as-beta.patch (+25/-0) debian/patches/0002-GPGME-remove-BUILD_TIMESTAMP.patch (+70/-0) debian/patches/series (+2/-1) debian/patches/update-gpl.texi.patch (+0/-102) debian/rules (+1/-6) doc/Makefile.am (+2/-2) doc/Makefile.in (+123/-59) doc/gpgme.info (+139/-136) doc/gpgme.info-1 (+2870/-2220) doc/gpgme.info-2 (+257/-977) doc/gpgme.texi (+18/-4) doc/stamp-vti (+4/-4) doc/uiserver.texi (+9/-4) doc/version.texi (+4/-4) gpgme.spec (+1/-1) lang/Makefile.in (+145/-125) lang/cl/Makefile.in (+76/-37) lang/cl/gpgme.asd (+1/-1) m4/gpg-error.m4 (+38/-7) src/Makefile.am (+14/-8) src/Makefile.in (+225/-105) src/context.h (+1/-1) src/debug.c (+15/-4) src/debug.h (+32/-35) src/engine-gpg.c (+48/-13) src/engine-gpgsm.c (+33/-19) src/engine-spawn.c (+2/-3) src/export.c (+126/-3) src/gpgme-tool.c (+13/-8) src/gpgme.m4 (+52/-7) src/sign.c (+75/-33) src/signers.c (+1/-1) src/verify.c (+7/-0) src/version.c (+1/-1) src/versioninfo.rc.in (+0/-1) tests/Makefile.am (+3/-5) tests/Makefile.in (+193/-142) tests/gpg/Makefile.am (+16/-11) tests/gpg/Makefile.in (+191/-85) tests/gpg/final.test (+1/-1) tests/gpg/initial.test (+1/-1) tests/gpg/start-stop-agent (+0/-45) tests/gpgsm/Makefile.am (+19/-10) tests/gpgsm/Makefile.in (+177/-84) tests/gpgsm/final.test (+5/-0) tests/gpgsm/initial.test (+4/-0) tests/opassuan/Makefile.am (+11/-13) tests/opassuan/Makefile.in (+148/-71) tests/run-keylist.c (+8/-1) tests/start-stop-agent (+45/-0) |
| To merge this branch: | bzr merge lp://staging/~noskcaj/ubuntu/wily/gpgme1.0/merge |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel Holbach | Approve | ||
|
Review via email:
|
|||
Description of the change
Merge from debian
To post a comment you must log in.
Unmerged revisions
- 23. By Jackson Doak
-
* 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
* reproducibility: remove BUILD_TIMESTAMP
* use installed libgpgme to get help2man to work on minimal build
systems. Thanks, James Cowgill! (Closes: #789042)
* new upstream version
* ship /usr/bin/gpgme-tool in the -dev package.
* enable file descriptor passing
* use autoreconf
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thanks. Uploaded.