Merge lp:~cjwatson/libaccounts-glib/multiarch into lp:libaccounts-glib

[Colin Watson]

Add multiarch annotations to libaccounts-glib0 and libaccounts-glib-tools.

libaccounts-glib0 installs files to multiarch-same-safe paths but doesn't declare itself as Multi-Arch: same.

This is part of the stack that's blocking being able to multiarch-install ubuntu-sdk-libs-dev:armhf, which I want to have in "click chroot".

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:184
http://jenkins.qa.ubuntu.com/job/libaccounts-glib-ci/38/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libaccounts-glib-trusty-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libaccounts-glib-trusty-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/libaccounts-glib-trusty-armhf-ci/5/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/libaccounts-glib-ci/38/rebuild

review: Approve (continuous-integration)

[Alberto Mardegan (mardy)]

LGTM, thanks!

review: Approve

[Colin Watson (cjwatson)]

After discussion with dbarth on IRC, I've uploaded this directly to the archive since there's significant other work on trunk and I need to move forward rather than being blocked on that. Please resync trunk when you get a chance.

=== modified file 'debian/control'
--- debian/control	2014-01-13 15:47:45 +0000
+++ debian/control	2014-03-18 09:47:10 +0000
@@ -45,6 +45,7 @@
 Package: libaccounts-glib0
 Section: libs
 Architecture: any
+Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: library for single signon
@@ -72,6 +73,7 @@
 
 Package: libaccounts-glib-tools
 Architecture: any
+Multi-Arch: foreign
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: library for single signon - tools
  .