Merge lp:~didrocks/platform-api/fix-archs into lp:platform-api

[Didier Roche-Tolomelli]

fix archs for not building on powerpc and arch: all for transitional packages

fix archs for not building on powerpc and arch: all for transitional packages

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:62
http://jenkins.qa.ubuntu.com/job/platform-api-ci/32/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-amd64-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-armhf-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-i386-ci/2/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/platform-api-ci/32/rebuild

review: Needs Fixing (continuous-integration)

[Ricardo Salveti (rsalveti)]

Needs fixing:
=== modified file 'debian/control'
--- debian/control 2013-06-04 17:42:12 +0000
+++ debian/control 2013-06-04 18:31:24 +0000
@@ -70,7 +70,6 @@
 Section: oldlibs
 Architecture: all
 Pre-Depends: ${misc:Pre-Depends},
-Multi-Arch: same
 Depends: libplatform-api-headers (= ${binary:Version}),
          ${misc:Depends},
 Description: dummy transitional package for libplatform-api-headers
@@ -82,7 +81,6 @@
 Section: oldlibs
 Architecture: all
 Pre-Depends: ${misc:Pre-Depends},
-Multi-Arch: same
 Depends: libplatform-api1-dev (= ${binary:Version}),
          ${misc:Depends},
 Description: dummy transitional package for libplatform-api1-dev
@@ -91,13 +89,12 @@
  This package can be safely removed.

 Package: ubuntu-platform-implementation-android
-Architecture: all
+Architecture: all
 Provides: libubuntu-platform-api1,
 Conflicts: libubuntu-platform-api1,
 Replaces: libubuntu-platform-api1,
 Section: oldlibs
 Pre-Depends: ${misc:Pre-Depends},
-Multi-Arch: same
 Depends: libplatform-api1-hybris (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},

review: Needs Fixing

[lp:~didrocks/platform-api/fix-archs]

63. By Didier Roche-Tolomelli on 2013-06-04

arch: all shouldn't be multiarched. Pre-depends isn't needed anymore. Fix Section as well

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:63
http://jenkins.qa.ubuntu.com/job/platform-api-ci/33/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-armhf-ci/3/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-i386-ci/3

Click here to trigger a rebuild:
http://s-jenkins:8080/job/platform-api-ci/33/rebuild

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

Good, thanks!

review: Approve

=== modified file 'debian/control'
--- debian/control	2013-04-10 15:22:37 +0000
+++ debian/control	2013-06-04 18:59:24 +0000
@@ -18,7 +18,7 @@
 Section: libdevel
 Pre-Depends: ${misc:Pre-Depends},
 Multi-Arch: same
-Architecture: any
+Architecture: i386 amd64 armhf
 Depends: ${misc:Depends},
 Description: Platform API for system level capabilities (API headers)
  This package provides the library headers for the Platform API.
@@ -31,7 +31,7 @@
 Section: libdevel
 Pre-Depends: ${misc:Pre-Depends},
 Multi-Arch: same
-Architecture: any
+Architecture: i386 amd64 armhf
 Depends: libgles2-mesa-dev,
          libplatform-api-headers (= ${binary:Version}),
          libplatform-api1-hybris | libplatform-api1,
@@ -47,7 +47,7 @@
 Section: libs
 Pre-Depends: ${misc:Pre-Depends},
 Multi-Arch: same
-Architecture: any
+Architecture: i386 amd64 armhf
 Depends: libhybris,
          ${misc:Depends},
          ${shlibs:Depends},
@@ -58,7 +58,7 @@
  Android userspace, which is where the Ubuntu Application Manager lives.
 
 Package: libplatform-api1-hybris-tests
-Architecture: any
+Architecture: i386 amd64 armhf
 Depends: libplatform-api1-hybris (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
@@ -68,9 +68,7 @@
 
 Package: ubuntu-platform-api-headers
 Section: oldlibs
-Pre-Depends: ${misc:Pre-Depends},
-Multi-Arch: same
-Architecture: any
+Architecture: all
 Depends: libplatform-api-headers (= ${binary:Version}),
          ${misc:Depends},
 Description: dummy transitional package for libplatform-api-headers
@@ -80,9 +78,7 @@
 
 Package: libubuntu-platform-api1-dev
 Section: oldlibs
-Pre-Depends: ${misc:Pre-Depends},
-Multi-Arch: same
-Architecture: any
+Architecture: all
 Depends: libplatform-api1-dev (= ${binary:Version}),
          ${misc:Depends},
 Description: dummy transitional package for libplatform-api1-dev
@@ -91,13 +87,11 @@
  This package can be safely removed.
 
 Package: ubuntu-platform-implementation-android
+Section: oldlibs
+Architecture: all 
 Provides: libubuntu-platform-api1,
 Conflicts: libubuntu-platform-api1,
 Replaces: libubuntu-platform-api1,
-Section: oldlibs
-Pre-Depends: ${misc:Pre-Depends},
-Multi-Arch: same
-Architecture: any
 Depends: libplatform-api1-hybris (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
@@ -107,7 +101,8 @@
  This package can be safely removed.
 
 Package: ubuntu-platform-implementation-android-tests
-Architecture: oldlibs
+Architecture: all
+Section: oldlibs
 Depends: libplatform-api1-hybris-tests (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},