Merge lp:~ricmm/qtubuntu/fix-binary-desktop-pkg into lp:qtubuntu

Proposed by Ricardo Mendoza
Status: Work in progress
Proposed branch: lp:~ricmm/qtubuntu/fix-binary-desktop-pkg
Merge into: lp:qtubuntu
Diff against target: 46 lines (+15/-11)
3 files modified
debian/qtubuntu-android.install (+2/-2)
debian/qtubuntu-desktop.install (+2/-2)
debian/rules (+11/-7)
To merge this branch: bzr merge lp:~ricmm/qtubuntu/fix-binary-desktop-pkg
Reviewer Review Type Date Requested Status
Unity8 CI Bot continuous-integration Needs Fixing
PS Jenkins bot continuous-integration Approve
Ubuntu Phablet Team Pending
Review via email: mp+203497@code.launchpad.net

Commit message

Fix build of binary packages, before the same config was being used.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:202
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-1-ci/2/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-1-ci/2/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :
review: Needs Fixing (continuous-integration)

Unmerged revisions

202. By Ricardo Mendoza

Fix build of separate binary packages

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/qtubuntu-android.install'
2--- debian/qtubuntu-android.install 2013-08-30 14:32:02 +0000
3+++ debian/qtubuntu-android.install 2014-01-28 10:17:25 +0000
4@@ -1,2 +1,2 @@
5-usr/lib/*/qt5/plugins/platforms/*
6-usr/lib/*/qt5/imports/Unity/*
7+qtubuntu-android/usr/lib/*/qt5/plugins/platforms/*
8+qtubuntu-android/usr/lib/*/qt5/imports/Unity/*
9
10=== modified file 'debian/qtubuntu-desktop.install'
11--- debian/qtubuntu-desktop.install 2013-12-09 17:31:20 +0000
12+++ debian/qtubuntu-desktop.install 2014-01-28 10:17:25 +0000
13@@ -1,2 +1,2 @@
14-usr/lib/*/qt5/plugins/platforms/*
15-usr/lib/*/qt5/imports/Unity/*
16+qtubuntu-desktop/usr/lib/*/qt5/plugins/platforms/*
17+qtubuntu-desktop/usr/lib/*/qt5/imports/Unity/*
18
19=== modified file 'debian/rules'
20--- debian/rules 2013-12-09 17:31:20 +0000
21+++ debian/rules 2014-01-28 10:17:25 +0000
22@@ -7,14 +7,18 @@
23 DESKTOP_DIR = build-desktop
24
25 %:
26- dh $@ --builddirectory=$(ANDROID_DIR) --parallel
27- dh $@ --builddirectory=$(DESKTOP_DIR) --parallel
28+ dh $@
29
30 override_dh_auto_configure:
31- mkdir -p $(ANDROID_DIR) && dh_auto_configure -- "CONFIG+=mirserver" "CONFIG+=mirclient" "CONFIG+=hybris" "QMAKE_CXXFLAGS=-g" $(CURDIR)
32- mkdir -p $(DESKTOP_DIR) && dh_auto_configure -- "CONFIG+=mirserver" "CONFIG+=mirclient" "QMAKE_CXXFLAGS=-g" $(CURDIR)
33-
34-override_dh_install:
35+ mkdir -p $(ANDROID_DIR) && dh_auto_configure -B$(ANDROID_DIR) -- "CONFIG+=mirserver" "CONFIG+=mirclient" "CONFIG+=hybris" "QMAKE_CXXFLAGS=-g" $(CURDIR)
36+ mkdir -p $(DESKTOP_DIR) && dh_auto_configure -B$(DESKTOP_DIR) -- "CONFIG+=mirserver" "CONFIG+=mirclient" "QMAKE_CXXFLAGS=-g" $(CURDIR)
37+
38+override_dh_auto_build:
39+ dh_auto_build -B$(ANDROID_DIR)
40+ dh_auto_build -B$(DESKTOP_DIR)
41+
42+override_dh_auto_install:
43 rm -f debian/*/usr/lib/*/qt5/examples/qtubuntu/qmlscene-ubuntu
44- dh_install --fail-missing
45+ dh_auto_install -B$(ANDROID_DIR) --destdir=$(CURDIR)/debian/tmp/qtubuntu-android
46+ dh_auto_install -B$(DESKTOP_DIR) --destdir=$(CURDIR)/debian/tmp/qtubuntu-desktop
47

Subscribers

People subscribed via source and target branches