Merge lp://qastaging/~noskcaj/ubuntu/utopic/libcryptui/3.12 into lp://qastaging/ubuntu/utopic/libcryptui

Proposed by Jackson Doak
Status: Needs review
Proposed branch: lp://qastaging/~noskcaj/ubuntu/utopic/libcryptui/3.12
Merge into: lp://qastaging/ubuntu/utopic/libcryptui
Diff against target: 71259 lines (+21186/-40400)
170 files modified
.pc/01_autostart_path.patch/daemon/Makefile.am (+0/-122)
.pc/02_seahorse-daemon_libcryptui_static_link.patch/daemon/Makefile.am (+0/-122)
.pc/02_seahorse-daemon_libcryptui_static_link.patch/libcryptui/Makefile.am (+0/-126)
.pc/applied-patches (+0/-2)
ChangeLog (+507/-0)
Makefile.am (+4/-0)
Makefile.in (+131/-109)
NEWS (+21/-0)
aclocal.m4 (+185/-153)
config.guess (+35/-22)
config.sub (+63/-39)
configure (+177/-100)
configure.ac (+1/-12)
daemon/Makefile.am (+2/-2)
daemon/Makefile.in (+104/-80)
daemon/seahorse-context.c (+1/-4)
daemon/seahorse-context.h (+1/-4)
daemon/seahorse-daemon.c (+2/-6)
daemon/seahorse-daemon.h (+1/-4)
daemon/seahorse-dbus-server.c (+1/-4)
daemon/seahorse-gpg-op.c (+1/-4)
daemon/seahorse-gpg-op.h (+1/-4)
daemon/seahorse-gpg-options.c (+1/-4)
daemon/seahorse-gpg-options.h (+1/-4)
daemon/seahorse-gpgme-data.c (+1/-4)
daemon/seahorse-gpgme-data.h (+1/-3)
daemon/seahorse-gpgme-generate.c (+1/-4)
daemon/seahorse-gpgme-generate.h (+1/-4)
daemon/seahorse-gpgme-key-op.c (+1/-4)
daemon/seahorse-gpgme-key-op.h (+1/-4)
daemon/seahorse-gpgme-key.c (+4/-4)
daemon/seahorse-gpgme-key.h (+1/-4)
daemon/seahorse-gpgme-operation.c (+1/-4)
daemon/seahorse-gpgme-operation.h (+1/-4)
daemon/seahorse-gpgme-source.c (+1/-4)
daemon/seahorse-gpgme-source.h (+1/-4)
daemon/seahorse-gpgme-subkey.c (+1/-4)
daemon/seahorse-gpgme-subkey.h (+1/-4)
daemon/seahorse-gpgme-uid.c (+1/-4)
daemon/seahorse-gpgme-uid.h (+1/-4)
daemon/seahorse-gpgme.c (+1/-3)
daemon/seahorse-gpgme.h (+1/-3)
daemon/seahorse-libdialogs.h (+1/-4)
daemon/seahorse-notification.c (+1/-4)
daemon/seahorse-object-list.c (+1/-3)
daemon/seahorse-object-list.h (+1/-3)
daemon/seahorse-object.c (+1/-3)
daemon/seahorse-object.h (+1/-3)
daemon/seahorse-operation.c (+1/-4)
daemon/seahorse-operation.h (+1/-4)
daemon/seahorse-passphrase.c (+1/-4)
daemon/seahorse-passphrase.h (+1/-4)
daemon/seahorse-pgp-key.c (+1/-4)
daemon/seahorse-pgp-key.h (+1/-4)
daemon/seahorse-pgp-module.c (+1/-3)
daemon/seahorse-pgp-module.h (+1/-3)
daemon/seahorse-pgp-signature.c (+1/-4)
daemon/seahorse-pgp-signature.h (+1/-4)
daemon/seahorse-pgp-subkey.c (+1/-4)
daemon/seahorse-pgp-subkey.h (+1/-4)
daemon/seahorse-pgp-uid.c (+1/-149)
daemon/seahorse-pgp-uid.h (+1/-6)
daemon/seahorse-pgp.c (+1/-3)
daemon/seahorse-pgp.h (+1/-3)
daemon/seahorse-progress.c (+1/-4)
daemon/seahorse-progress.h (+1/-4)
daemon/seahorse-secure-buffer.c (+1/-3)
daemon/seahorse-secure-buffer.h (+1/-3)
daemon/seahorse-secure-memory.c (+1/-4)
daemon/seahorse-service-crypto-bindings.h (+1/-1)
daemon/seahorse-service-crypto.c (+127/-111)
daemon/seahorse-service-crypto.xml (+1/-0)
daemon/seahorse-service-keyset.c (+1/-4)
daemon/seahorse-service.c (+1/-4)
daemon/seahorse-service.h (+1/-4)
daemon/seahorse-set.c (+1/-4)
daemon/seahorse-set.h (+1/-4)
daemon/seahorse-source.c (+1/-4)
daemon/seahorse-source.h (+1/-4)
daemon/seahorse-transfer-operation.c (+1/-4)
daemon/seahorse-transfer-operation.h (+1/-4)
daemon/seahorse-types.c (+1/-4)
daemon/seahorse-types.h (+1/-4)
daemon/seahorse-unix-signal.c (+1/-4)
daemon/seahorse-unix-signal.h (+1/-4)
daemon/seahorse-unknown-source.c (+1/-4)
daemon/seahorse-unknown-source.h (+1/-4)
daemon/seahorse-unknown.c (+1/-4)
daemon/seahorse-unknown.h (+1/-4)
daemon/seahorse-util.c (+1/-4)
daemon/seahorse-util.h (+1/-4)
daemon/seahorse-validity.c (+1/-4)
daemon/seahorse-validity.h (+1/-4)
daemon/seahorse-widget.c (+1/-4)
daemon/seahorse-widget.h (+1/-4)
data/Makefile.in (+61/-32)
debian/changelog (+6/-0)
debian/control (+2/-1)
debian/control.in (+2/-1)
debian/patches/01_autostart_path.patch (+7/-5)
debian/patches/02_seahorse-daemon_libcryptui_static_link.patch (+8/-7)
depcomp (+296/-193)
gtk-doc.make (+75/-40)
install-sh (+7/-7)
libcryptui/Makefile.am (+2/-11)
libcryptui/Makefile.in (+113/-91)
libcryptui/cryptui-defines.h (+1/-3)
libcryptui/cryptui-key-chooser.c (+132/-11)
libcryptui/cryptui-key-chooser.h (+10/-6)
libcryptui/cryptui-key-combo.c (+1/-3)
libcryptui/cryptui-key-combo.h (+1/-3)
libcryptui/cryptui-key-list.c (+1/-3)
libcryptui/cryptui-key-list.h (+1/-3)
libcryptui/cryptui-key-store.c (+1/-3)
libcryptui/cryptui-key-store.h (+1/-3)
libcryptui/cryptui-keyset.c (+1/-3)
libcryptui/cryptui-keyset.h (+1/-3)
libcryptui/cryptui-priv.h (+1/-3)
libcryptui/cryptui.c (+86/-16)
libcryptui/cryptui.h (+7/-3)
libcryptui/cryptui.pc.in (+1/-1)
libcryptui/tests/Makefile.in (+93/-59)
libcryptui/tests/cryptui-test-ui.c (+10/-6)
libegg/Makefile.in (+86/-51)
libegg/egg-datetime.c (+1/-3)
libegg/egg-datetime.h (+1/-3)
libegg/eggdesktopfile.c (+1/-2)
libegg/eggdesktopfile.h (+1/-2)
libegg/eggsmclient-private.h (+1/-3)
libegg/eggsmclient-xsmp.c (+1/-3)
libegg/eggsmclient.c (+1/-3)
libegg/eggsmclient.h (+1/-3)
m4/gtk-doc.m4 (+36/-15)
m4/libtool.m4 (+9/-3)
missing (+159/-275)
pixmaps/22x22/Makefile.in (+61/-32)
pixmaps/48x48/Makefile.in (+61/-32)
pixmaps/Makefile.in (+114/-93)
pixmaps/scalable/Makefile.in (+61/-32)
po/cs.po (+460/-2609)
po/es.po (+87/-50)
po/gl.po (+2071/-2634)
po/he.po (+2005/-2663)
po/id.po (+455/-2598)
po/it.po (+458/-2630)
po/lt.po (+468/-3451)
po/lv.po (+2055/-2613)
po/nb.po (+422/-2590)
po/pl.po (+79/-46)
po/pt_BR.po (+843/-2939)
po/sl.po (+2054/-2518)
po/sr.po (+472/-2667)
po/sr@latin.po (+472/-2667)
po/zh_CN.po (+1962/-2533)
reference/Makefile.in (+107/-87)
reference/libcryptui/Makefile.in (+150/-93)
reference/libcryptui/html/ch01.html (+10/-10)
reference/libcryptui/html/index.html (+3/-3)
reference/libcryptui/html/index.sgml (+48/-53)
reference/libcryptui/html/libcryptui-cryptui-defines.html (+53/-26)
reference/libcryptui/html/libcryptui-cryptui-key-chooser.html (+391/-255)
reference/libcryptui/html/libcryptui-cryptui-key-combo.html (+247/-174)
reference/libcryptui/html/libcryptui-cryptui-key-list.html (+370/-262)
reference/libcryptui/html/libcryptui-cryptui-key-store.html (+849/-591)
reference/libcryptui/html/libcryptui-cryptui-keyset.html (+783/-552)
reference/libcryptui/html/libcryptui-cryptui-marshal.html (+47/-36)
reference/libcryptui/html/libcryptui-cryptui.html (+511/-410)
reference/libcryptui/html/libcryptui.devhelp2 (+67/-92)
reference/libcryptui/html/style.css (+223/-28)
reference/libcryptui/tmpl/cryptui-key-chooser.sgml (+1/-0)
To merge this branch: bzr merge lp://qastaging/~noskcaj/ubuntu/utopic/libcryptui/3.12
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Review via email: mp+225107@code.qastaging.launchpad.net

Description of the change

New upstream release

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

I took the liberty to change the version number to 3.12.2-0ubuntu1 instead of 3.12.2-1.

review: Approve

Unmerged revisions

9. By Jackson Doak

New upstream release.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: