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

[Didier Roche-Tolomelli]

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

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

[Sebastien Bacher (seb128)]

looks fine, thanks

review: Approve

[PS Jenkins bot (ps-jenkins)]

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)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2013-06-14 07:57:07 +0000
+++ debian/control	2013-07-04 11:04:27 +0000
@@ -40,7 +40,7 @@
 
 Package: libubuntu-location-service-dev
 Section: libdevel
-Architecture: all
+Architecture: any
 Multi-Arch: foreign
 Depends: libubuntu-location-service0 (= ${binary:Version}),
          ${misc:Depends},
@@ -55,7 +55,20 @@
 Multi-Arch: same
 Depends: ${misc:Depends},
          ${shlibs:Depends},
+         ubuntu-location-service-doc,
 Description: location service aggregating position/velocity/heading
  updates and exporting them over dbus.
  .
  Contains example service and client.
+
+Package: ubuntu-location-service-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         libubuntu-location-service-dev,
+Recommends: ubuntu-location-service-examples,
+Description: location service aggregating position/velocity/heading
+ updates and exporting them over dbus.
+ .
+ Contains documentation for service and client.
 
=== modified file 'debian/rules'
--- debian/rules	2013-06-13 13:57:38 +0000
+++ debian/rules	2013-07-04 11:04:27 +0000
@@ -14,7 +14,10 @@
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 
 %:
-	dh $@
+	dh $@ --parallel --fail-missing
+
+override_dh_install:
+	dh_install -Xubuntu-location-service.1 --fail-missing
 
 override_dh_auto_configure:
 	dh_auto_configure -- -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/$(DEB_HOST_MULTIARCH)/ubuntu-location-service
 
=== added file 'debian/ubuntu-location-service-doc.install'
--- debian/ubuntu-location-service-doc.install	1970-01-01 00:00:00 +0000
+++ debian/ubuntu-location-service-doc.install	2013-07-04 11:04:27 +0000
@@ -0,0 +1,1 @@
+usr/share/LocationService/doc/html