Merge lp:~timo-jyrinki/ubuntu-system-settings/enable_multiarch into lp:ubuntu-system-settings

[Timo Jyrinki]

Enable Multi-Arch for the libraries (LP: #1208347)

Also change back to arch 'any' instead of listing archs.

Enable Multi-Arch for the libraries (LP: #1208347)

Also change back to arch 'any' instead of listing archs.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:228
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/200/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/200

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-system-settings-ci/200/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

Thanks for the work, shouldn't the package have pre-depends on dpkg > multiarched-version though? Also the package doesn't really support multiarch, we didn't multiarch it but changed the paths in use to be more standard...

[Sebastien Bacher (seb128)]

review: Needs Fixing

[Sebastien Bacher (seb128)]

(I meant "Pre-Depends: ${misc:Pre-Depends}" for the pre-depends of course)

[lp:~timo-jyrinki/ubuntu-system-settings/enable_multiarch]

229. By Timo Jyrinki on 2013-08-05

Add Pre-Depends dpkg (>= 1.15.6~), ${misc:Pre-Depends} for the multi-arch packages.

[Timo Jyrinki (timo-jyrinki)]

Ok. If enabling multi-arch still does no harm, added the Pre-Depends as well now.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:229
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/201/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/201

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-system-settings-ci/201/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

Looks good to me, thanks

review: Approve

=== modified file 'debian/control'
--- debian/control	2013-08-01 15:29:45 +0000
+++ debian/control	2013-08-05 08:03:24 +0000
@@ -23,7 +23,7 @@
 Vcs-Bzr: https://code.launchpad.net/~system-settings-touch/ubuntu-system-settings/trunk
 
 Package: ubuntu-system-settings
-Architecture: i386 amd64 armhf
+Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          accountsservice,
@@ -46,9 +46,11 @@
 
 Package: libsystemsettings1
 Section: libs
-Architecture: i386 amd64 armhf
+Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends},
          ${shlibs:Depends},
+Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
 Description: System Settings Library for Ubuntu Touch
  This package contains the System Settings application used on the 
  Ubuntu Touch images, it's designed for phones, tablets and convergent 
@@ -56,10 +58,12 @@
 
 Package: libsystemsettings-dev
 Section: libdevel
-Architecture: i386 amd64 armhf
+Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          libsystemsettings1 (= ${binary:Version}),
+Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
 Description: System Settings for Ubuntu Touch - development files
  This package contains the System Settings application used on the 
  Ubuntu Touch images, it's designed for phones, tablets and convergent