Ubuntu UI Toolkit

Merge lp:~bzoltan/ubuntu-ui-toolkit/packaging_fixes_lp1481584 into lp:ubuntu-ui-toolkit/staging

  1. packaging_fixes_lp1481584
  2. Merge into staging
Proposed by Zoltan Balogh on 2015-08-05
Status: Merged
Approved by: Timo Jyrinki on 2015-08-05
Approved revision: 1590
Merged at revision: 1590
Proposed branch: lp:~bzoltan/ubuntu-ui-toolkit/packaging_fixes_lp1481584
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 27 lines (+3/-4)
1 file modified
debian/rules (+3/-4)
To merge this branch: bzr merge lp:~bzoltan/ubuntu-ui-toolkit/packaging_fixes_lp1481584
Reviewer Review Type Date Requested Status
Timo Jyrinki (community) 2015-08-05 Approve on 2015-08-05
PS Jenkins bot continuous-integration Approve on 2015-08-05
Review via email: mp+267012@code.launchpad.net

Commit Message

Fix packaging question marks / issues. Fixes LP: #1481584

Description of the Change

Fix packaging question marks / issues. Fixes LP: #1481584

To post a comment you must log in.

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-06-17 11:47:16 +0000
3+++ debian/rules 2015-08-05 11:22:12 +0000
4@@ -17,7 +17,7 @@
5 qmake -r
6
7 %:
8- dh $@ --parallel --fail-missing
9+ dh $@ --parallel
10
11 override_dh_auto_test:
12 ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(testskip_architectures)))
13@@ -31,12 +31,11 @@
14 override_dh_build:
15 dh_auto_build --parallel
16 dh_auto_build --parallel -- docs
17+
18+override_dh_install:
19 mkdir -p debian/tmp/`qmake -query QT_INSTALL_DOCS`/qch
20 mkdir -p debian/tmp/usr/share/ubuntu-ui-toolkit/doc
21 cp -r $(CURDIR)/documentation/*qch debian/tmp/`qmake -query QT_INSTALL_DOCS`/qch
22-
23-override_dh_install:
24- dh_auto_build -- docs
25 # FIXME: Due to autopilot not being in the archive we ship docs for now
26 # sphinx-build -b singlehtml documentation/autopilot-helpers documentation/autopilot-helpers/_build/html
27 # sphinx-build -b json documentation/autopilot-helpers documentation/autopilot-helpers/_build/json

Subscribers

People subscribed via source and target branches