platform-api

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

  1. fix-archs
  2. Merge into trunk
Proposed by Didier Roche-Tolomelli
Status: Merged
Approved by: Ricardo Salveti
Approved revision: 63
Merged at revision: 62
Proposed branch: lp:~didrocks/platform-api/fix-archs
Merge into: lp:platform-api
Diff against target: 87 lines (+10/-15)
1 file modified
debian/control (+10/-15)
To merge this branch: bzr merge lp:~didrocks/platform-api/fix-archs
Reviewer Review Type Date Requested Status
Ricardo Salveti (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+167354@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
Ricardo Salveti (rsalveti) wrote :

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 updated
63. By Didier Roche-Tolomelli

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

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
Ricardo Salveti (rsalveti) wrote :

Good, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
18Section: libdevel18Section: libdevel
19Pre-Depends: ${misc:Pre-Depends},19Pre-Depends: ${misc:Pre-Depends},
20Multi-Arch: same20Multi-Arch: same
21Architecture: any21Architecture: i386 amd64 armhf
22Depends: ${misc:Depends},22Depends: ${misc:Depends},
23Description: Platform API for system level capabilities (API headers)23Description: Platform API for system level capabilities (API headers)
24 This package provides the library headers for the Platform API.24 This package provides the library headers for the Platform API.
@@ -31,7 +31,7 @@
31Section: libdevel31Section: libdevel
32Pre-Depends: ${misc:Pre-Depends},32Pre-Depends: ${misc:Pre-Depends},
33Multi-Arch: same33Multi-Arch: same
34Architecture: any34Architecture: i386 amd64 armhf
35Depends: libgles2-mesa-dev,35Depends: libgles2-mesa-dev,
36 libplatform-api-headers (= ${binary:Version}),36 libplatform-api-headers (= ${binary:Version}),
37 libplatform-api1-hybris | libplatform-api1,37 libplatform-api1-hybris | libplatform-api1,
@@ -47,7 +47,7 @@
47Section: libs47Section: libs
48Pre-Depends: ${misc:Pre-Depends},48Pre-Depends: ${misc:Pre-Depends},
49Multi-Arch: same49Multi-Arch: same
50Architecture: any50Architecture: i386 amd64 armhf
51Depends: libhybris,51Depends: libhybris,
52 ${misc:Depends},52 ${misc:Depends},
53 ${shlibs:Depends},53 ${shlibs:Depends},
@@ -58,7 +58,7 @@
58 Android userspace, which is where the Ubuntu Application Manager lives.58 Android userspace, which is where the Ubuntu Application Manager lives.
5959
60Package: libplatform-api1-hybris-tests60Package: libplatform-api1-hybris-tests
61Architecture: any61Architecture: i386 amd64 armhf
62Depends: libplatform-api1-hybris (= ${binary:Version}),62Depends: libplatform-api1-hybris (= ${binary:Version}),
63 ${misc:Depends},63 ${misc:Depends},
64 ${shlibs:Depends},64 ${shlibs:Depends},
@@ -68,9 +68,7 @@
6868
69Package: ubuntu-platform-api-headers69Package: ubuntu-platform-api-headers
70Section: oldlibs70Section: oldlibs
71Pre-Depends: ${misc:Pre-Depends},71Architecture: all
72Multi-Arch: same
73Architecture: any
74Depends: libplatform-api-headers (= ${binary:Version}),72Depends: libplatform-api-headers (= ${binary:Version}),
75 ${misc:Depends},73 ${misc:Depends},
76Description: dummy transitional package for libplatform-api-headers74Description: dummy transitional package for libplatform-api-headers
@@ -80,9 +78,7 @@
8078
81Package: libubuntu-platform-api1-dev79Package: libubuntu-platform-api1-dev
82Section: oldlibs80Section: oldlibs
83Pre-Depends: ${misc:Pre-Depends},81Architecture: all
84Multi-Arch: same
85Architecture: any
86Depends: libplatform-api1-dev (= ${binary:Version}),82Depends: libplatform-api1-dev (= ${binary:Version}),
87 ${misc:Depends},83 ${misc:Depends},
88Description: dummy transitional package for libplatform-api1-dev84Description: dummy transitional package for libplatform-api1-dev
@@ -91,13 +87,11 @@
91 This package can be safely removed.87 This package can be safely removed.
9288
93Package: ubuntu-platform-implementation-android89Package: ubuntu-platform-implementation-android
90Section: oldlibs
91Architecture: all
94Provides: libubuntu-platform-api1,92Provides: libubuntu-platform-api1,
95Conflicts: libubuntu-platform-api1,93Conflicts: libubuntu-platform-api1,
96Replaces: libubuntu-platform-api1,94Replaces: libubuntu-platform-api1,
97Section: oldlibs
98Pre-Depends: ${misc:Pre-Depends},
99Multi-Arch: same
100Architecture: any
101Depends: libplatform-api1-hybris (= ${binary:Version}),95Depends: libplatform-api1-hybris (= ${binary:Version}),
102 ${misc:Depends},96 ${misc:Depends},
103 ${shlibs:Depends},97 ${shlibs:Depends},
@@ -107,7 +101,8 @@
107 This package can be safely removed.101 This package can be safely removed.
108102
109Package: ubuntu-platform-implementation-android-tests103Package: ubuntu-platform-implementation-android-tests
110Architecture: oldlibs104Architecture: all
105Section: oldlibs
111Depends: libplatform-api1-hybris-tests (= ${binary:Version}),106Depends: libplatform-api1-hybris-tests (= ${binary:Version}),
112 ${misc:Depends},107 ${misc:Depends},
113 ${shlibs:Depends},108 ${shlibs:Depends},

Subscribers

People subscribed via source and target branches