location-service

Merge lp:~didrocks/location-service/clean-location-service-pkg into lp:location-service/trunk

  1. clean-location-service-pkg
  2. Merge into trunk
Proposed by Didier Roche-Tolomelli
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: 17
Merged at revision: 16
Proposed branch: lp:~didrocks/location-service/clean-location-service-pkg
Merge into: lp:location-service/trunk
Diff against target: 55 lines (+19/-2)
3 files modified
debian/control (+14/-1)
debian/rules (+4/-1)
debian/ubuntu-location-service-doc.install (+1/-0)
To merge this branch: bzr merge lp:~didrocks/location-service/clean-location-service-pkg
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Sebastien Bacher Approve
Ubuntu Phablet Team Pending
Review via email: mp+173003@code.launchpad.net

Commit message

Ship a -doc package now to install the documentation. In addition to it, build in parallel as well as check for missing files.

Description of the change

Ship a -doc package now to install the documentation. In addition to it, build
in parallel as well as check for missing files.

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

looks fine, thanks

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

FAILED: Continuous integration, rev:17
http://jenkins.qa.ubuntu.com/job/location-service-ci/18/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-saucy-amd64-ci/9/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-saucy-armhf-ci/9
        deb: http://jenkins.qa.ubuntu.com/job/location-service-saucy-armhf-ci/9/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-saucy-i386-ci/9

Click here to trigger a rebuild:
http://s-jenkins:8080/job/location-service-ci/18/rebuild

review: Needs Fixing (continuous-integration)
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 'debian/control'
2--- debian/control 2013-06-14 07:57:07 +0000
3+++ debian/control 2013-07-04 11:04:27 +0000
4@@ -40,7 +40,7 @@
5
6 Package: libubuntu-location-service-dev
7 Section: libdevel
8-Architecture: all
9+Architecture: any
10 Multi-Arch: foreign
11 Depends: libubuntu-location-service0 (= ${binary:Version}),
12 ${misc:Depends},
13@@ -55,7 +55,20 @@
14 Multi-Arch: same
15 Depends: ${misc:Depends},
16 ${shlibs:Depends},
17+ ubuntu-location-service-doc,
18 Description: location service aggregating position/velocity/heading
19 updates and exporting them over dbus.
20 .
21 Contains example service and client.
22+
23+Package: ubuntu-location-service-doc
24+Section: doc
25+Architecture: all
26+Depends: ${misc:Depends},
27+ ${shlibs:Depends},
28+ libubuntu-location-service-dev,
29+Recommends: ubuntu-location-service-examples,
30+Description: location service aggregating position/velocity/heading
31+ updates and exporting them over dbus.
32+ .
33+ Contains documentation for service and client.
34
35=== modified file 'debian/rules'
36--- debian/rules 2013-06-13 13:57:38 +0000
37+++ debian/rules 2013-07-04 11:04:27 +0000
38@@ -14,7 +14,10 @@
39 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
40
41 %:
42- dh $@
43+ dh $@ --parallel --fail-missing
44+
45+override_dh_install:
46+ dh_install -Xubuntu-location-service.1 --fail-missing
47
48 override_dh_auto_configure:
49 dh_auto_configure -- -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/$(DEB_HOST_MULTIARCH)/ubuntu-location-service
50
51=== added file 'debian/ubuntu-location-service-doc.install'
52--- debian/ubuntu-location-service-doc.install 1970-01-01 00:00:00 +0000
53+++ debian/ubuntu-location-service-doc.install 2013-07-04 11:04:27 +0000
54@@ -0,0 +1,1 @@
55+usr/share/LocationService/doc/html

Subscribers

People subscribed via source and target branches