Merge lp:~didrocks/qtubuntu/move_android_only into lp:qtubuntu

Proposed by Didier Roche-Tolomelli
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: 149
Merged at revision: 145
Proposed branch: lp:~didrocks/qtubuntu/move_android_only
Merge into: lp:qtubuntu
Diff against target: 49 lines (+16/-5)
2 files modified
debian/changelog (+8/-0)
debian/control (+8/-5)
To merge this branch: bzr merge lp:~didrocks/qtubuntu/move_android_only
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Michał Sawicz Approve
Review via email: mp+171965@code.launchpad.net

Commit message

change qtubuntu -> qtubuntu-android and provides qtubuntu and qtubuntu-shell. Building on where the android libhybris binding really worked, armhf only.

Description of the change

WE'LL MERGE IT ON MONDAY 28th WITH THE SEED CHANGE!

Why don't have blink tags? :p

change qtubuntu -> qtubuntu-android and provides qtubuntu and qtubuntu-shell. Building on where the android libhybris binding really worked, armhf only.

After discussing with Saviq, this part should only be used by the shell and a code splitting will be needed for moving apart the part that gallery-app is apparently using.
Then, the shell is going to provide some mocks (in a separate binary package providing qtubuntu-shell). This will enable us to not have qtubuntu [armhf] only when fixing the path from imports/ -> qml/

I'm changing the ubuntu-touch seed as well to install qtubuntu-android, see rev 30 of https://code.launchpad.net/~didrocks/qtubuntu/move_android_only/+merge/171965 (metapackage not regenerated until this is merged)

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

FAILED: Continuous integration, rev:145
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/34/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-saucy-armhf-ci/22/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/qtubuntu-ci/34/rebuild

review: Needs Fixing (continuous-integration)
146. By Didier Roche-Tolomelli

rename the install file

147. By Didier Roche-Tolomelli

add description

148. By Didier Roche-Tolomelli

replace (don't conflict) against qtubuntu as we want to be able to install the mocks with qtubuntu-android when needed

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) wrote :

Works!

review: Approve
149. By Didier Roche-Tolomelli

let's build on every archs for now, a x86 android port is probable

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2013-06-17 02:02:11 +0000
+++ debian/changelog 2013-06-28 14:08:28 +0000
@@ -1,3 +1,11 @@
1qtubuntu (0.52-0ubuntu1) UNRELEASED; urgency=low
2
3 * Transition qtubuntu to qtubuntu-android (only available on armhf as
4 it's where it's built) and provides a qtubuntu and qtubuntu-shell
5 virtual package, enabling even mock to fulfill the dep
6
7 -- Didier Roche <didrocks@ubuntu.com> Fri, 28 Jun 2013 12:04:33 +0200
8
1qtubuntu (0.51daily13.06.17-0ubuntu1) saucy; urgency=low9qtubuntu (0.51daily13.06.17-0ubuntu1) saucy; urgency=low
210
3 [ Ken VanDine ]11 [ Ken VanDine ]
412
=== modified file 'debian/control'
--- debian/control 2013-06-14 08:30:45 +0000
+++ debian/control 2013-06-28 14:08:28 +0000
@@ -21,11 +21,14 @@
21Standards-Version: 3.9.421Standards-Version: 3.9.4
22Section: libs22Section: libs
2323
24Package: qtubuntu24Package: qtubuntu-android
25Replaces: qthybris (<< 0.37)25Architecture: any
26Multi-Arch: same
27Replaces: qthybris (<< 0.37),
28 qtubuntu (<< 0.52),
26Breaks: qthybris (<< 0.37)29Breaks: qthybris (<< 0.37)
27Architecture: any30Provides: qtubuntu-shell,
28Multi-Arch: same31 qtubuntu,
29Depends: ${misc:Depends},32Depends: ${misc:Depends},
30 ${shlibs:Depends},33 ${shlibs:Depends},
31 libqt5sensors5,34 libqt5sensors5,
@@ -39,7 +42,7 @@
3942
40Package: qthybris43Package: qthybris
41Depends: ${misc:Depends},44Depends: ${misc:Depends},
42 qtubuntu,45 qtubuntu-android,
43Architecture: any46Architecture: any
44Section: oldlibs47Section: oldlibs
45Description: transitional dummy package48Description: transitional dummy package
4649
=== renamed file 'debian/qtubuntu.install' => 'debian/qtubuntu-android.install'

Subscribers

People subscribed via source and target branches