Merge lp://staging/~noskcaj/ubuntu/vivid/gcr/3.15.90 into lp://staging/ubuntu/vivid/gcr
Proposed by
Jackson Doak
| Status: | Rejected |
|---|---|
| Rejected by: | Sebastien Bacher |
| Proposed branch: | lp://staging/~noskcaj/ubuntu/vivid/gcr/3.15.90 |
| Merge into: | lp://staging/ubuntu/vivid/gcr |
| Diff against target: |
20491 lines (+4185/-4483) (has conflicts) 138 files modified
.pc/applied-patches (+0/-1) .pc/bgo737622.patch/gcr/Makefile.am (+0/-402) Makefile.in (+5/-5) NEWS (+9/-0) configure (+23/-21) configure.ac (+5/-3) debian/changelog (+10/-0) debian/control (+2/-1) debian/control.in (+2/-1) debian/patches/bgo737622.patch (+0/-23) debian/patches/series (+0/-1) docs/reference/gck/html/GckAttributes.html (+123/-123) docs/reference/gck/html/GckEnumerator.html (+41/-41) docs/reference/gck/html/GckModule.html (+46/-46) docs/reference/gck/html/GckObject.html (+108/-108) docs/reference/gck/html/GckObjectCache.html (+31/-31) docs/reference/gck/html/GckSession.html (+345/-345) docs/reference/gck/html/GckSlot.html (+77/-77) docs/reference/gck/html/gck-Errors.html (+3/-3) docs/reference/gck/html/gck-GckAttribute.html (+54/-54) docs/reference/gck/html/gck-GckModule-lists.html (+40/-40) docs/reference/gck/html/gck-Library-Utilities.html (+3/-3) docs/reference/gck/html/gck-Miscellaneous-Functions.html (+26/-26) docs/reference/gck/html/gck-PKCS11-URIs.html (+9/-9) docs/reference/gck/html/index.html (+1/-1) docs/reference/gck/tmpl/gck-attribute.sgml (+0/-2) docs/reference/gck/tmpl/gck-attributes.sgml (+0/-2) docs/reference/gck/tmpl/gck-enumerator.sgml (+0/-2) docs/reference/gck/tmpl/gck-error.sgml (+0/-2) docs/reference/gck/tmpl/gck-library.sgml (+0/-2) docs/reference/gck/tmpl/gck-misc.sgml (+0/-2) docs/reference/gck/tmpl/gck-module.sgml (+0/-2) docs/reference/gck/tmpl/gck-modules.sgml (+0/-2) docs/reference/gck/tmpl/gck-object-cache.sgml (+0/-2) docs/reference/gck/tmpl/gck-object.sgml (+0/-2) docs/reference/gck/tmpl/gck-password.sgml (+0/-2) docs/reference/gck/tmpl/gck-private.sgml (+0/-2) docs/reference/gck/tmpl/gck-session.sgml (+0/-2) docs/reference/gck/tmpl/gck-slot.sgml (+0/-2) docs/reference/gck/tmpl/gck-uri.sgml (+0/-2) docs/reference/gcr/html/GcrCertificate.html (+97/-97) docs/reference/gcr/html/GcrCertificateChain.html (+36/-36) docs/reference/gcr/html/GcrCertificateWidget.html (+15/-15) docs/reference/gcr/html/GcrCollection.html (+15/-15) docs/reference/gcr/html/GcrCollectionModel.html (+36/-36) docs/reference/gcr/html/GcrComboSelector.html (+15/-15) docs/reference/gcr/html/GcrComparable.html (+10/-10) docs/reference/gcr/html/GcrImportButton.html (+15/-15) docs/reference/gcr/html/GcrImporter.html (+38/-38) docs/reference/gcr/html/GcrKeyWidget.html (+12/-12) docs/reference/gcr/html/GcrListSelector.html (+11/-11) docs/reference/gcr/html/GcrParser.html (+68/-68) docs/reference/gcr/html/GcrPkcs11Certificate.html (+18/-18) docs/reference/gcr/html/GcrPrompt.html (+101/-101) docs/reference/gcr/html/GcrPromptDialog.html (+17/-17) docs/reference/gcr/html/GcrRenderer.html (+10/-10) docs/reference/gcr/html/GcrSecretExchange.html (+20/-20) docs/reference/gcr/html/GcrSecureEntryBuffer.html (+8/-8) docs/reference/gcr/html/GcrSimpleCertificate.html (+6/-6) docs/reference/gcr/html/GcrSimpleCollection.html (+5/-5) docs/reference/gcr/html/GcrSystemPrompt.html (+44/-44) docs/reference/gcr/html/GcrSystemPrompter.html (+19/-19) docs/reference/gcr/html/GcrTreeSelector.html (+13/-13) docs/reference/gcr/html/GcrViewer.html (+7/-7) docs/reference/gcr/html/GcrViewerWidget.html (+21/-21) docs/reference/gcr/html/gcr-GcrCertificateRequest.html (+29/-29) docs/reference/gcr/html/gcr-GcrColumn.html (+8/-8) docs/reference/gcr/html/gcr-GcrImportInteraction.html (+13/-13) docs/reference/gcr/html/gcr-Key-Fingerprints.html (+12/-12) docs/reference/gcr/html/gcr-Library-PKCS#11.html (+29/-29) docs/reference/gcr/html/gcr-Library-Utilities.html (+3/-3) docs/reference/gcr/html/gcr-Non-pageable-Memory.html (+32/-32) docs/reference/gcr/html/gcr-Trust-Storage-and-Lookups.html (+94/-94) docs/reference/gcr/html/index.html (+1/-1) docs/reference/gcr/tmpl/GcrDBusPrompter.sgml (+0/-2) docs/reference/gcr/tmpl/GcrDBusPrompterCallback.sgml (+0/-2) docs/reference/gcr/tmpl/gcr-certificate-chain.sgml (+0/-2) docs/reference/gcr/tmpl/gcr-certificate-request.sgml (+0/-2) docs/reference/gcr/tmpl/gcr-certificate-widget.sgml (+0/-2) docs/reference/gcr/tmpl/gcr-certificate.sgml (+0/-2) docs/reference/gcr/tmpl/gcr-collection-model.sgml (+0/-2) docs/reference/gcr/tmpl/gcr-collection.sgml (+0/-2) docs/reference/gcr/tmpl/gcr-column.sgml (+0/-2) docs/reference/gcr/tmpl/gcr-combo-selector.sgml (+0/-2) docs/reference/gcr/tmpl/gcr-comparable.sgml (+0/-2) docs/reference/gcr/tmpl/gcr-filter-collection.sgml (+0/-2) docs/reference/gcr/tmpl/gcr-fingerprint.sgml (+0/-2) docs/reference/gcr/tmpl/gcr-import-button.sgml (+0/-2) docs/reference/gcr/tmpl/gcr-import-interaction.sgml (+0/-2) docs/reference/gcr/tmpl/gcr-importer.sgml (+0/-2) docs/reference/gcr/tmpl/gcr-key-widget.sgml (+0/-2) docs/reference/gcr/tmpl/gcr-library.sgml (+0/-2) docs/reference/gcr/tmpl/gcr-list-selector.sgml (+0/-2) docs/reference/gcr/tmpl/gcr-mock-prompter.sgml (+0/-2) docs/reference/gcr/tmpl/gcr-parser.sgml (+0/-2) docs/reference/gcr/tmpl/gcr-pkcs11-certificate.sgml (+0/-2) docs/reference/gcr/tmpl/gcr-pkcs11.sgml (+0/-2) docs/reference/gcr/tmpl/gcr-private.sgml (+0/-2) docs/reference/gcr/tmpl/gcr-prompt-dialog.sgml (+0/-2) docs/reference/gcr/tmpl/gcr-prompt.sgml (+0/-2) docs/reference/gcr/tmpl/gcr-renderer.sgml (+0/-2) docs/reference/gcr/tmpl/gcr-secret-exchange.sgml (+0/-2) docs/reference/gcr/tmpl/gcr-secure-entry-buffer.sgml (+0/-2) docs/reference/gcr/tmpl/gcr-secure-memory.sgml (+0/-2) docs/reference/gcr/tmpl/gcr-simple-certificate.sgml (+0/-2) docs/reference/gcr/tmpl/gcr-simple-collection.sgml (+0/-2) docs/reference/gcr/tmpl/gcr-system-prompt.sgml (+0/-2) docs/reference/gcr/tmpl/gcr-system-prompter.sgml (+0/-2) docs/reference/gcr/tmpl/gcr-tree-selector.sgml (+0/-2) docs/reference/gcr/tmpl/gcr-trust.sgml (+0/-2) docs/reference/gcr/tmpl/gcr-union-collection.sgml (+0/-2) docs/reference/gcr/tmpl/gcr-unlock-options-widget.sgml (+0/-2) docs/reference/gcr/tmpl/gcr-viewer-widget.sgml (+0/-2) docs/reference/gcr/tmpl/gcr-viewer.sgml (+0/-2) egg/Makefile.am (+2/-2) egg/egg-asn1x.c (+8/-7) egg/egg-libgcrypt.c (+1/-0) egg/test-asn1.c (+1/-0) egg/test-dn.c (+1/-0) gck/gck-object-cache.c (+1/-1) gck/gck-version.h (+2/-2) gcr/gcr-parser.c (+8/-1) gcr/gcr-pkcs11-importer.c (+2/-0) gcr/gcr-system-prompt.c (+14/-2) gcr/gcr-system-prompter.c (+2/-2) gcr/gcr-unlock-options.h (+0/-4) gcr/gcr-version.h (+2/-2) gcr/test-certificate-chain.c (+3/-0) gcr/test-system-prompt.c (+41/-32) po/bs.po (+725/-595) po/it.po (+312/-279) po/sk.po (+45/-93) po/sv.po (+505/-516) po/tr.po (+648/-580) ui/gcr-display-view.c (+5/-0) ui/gcr-viewer-window.c (+4/-0) ui/icons/Makefile.am (+1/-1) ui/icons/render-icons.py (+11/-11) Text conflict in debian/changelog |
| To merge this branch: | bzr merge lp://staging/~noskcaj/ubuntu/vivid/gcr/3.15.90 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Sebastien Bacher | Needs Information | ||
|
Review via email:
|
|||
Description of the change
New upstream bugfix release
To post a comment you must log in.
Revision history for this message
| Jackson Doak (noskcaj) wrote | # |
Revision history for this message
| Sebastien Bacher (seb128) wrote | # |
Unmerged revisions
- 13. By Jackson Doak
-
New upstream release.
- 12. By Jackson Doak
-
* New upstream bugfix release.
* Drop bgo737622.patch, fixed upstream.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thanks, why is it using an unstable serie number if it's a bugfix version?