QtMir

Merge lp:~nick-dedekind/qtmir/remove-dpkg-CMAK_INSTALL_PREFIX into lp:qtmir

  1. remove-dpkg-CMAK_INSTALL_PREFIX
  2. Merge into trunk
Proposed by Nick Dedekind on 2015-10-13
Status: Merged
Approved by: Gerry Boland on 2015-10-15
Approved revision: 374
Merged at revision: 394
Proposed branch: lp:~nick-dedekind/qtmir/remove-dpkg-CMAK_INSTALL_PREFIX
Merge into: lp:qtmir
Prerequisite: lp:~dandrader/qtmir/multimonitorNext
Diff against target: 32 lines (+5/-7)
1 file modified
debian/rules (+5/-7)
To merge this branch: bzr merge lp:~nick-dedekind/qtmir/remove-dpkg-CMAK_INSTALL_PREFIX
Reviewer Review Type Date Requested Status
Gerry Boland 2015-10-13 Approve on 2015-10-15
PS Jenkins bot continuous-integration 2015-10-13 Needs Fixing on 2015-10-14
Ubuntu Unity PS integration team 2015-10-13 Pending
Review via email: mp+274222@code.launchpad.net

This proposal supersedes a proposal from 2015-09-18.

Commit Message

Removed the manipulation of the CMAKE_INSTALL_PREFIX from debian/rules

Description of the Change

Removed the manipulation of the CMAKE_INSTALL_PREFIX from debian/rules

 * Are there any related MPs required for this MP to build/function as expected? Please list.
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
Yes

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

PASSED: Continuous integration, rev:372
http://jenkins.qa.ubuntu.com/job/qtmir-ci/431/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/127
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/127
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/127/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/164
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/164
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/164/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/9

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/431/rebuild

review: Approve (continuous-integration)
Gerry Boland (gerboland) wrote : Posted in a previous version of this proposal

Have given it quick test with emulator, seems to work nicely. +1

review: Approve
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
lp:~nick-dedekind/qtmir/remove-dpkg-CMAK_INSTALL_PREFIX updated on 2015-10-14
374. By Nick Dedekind on 2015-10-14

merged with lp:~dandrader/qtmir/multimonitorNext

PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Gerry Boland (gerboland) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/rules'
2--- debian/rules 2015-07-08 16:54:24 +0000
3+++ debian/rules 2015-10-14 13:06:03 +0000
4@@ -28,11 +28,11 @@
5
6 override_dh_auto_configure:
7 ifeq ($(DEB_HOST_ARCH),$(USES_GLES2))
8- mkdir -p $(ANDROID_DIR) && dh_auto_configure -B$(ANDROID_DIR) -- $(FLAGS) $(CURDIR) -DCMAKE_INSTALL_PREFIX=$(TMP1_DIR)/usr/ -DUSE_OPENGLES=1
9+ mkdir -p $(ANDROID_DIR) && dh_auto_configure -B$(ANDROID_DIR) -- $(FLAGS) $(CURDIR) -DUSE_OPENGLES=1
10 # See comment in CMakeLists.txt
11- mkdir -p $(DESKTOP_DIR) && dh_auto_configure -B$(DESKTOP_DIR) -- $(FLAGS) $(CURDIR) -DCMAKE_INSTALL_PREFIX=$(TMP2_DIR)/usr/ -DUSE_OPENGL_BUT_LINK_AGAINST_OPENGLES=1
12+ mkdir -p $(DESKTOP_DIR) && dh_auto_configure -B$(DESKTOP_DIR) -- $(FLAGS) $(CURDIR) -DUSE_OPENGL_BUT_LINK_AGAINST_OPENGLES=1
13 else
14- mkdir -p $(DESKTOP_DIR) && dh_auto_configure -B$(DESKTOP_DIR) -- $(FLAGS) $(CURDIR) -DCMAKE_INSTALL_PREFIX=$(TMP2_DIR)/usr/ -DUSE_OPENGLES=1
15+ mkdir -p $(DESKTOP_DIR) && dh_auto_configure -B$(DESKTOP_DIR) -- $(FLAGS) $(CURDIR) -DUSE_OPENGLES=1
16 endif
17
18 override_dh_auto_build:
19@@ -49,11 +49,9 @@
20
21 override_dh_auto_install:
22 ifeq ($(DEB_HOST_ARCH),$(USES_GLES2))
23- mkdir -p $(TMP1_DIR) && cd $(ANDROID_DIR) && INSTALL_ROOT=$(TMP1_DIR) make install
24- cd $(CURDIR)
25+ dh_auto_install -B$(ANDROID_DIR) --destdir=$(TMP1_DIR)
26 endif
27- mkdir -p $(TMP2_DIR) && cd $(DESKTOP_DIR) && INSTALL_ROOT=$(TMP2_DIR) make install
28- cd $(CURDIR)
29+ dh_auto_install -B$(DESKTOP_DIR) --destdir=$(TMP2_DIR)
30
31 override_dh_install:
32 ifeq ($(DEB_HOST_ARCH),$(USES_GLES2))

Subscribers

People subscribed via source and target branches