diff -Nru moonshot-ui-0.6~aa/debian/bzr-builder.manifest moonshot-ui-0.6~aa/debian/bzr-builder.manifest --- moonshot-ui-0.6~aa/debian/bzr-builder.manifest 2015-03-17 23:16:27.000000000 +0000 +++ moonshot-ui-0.6~aa/debian/bzr-builder.manifest 2015-03-25 05:31:23.000000000 +0000 @@ -1,3 +1,3 @@ -# bzr-builder format 0.3 deb-version {debupstream}~aa-0~388 -lp:moonshot-ui revid:git-v1:3070990ebff578c309fd53126aa9d1c252ce2d95 +# bzr-builder format 0.3 deb-version {debupstream}~aa-0~390 +lp:moonshot-ui revid:git-v1:bc2e7531b4143f72b0c03093d2e8e69a02f548bd merge packaging lp:~moonshot/moonshot-ui/ui-dailies revid:git-v1:f36a635f6599854902ad74239c74c7c2046381d3 diff -Nru moonshot-ui-0.6~aa/debian/changelog moonshot-ui-0.6~aa/debian/changelog --- moonshot-ui-0.6~aa/debian/changelog 2015-03-17 23:16:27.000000000 +0000 +++ moonshot-ui-0.6~aa/debian/changelog 2015-03-25 05:31:23.000000000 +0000 @@ -1,8 +1,8 @@ -moonshot-ui (0.6~aa-0~388~ubuntu12.04.1) precise; urgency=low +moonshot-ui (0.6~aa-0~390~ubuntu12.04.1) precise; urgency=low * Auto build. - -- Sam Hartman Tue, 17 Mar 2015 23:16:27 +0000 + -- Sam Hartman Wed, 25 Mar 2015 05:31:23 +0000 moonshot-ui (0.6-2) UNRELEASED; urgency=low diff -Nru moonshot-ui-0.6~aa/moonshot-ui.spec.in moonshot-ui-0.6~aa/moonshot-ui.spec.in --- moonshot-ui-0.6~aa/moonshot-ui.spec.in 2015-03-17 23:16:24.000000000 +0000 +++ moonshot-ui-0.6~aa/moonshot-ui.spec.in 2015-03-25 05:31:20.000000000 +0000 @@ -1,6 +1,6 @@ Name: @PACKAGE@ Version: @VERSION@ -Release: 1%{?dist} +Release: 2%{?dist} Summary: Moonshot Federated Identity User Interface Group: Security Tools diff -Nru moonshot-ui-0.6~aa/src/moonshot-keyring-store.vala moonshot-ui-0.6~aa/src/moonshot-keyring-store.vala --- moonshot-ui-0.6~aa/src/moonshot-keyring-store.vala 2015-03-17 23:16:24.000000000 +0000 +++ moonshot-ui-0.6~aa/src/moonshot-keyring-store.vala 2015-03-25 05:31:20.000000000 +0000 @@ -111,7 +111,7 @@ } else if (attribute.name == "Rules-AlwaysConfirm") { rules_always_confirm_index = i; } else if (attribute.name == "CA-Cert") { - id_card.trust_anchor.ca_cert = value; + id_card.trust_anchor.ca_cert = value.strip(); } else if (attribute.name == "Server-Cert") { id_card.trust_anchor.server_cert = value; } else if (attribute.name == "Subject") { diff -Nru moonshot-ui-0.6~aa/src/moonshot-local-flat-file-store.vala moonshot-ui-0.6~aa/src/moonshot-local-flat-file-store.vala --- moonshot-ui-0.6~aa/src/moonshot-local-flat-file-store.vala 2015-03-17 23:16:24.000000000 +0000 +++ moonshot-ui-0.6~aa/src/moonshot-local-flat-file-store.vala 2015-03-25 05:31:20.000000000 +0000 @@ -111,7 +111,7 @@ } // Trust anchor - id_card.trust_anchor.ca_cert = key_file.get_string (identity, "CA-Cert"); + id_card.trust_anchor.ca_cert = key_file.get_string (identity, "CA-Cert").strip(); id_card.trust_anchor.subject = key_file.get_string (identity, "Subject"); id_card.trust_anchor.subject_alt = key_file.get_string (identity, "SubjectAlt"); id_card.trust_anchor.server_cert = key_file.get_string (identity, "ServerCert");