Merge lp:~laney/ubuntuone-credentials/multiarch-common into lp:ubuntuone-credentials

[Iain Lane]

Make ubuntuone-credentials-common Architecture: all and Multi-Arch: foreign. This allows cross-building of ubuntuone-credentials' reverse dependencies.

The files in this package are all arch-independent.

[lp:~laney/ubuntuone-credentials/multiarch-common]

92. By Iain Lane on 2014-04-02

Depend on -common (= ${source:Version})

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:91
http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-ci/83/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-trusty-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-trusty-armhf-ci/13
        deb: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-trusty-armhf-ci/13/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntuone-credentials-ci/83/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:92
http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-ci/84/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-trusty-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-trusty-armhf-ci/14
        deb: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-trusty-armhf-ci/14/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntuone-credentials-ci/84/rebuild

review: Approve (continuous-integration)

[dobey (dobey)]

review: Approve

[Robert Bruce Park (robru)]

CI Train doesn't handle it well when there's a manual distro upload, in particular this branch didn't include the changelog that was manually uploaded, so ironically CI Train complained that this branch couldn't be built because it didn't include the contents of the manual distro upload. I merged manually and pushed directly to trunk here:

http://bazaar.launchpad.net/~ubuntuone-control-tower/ubuntuone-credentials/trunk/revision/91

For future reference, the easiest way to handle this (from the CI Train perspective) is to just do the MP, don't bother with the direct archive upload. Less risk of conflicts that way, thanks. (unless of course the issue is urgent)

[dobey (dobey)]

Robert, *please* do not commit direct to trunk in these cases in the future. Just comment on the MP and review it needs fixing for not containing all of the changes, instead.

Stuff like this happening is exactly why I am not fond of the CI train process, or allowing so many people to have direct commit access to trunk.

=== modified file 'debian/control'
--- debian/control	2014-01-30 18:51:37 +0000
+++ debian/control	2014-04-02 10:55:20 +0000
@@ -20,8 +20,8 @@
 Xs-Testsuite: autopkgtest
 
 Package: ubuntuone-credentials-common
-Architecture: any
-Multi-Arch: same
+Architecture: all
+Multi-Arch: foreign
 Pre-Depends:
  multiarch-support,
  ${misc:Pre-Depends},
@@ -68,7 +68,7 @@
  ${misc:Pre-Depends},
 Depends:
  signon-plugin-password,
- ubuntuone-credentials-common (= ${binary:Version}),
+ ubuntuone-credentials-common (= ${source:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Description: Ubuntu One authentication library