QtMir

Merge lp:~robru/qtmir/packaging-simplification into lp:qtmir

  1. packaging-simplification
  2. Merge into trunk
Proposed by Robert Bruce Park
Status: Merged
Approved by: Gerry Boland
Approved revision: 175
Merged at revision: 176
Proposed branch: lp:~robru/qtmir/packaging-simplification
Merge into: lp:qtmir
Diff against target: 70 lines (+9/-8)
2 files modified
debian/control (+1/-2)
debian/rules (+8/-6)
To merge this branch: bzr merge lp:~robru/qtmir/packaging-simplification
Reviewer Review Type Date Requested Status
Gerry Boland (community) Approve
Review via email: mp+226012@code.launchpad.net

Commit message

Slightly more readable debian/rules.

To post a comment you must log in.
lp:~robru/qtmir/packaging-simplification updated
175. By Robert Bruce Park

qtdeclarative shouldn't provide qtmir

Revision history for this message
Gerry Boland (gerboland) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2014-07-07 19:33:56 +0000
3+++ debian/control 2014-07-08 17:32:44 +0000
4@@ -83,8 +83,7 @@
5 libqtmir,
6 Conflicts: libunity-mir1,
7 libqtmir,
8-Provides: qtmir,
9- unity-application-impl,
10+Provides: unity-application-impl,
11 unity-application-impl-2,
12 Description: Qt plugin for Unity specific Mir APIs
13 QtMir provides Qt/QML bindings for Mir features that are exposed through the
14
15=== modified file 'debian/rules'
16--- debian/rules 2014-07-07 19:33:56 +0000
17+++ debian/rules 2014-07-08 17:32:44 +0000
18@@ -12,36 +12,38 @@
19 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
20 gles2_architectures = armhf
21
22+USES_GLES2 = $(findstring $(DEB_HOST_ARCH), $(gles2_architectures))
23+
24 %:
25 dh $@ --parallel --fail-missing
26
27 override_dh_clean:
28-ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
29+ifeq ($(DEB_HOST_ARCH),$(USES_GLES2))
30 rm -rf $(TMP1_DIR)
31 endif
32 rm -rf $(TMP2_DIR)
33 dh_clean
34
35 override_dh_auto_configure:
36-ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
37+ifeq ($(DEB_HOST_ARCH),$(USES_GLES2))
38 mkdir -p $(ANDROID_DIR) && dh_auto_configure -B$(ANDROID_DIR) -- $(CURDIR)
39 endif
40 mkdir -p $(DESKTOP_DIR) && dh_auto_configure -B$(DESKTOP_DIR) -- "QMAKE_CXXFLAGS=-DQTMIR_USE_OPENGL" $(CURDIR)
41
42 override_dh_auto_build:
43-ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
44+ifeq ($(DEB_HOST_ARCH),$(USES_GLES2))
45 dh_auto_build -B$(ANDROID_DIR)
46 endif
47 dh_auto_build -B$(DESKTOP_DIR)
48
49 override_dh_auto_test:
50-ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
51+ifeq ($(DEB_HOST_ARCH),$(USES_GLES2))
52 dh_auto_test -B$(ANDROID_DIR)
53 endif
54 dh_auto_test -B$(DESKTOP_DIR)
55
56 override_dh_auto_install:
57-ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
58+ifeq ($(DEB_HOST_ARCH),$(USES_GLES2))
59 mkdir -p $(TMP1_DIR) && cd $(ANDROID_DIR) && INSTALL_ROOT=$(TMP1_DIR) make install
60 cd $(CURDIR)
61 endif
62@@ -49,7 +51,7 @@
63 cd $(CURDIR)
64
65 override_dh_install:
66-ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
67+ifeq ($(DEB_HOST_ARCH),$(USES_GLES2))
68 dh_install --sourcedir=$(TMP1_DIR) -pqtmir-android
69 endif
70 dh_install --sourcedir=$(TMP2_DIR) -pqtmir-desktop

Subscribers

People subscribed via source and target branches