touch-preview-images

Merge lp:~sergiusens/touch-preview-images/qt5--dev into lp:touch-preview-images/ubuntu-build-phablet-saucy

  1. qt5--dev
  2. Merge into ubuntu-build-phablet-saucy
Proposed by Sergio Schvezov
Status: Merged
Approved by: Ricardo Salveti
Approved revision: 14
Merged at revision: 14
Proposed branch: lp:~sergiusens/touch-preview-images/qt5--dev
Merge into: lp:touch-preview-images/ubuntu-build-phablet-saucy
Diff against target: 22 lines (+1/-1)
2 files modified
customization/hooks/48-setup-env.chroot (+1/-0)
customization/package-lists/apps.list.chroot (+0/-1)
To merge this branch: bzr merge lp:~sergiusens/touch-preview-images/qt5--dev
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ricardo Salveti (community) Approve
Review via email: mp+169432@code.launchpad.net

Commit message

Remove qt5-defaults and adding a temporary entry in /etc/environment

Description of the change

Removing qt5-defaults, it gets rid of all the -dev packages, but I added a temporary /etc/environment envvar to workaround an issue that would need to be fixed at the apps level.

To post a comment you must log in.
Revision history for this message
Oliver Grawert (ogra) wrote :

i merged the seed change and made the env var change in livecd-rootfs for the flipped images already ...

Revision history for this message
Ricardo Salveti (rsalveti) wrote :

Good.

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'customization/hooks/48-setup-env.chroot'
2--- customization/hooks/48-setup-env.chroot 2013-05-02 16:35:18 +0000
3+++ customization/hooks/48-setup-env.chroot 2013-06-14 13:55:43 +0000
4@@ -16,6 +16,7 @@
5 ANDROID_DATA=/data
6 QT_QPA_PLATFORM=ubuntu
7 QML2_IMPORT_PATH=/usr/lib/arm-linux-gnueabihf/qt5/imports
8+QT_SELECT=qt5
9 SHLVL=1
10 MKSH=/system/bin/sh
11 ANDROID_ROOT=/system
12
13=== modified file 'customization/package-lists/apps.list.chroot'
14--- customization/package-lists/apps.list.chroot 2013-05-20 20:26:45 +0000
15+++ customization/package-lists/apps.list.chroot 2013-06-14 13:55:43 +0000
16@@ -1,6 +1,5 @@
17 hud
18 qtubuntu
19-qt5-default
20 qtchooser
21 qtdeclarative5-ubuntu-ui-toolkit-plugin
22 webbrowser-app

Subscribers

People subscribed via source and target branches