Merge lp:~thomas-voss/location-service/enable-dual-landing into lp:location-service/trunk

[Thomas Voß]

Enable dual landing.

Enable dual landing.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:221
http://jenkins.qa.ubuntu.com/job/location-service-ci/406/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-vivid-amd64-ci/78/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/78/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-vivid-i386-ci/78/console

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

review: Needs Fixing (continuous-integration)

[lp:~thomas-voss/location-service/enable-dual-landing]

222. By Thomas Voß on 2015-11-20

Add missing build-dep on lsb-release.

223. By Thomas Voß on 2015-11-20

* libubuntu-location-service3: Replaces libubuntu-location-service2,
  config file /etc/gps.conf in both packages.
* Bump major revision and fix LP:#1478750 to account for toolchain update.

224. By Thomas Voß on 2015-11-20

Fix s/lsp/lsb/ typo.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:223
http://jenkins.qa.ubuntu.com/job/location-service-ci/407/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-vivid-amd64-ci/79/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/79/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-vivid-i386-ci/79/console

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

review: Needs Fixing (continuous-integration)

[lp:~thomas-voss/location-service/enable-dual-landing]

225. By Thomas Voß on 2015-11-20

Add build-dependency on lsb-release to debian/control.in.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:224
http://jenkins.qa.ubuntu.com/job/location-service-ci/408/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-vivid-amd64-ci/80/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/80/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-vivid-i386-ci/80/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:225
http://jenkins.qa.ubuntu.com/job/location-service-ci/409/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-amd64-ci/81
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/81/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-i386-ci/81

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

review: Needs Fixing (continuous-integration)

[lp:~thomas-voss/location-service/enable-dual-landing]

226. By Thomas Voß on 2015-11-20

Lower client count to make test more robust.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:226
http://jenkins.qa.ubuntu.com/job/location-service-ci/410/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-amd64-ci/82
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/82
        deb: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/82/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-i386-ci/82

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

review: Approve (continuous-integration)

[lp:~thomas-voss/location-service/enable-dual-landing]

227. By Thomas Voß on 2015-11-21

Provide a sensible version fallback.
Add correct version for Replaces/Conflicts stanzas in generated debian/control.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:227
http://jenkins.qa.ubuntu.com/job/location-service-ci/411/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-amd64-ci/83
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/83
        deb: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/83/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-i386-ci/83

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

review: Approve (continuous-integration)

[lp:~thomas-voss/location-service/enable-dual-landing]

228. By Thomas Voß on 2015-12-06

* Ensure that event connections are cleaned up on destruction. (LP:
  #1480877)
[ Alberto Mardegan ]
* Send last known position on session start
[ CI Train Bot ]
* New rebuild forced.
[ Thomas Voß ]
* Factor out service::Runtime from daemon.cpp into its own .h/.cpp
  pair of files. Add test cases around correct operation of
  service::Runtime. added:
  src/location_service/com/ubuntu/location/service/runtime.cpp
  src/location_service/com/ubuntu/location/service/runtime.h
  tests/runtime_test.cpp
[ thomas-voss ]
* Factor out service::Runtime from daemon.cpp into its own .h/.cpp
  pair of files. Add test cases around correct operation of
  service::Runtime. added:
  src/location_service/com/ubuntu/location/service/runtime.cpp
  src/location_service/com/ubuntu/location/service/runtime.h
  tests/runtime_test.cpp

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:228
http://jenkins.qa.ubuntu.com/job/location-service-ci/413/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-amd64-ci/85
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/85
        deb: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/85/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-i386-ci/85

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

review: Approve (continuous-integration)

Unmerged revisions

228. By Thomas Voß on 2015-12-06

* Ensure that event connections are cleaned up on destruction. (LP:
  #1480877)
[ Alberto Mardegan ]
* Send last known position on session start
[ CI Train Bot ]
* New rebuild forced.
[ Thomas Voß ]
* Factor out service::Runtime from daemon.cpp into its own .h/.cpp
  pair of files. Add test cases around correct operation of
  service::Runtime. added:
  src/location_service/com/ubuntu/location/service/runtime.cpp
  src/location_service/com/ubuntu/location/service/runtime.h
  tests/runtime_test.cpp
[ thomas-voss ]
* Factor out service::Runtime from daemon.cpp into its own .h/.cpp
  pair of files. Add test cases around correct operation of
  service::Runtime. added:
  src/location_service/com/ubuntu/location/service/runtime.cpp
  src/location_service/com/ubuntu/location/service/runtime.h
  tests/runtime_test.cpp

227. By Thomas Voß on 2015-11-21

Provide a sensible version fallback.
Add correct version for Replaces/Conflicts stanzas in generated debian/control.

226. By Thomas Voß on 2015-11-20

Lower client count to make test more robust.

225. By Thomas Voß on 2015-11-20

Add build-dependency on lsb-release to debian/control.in.

224. By Thomas Voß on 2015-11-20

Fix s/lsp/lsb/ typo.

223. By Thomas Voß on 2015-11-20

* libubuntu-location-service3: Replaces libubuntu-location-service2,
  config file /etc/gps.conf in both packages.
* Bump major revision and fix LP:#1478750 to account for toolchain update.

222. By Thomas Voß on 2015-11-20

Add missing build-dep on lsb-release.

221. By Thomas Voß on 2015-11-20

Account for versioned include dir.

220. By Thomas Voß on 2015-11-20

Alter build setup to query major.minor.patch from debian.VERSION* files.

219. By Thomas Voß on 2015-11-20

Enable dual landing.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-12-06 20:11:22 +0000
+++ CMakeLists.txt	2015-12-06 20:11:22 +0000
@@ -2,9 +2,34 @@
 
 project(ubuntu-location-service)
 
-set(UBUNTU_LOCATION_SERVICE_VERSION_MAJOR 2)
-set(UBUNTU_LOCATION_SERVICE_VERSION_MINOR 0)
-set(UBUNTU_LOCATION_SERVICE_VERSION_PATCH 0)
+# We haven't received version information via the packaging setup.
+# For that, we try to determine sensible values on our own, ensuring
+# plain old invocations to cmake still work as expected.
+if (NOT DEFINED UBUNTU_LOCATION_SERVICE_VERSION_MAJOR)
+  find_program(LSB_RELEASE lsb_release)
+  execute_process(
+    COMMAND ${LSB_RELEASE} -c -s
+    OUTPUT_VARIABLE DISTRO_CODENAME
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+  # We explicitly ignore errors and only check if we are building for vivid.
+  # For all other cases:
+  #   - releases other than vivid
+  #   - other distros
+  #   - errors
+  # we define the version to be 2.0.0
+  if (${DISTRO_CODENAME} STREQUAL "vivid")
+    set(UBUNTU_LOCATION_SERVICE_VERSION_MAJOR 2)
+    set(UBUNTU_LOCATION_SERVICE_VERSION_MINOR 0)
+    set(UBUNTU_LOCATION_SERVICE_VERSION_PATCH 0)
+  else ()
+    set(UBUNTU_LOCATION_SERVICE_VERSION_MAJOR 3)
+    set(UBUNTU_LOCATION_SERVICE_VERSION_MINOR 0)
+    set(UBUNTU_LOCATION_SERVICE_VERSION_PATCH 0)
+  endif()
+endif()
+
+message(STATUS "${CMAKE_PROJECT_NAME} ${UBUNTU_LOCATION_SERVICE_VERSION_MAJOR}.${UBUNTU_LOCATION_SERVICE_VERSION_MINOR}.${UBUNTU_LOCATION_SERVICE_VERSION_PATCH}")
 
 set(UBUNTU_LOCATION_SERVICE_TRUST_STORE_SERVICE_NAME "UbuntuLocationService")
 

=== added file 'debian/VERSION'
--- debian/VERSION	1970-01-01 00:00:00 +0000
+++ debian/VERSION	2015-12-06 20:11:22 +0000
@@ -0,0 +1,1 @@
+3.0.0
\ No newline at end of file

=== added file 'debian/VERSION.vivid'
--- debian/VERSION.vivid	1970-01-01 00:00:00 +0000
+++ debian/VERSION.vivid	2015-12-06 20:11:22 +0000
@@ -0,0 +1,1 @@
+2.0.0

=== modified file 'debian/changelog'
--- debian/changelog	2015-12-06 20:11:22 +0000
+++ debian/changelog	2015-12-06 20:11:22 +0000
@@ -1,3 +1,16 @@
+location-service (3.0.0-0ubuntu2) wily; urgency=medium
+
+  * libubuntu-location-service3: Replaces libubuntu-location-service2,
+    config file /etc/gps.conf in both packages.
+
+ -- Matthias Klose <[e-mail]>  Thu, 30 Jul 2015 09:57:50 +0200
+
+location-service (3.0.0) wily; urgency=medium
+
+  * Bump major revision and fix LP:#1478750 to account for toolchain update.
+
+ -- Thomas Voß <[e-mail]>  Thu, 30 Jul 2015 08:33:13 +0200
+
 location-service (2.1+15.10.20150727-0ubuntu1) wily; urgency=medium
 
   [ CI Train Bot ]

=== modified file 'debian/control'
--- debian/control	2015-07-15 19:04:43 +0000
+++ debian/control	2015-12-06 20:11:22 +0000
@@ -1,3 +1,8 @@
+# This file is autogenerated. DO NOT EDIT!
+#
+# Modifications should be made to control.in instead.
+# This file is regenerated automatically in the clean target.
+#
 Source: location-service
 Section: utils
 Priority: optional
@@ -27,6 +32,7 @@
                libubuntu-platform-hardware-api-headers [!arm64 !ppc64el !powerpc],
                libubuntu-platform-hardware-api-dev [!arm64 !ppc64el !powerpc],
                libproperties-cpp-dev,
+               lsb-release,
                trust-store-bin,
 Standards-Version: 3.9.4
 Homepage: http://launchpad.net/location-service
@@ -35,7 +41,7 @@
 Vcs-Bzr: https://code.launchpad.net/~phablet-team/location-service/trunk
 Vcs-Browser: http://bazaar.launchpad.net/~phablet-team/location-service/trunk/files
 
-Package: libubuntu-location-service2
+Package: libubuntu-location-service3
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -52,7 +58,7 @@
 Architecture: any
 Multi-Arch: foreign
 Recommends: ubuntu-location-service-doc,
-Depends: libubuntu-location-service2 (= ${binary:Version}),
+Depends: libubuntu-location-service3 (= ${binary:Version}),
          libdbus-1-dev,
          libdbus-cpp-dev,
          libboost-dev,
@@ -68,7 +74,7 @@
 Section: debug
 Architecture: any
 Multi-Arch: foreign
-Depends: libubuntu-location-service2 (= ${binary:Version}),
+Depends: libubuntu-location-service3 (= ${binary:Version}),
          ${misc:Depends},
 Description: location service aggregating position/velocity/heading
  updates and exporting them over dbus.
@@ -86,7 +92,7 @@
 
 Package: ubuntu-location-service-bin
 Architecture: any
-Depends: libubuntu-location-service2 (= ${binary:Version}),
+Depends: libubuntu-location-service3 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
          trust-store-bin,
@@ -100,7 +106,7 @@
 Package: ubuntu-location-service-examples
 Architecture: any
 Multi-Arch: same
-Depends: libubuntu-location-service2 (= ${binary:Version}),
+Depends: libubuntu-location-service3 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
          ubuntu-location-service-doc,

=== added file 'debian/control.in'
--- debian/control.in	1970-01-01 00:00:00 +0000
+++ debian/control.in	2015-12-06 20:11:22 +0000
@@ -0,0 +1,123 @@
+Source: location-service
+Section: utils
+Priority: optional
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Thomas Voß <[e-mail]>
+Build-Depends: cmake,
+               curl,
+               libdbus-cpp-dev (>= 4.1.0),
+               debhelper (>= 9),
+               doxygen,
+               geoclue-ubuntu-geoip,
+               google-mock (>= 1.6.0+svn437),
+               graphviz,
+               libapparmor-dev,
+               libboost-filesystem-dev,
+               libboost-program-options-dev,
+               libboost-system-dev,
+               libdbus-1-dev,
+               libdbus-cpp-dev,
+               libgoogle-glog-dev,
+               libgtest-dev,
+               libiw-dev,
+               libjson-c-dev,
+               libnet-cpp-dev,
+               libprocess-cpp-dev,
+               libtrust-store-dev,
+               libubuntu-platform-hardware-api-headers [!arm64 !ppc64el !powerpc],
+               libubuntu-platform-hardware-api-dev [!arm64 !ppc64el !powerpc],
+               libproperties-cpp-dev,
+               lsb-release,
+               trust-store-bin,
+Standards-Version: 3.9.4
+Homepage: http://launchpad.net/location-service
+# If you aren't a member of ~phablet-team but need to upload packaging changes,
+# just go ahead.  ~phablet-team will notice and sync up the code again.
+Vcs-Bzr: https://code.launchpad.net/~phablet-team/location-service/trunk
+Vcs-Browser: http://bazaar.launchpad.net/~phablet-team/location-service/trunk/files
+
+Package: libubuntu-location-service@UBUNTU_LOCATION_SERVICE_SOVERSION@
+Section: libs
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Description: location service aggregating position/velocity/heading
+ updates and exporting them over dbus.
+ .
+ Contains the shared library needed by client applications.
+
+Package: libubuntu-location-service-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: foreign
+Recommends: ubuntu-location-service-doc,
+Depends: libubuntu-location-service@UBUNTU_LOCATION_SERVICE_SOVERSION@ (= ${binary:Version}),
+         libdbus-1-dev,
+         libdbus-cpp-dev,
+         libboost-dev,
+         ${misc:Depends},
+Suggests: ubuntu-location-service-doc,
+Description: location service aggregating position/velocity/heading
+ updates and exporting them over dbus.
+ .
+ Contains header files required to develop clients talking to the ubuntu
+ location service.
+
+Package: libubuntu-location-service-dbg
+Section: debug
+Architecture: any
+Multi-Arch: foreign
+Depends: libubuntu-location-service@UBUNTU_LOCATION_SERVICE_SOVERSION@ (= ${binary:Version}),
+         ${misc:Depends},
+Description: location service aggregating position/velocity/heading
+ updates and exporting them over dbus.
+ .
+ Contains debug symbols.
+
+Package: ubuntu-location-service-tests
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Description: location service aggregating position/velocity/heading
+ updates and exporting them over dbus.
+ .
+ Contains all test executables
+
+Package: ubuntu-location-service-bin
+Architecture: any
+Depends: libubuntu-location-service@UBUNTU_LOCATION_SERVICE_SOVERSION@ (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends},
+         trust-store-bin,
+Breaks: ubuntu-location-service-examples (<< 0.0.2),
+Replaces: ubuntu-location-service-examples (<< 0.0.2),
+Description: location service aggregating position/velocity/heading
+ updates and exporting them over dbus.
+ .
+ Contains the service executable and man pages.
+
+Package: ubuntu-location-service-examples
+Architecture: any
+Multi-Arch: same
+Depends: libubuntu-location-service@UBUNTU_LOCATION_SERVICE_SOVERSION@ (= ${binary:Version}),
+         ${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
+Multi-Arch: foreign
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Recommends: ubuntu-location-service-examples,
+Description: location service aggregating position/velocity/heading
+ updates and exporting them over dbus.
+ .
+ Contains documentation for service and client.

=== added file 'debian/gen-debian-files.sh'
--- debian/gen-debian-files.sh	1970-01-01 00:00:00 +0000
+++ debian/gen-debian-files.sh	2015-12-06 20:11:22 +0000
@@ -0,0 +1,111 @@
+#!/bin/sh
+
+# Copyright (C) 2015 Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Authored by: Michi Henning <[e-mail]>
+#              Thomas Voß <[e-mail]>
+
+#
+# Script to generate debian files for dual landing in Vivid (gcc 4.9 ABI)
+# and Wily and later (gcc 5 ABI).
+#
+# This script is called from debian/rules and generates:
+#
+# - control
+# - libubuntu-location-service${soversion}.install.${target_arch}
+#
+# For all but control, this is a straight substition and/or renaming exercise for each file.
+# For control, if building on Wily or later, we also fix the "Replaces:" and "Conflicts:"
+# entries, so we don't end up with two packages claiming ownership of the same places
+# in the file system.
+#
+# Because the debian files for the different distributions are generated on the fly,
+# this allows us to keep a single source tree for both distributions. See ../HACKING
+# for more explanations.
+#
+
+set -e  # Fail if any command fails.
+
+progname=$(basename $0)
+
+[ $# -ne 1 ] && {
+    echo "usage: $progname path-to-debian-dir" >&2
+    exit 1
+}
+dir=$1
+version_dir=$(mktemp -d)
+
+# Dump version numbers into files and initialize vars from those files.
+
+sh ${dir}/get-versions.sh ${dir} ${version_dir}
+
+full_version=$(cat "${version_dir}"/libubuntu-location-service.full-version)
+major_minor=$(cat "${version_dir}"/libubuntu-location-service.major-minor-version)
+soversion=$(cat "${version_dir}"/libubuntu-location-service.soversion)
+vivid_soversion=$(cat "${version_dir}"/libubuntu-location-service.vivid-soversion)
+
+warning=$(mktemp -t gen-debian-files-msg.XXX)
+
+trap "rm -fr $warning $version_dir" 0 INT TERM QUIT
+
+warning_msg()
+{
+    cat >$warning <<EOF
+# This file is autogenerated. DO NOT EDIT!
+#
+# Modifications should be made to $(basename "$1") instead.
+# This file is regenerated automatically in the clean target.
+#
+EOF
+}
+
+# Generate debian/control from debian/control.in, substituting the soversion for both libs.
+# For wily onwards, we also add an entry for the vivid versions to "Conflicts:" and "Replaces:".
+
+infile="${dir}"/control.in
+outfile="${dir}"/control
+warning_msg $infile
+cat $warning $infile \
+    | sed -e "s/@UBUNTU_LOCATION_SERVICE_SOVERSION@/${soversion}/" > "$outfile"
+
+[ "$distro" != "vivid" ] && {
+    sed -i -e "/Replaces: libubuntu-location-service2,/a\
+\          libubuntu-location-service${vivid_soversion}," \
+        "$outfile"
+}
+
+# Generate the install files, naming them according to the soversion.
+
+# Install file for binary package
+infile="${dir}"/libubuntu-location-service.install.in
+outfile="${dir}"/libubuntu-location-service${soversion}.install
+warning_msg "$infile"
+cat $warning "$infile" >"$outfile"
+
+infile="${dir}"/libubuntu-location-service.install.with-gps.in
+outfile="${dir}"/libubuntu-location-service${soversion}.install.with-gps
+warning_msg "$infile"
+cat $warning "$infile" >"$outfile"
+
+infile="${dir}"/libubuntu-location-service-dev.install.in
+outfile="${dir}"/libubuntu-location-service-dev.install
+warning_msg "$infile"
+cat $warning $infile | sed -e "s/@UBUNTU_LOCATION_SERVICE_SOVERSION@/${soversion}/" > "$outfile"
+
+ln -s "${dir}"/libubuntu-location-service${soversion}.install.with-gps "${dir}"/libubuntu-location-service${soversion}.install.amd64
+ln -s "${dir}"/libubuntu-location-service${soversion}.install.with-gps "${dir}"/libubuntu-location-service${soversion}.install.armhf
+ln -s "${dir}"/libubuntu-location-service${soversion}.install.with-gps "${dir}"/libubuntu-location-service${soversion}.install.i386
+
+exit 0

=== added file 'debian/get-versions.sh'
--- debian/get-versions.sh	1970-01-01 00:00:00 +0000
+++ debian/get-versions.sh	2015-12-06 20:11:22 +0000
@@ -0,0 +1,68 @@
+#!/bin/sh
+
+# Copyright (C) 2015 Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Authored by: Michi Henning <[e-mail]>
+
+#
+# Script to read the version numbers from VERSION and QT-VERSION
+# and write the version components and the soversion numbers
+# into separate files, so we can pick them up from both
+# gen-debian-files.sh and CMakeLists.txt.
+#
+
+set -e  # Fail if any command fails.
+
+progname=$(basename $0)
+
+[ $# -lt 1 -o $# -gt 2 ] && {
+    echo "usage: $progname path-to-debian-dir [output-dir]" >&2
+    exit 1
+}
+dir=$1
+output_dir=`pwd`
+[ $# -eq 2 ] && output_dir=$2
+
+# Write the various version numbers into a bunch of files. This allows
+# us to easily pick them up from both gen-debian-files.sh and CMakeLists.txt.
+
+distro=$(lsb_release -c -s)
+
+full_version=$(cat "${dir}"/VERSION)
+
+major=$(echo $full_version | cut -d'.' -f1)
+minor=$(echo $full_version | cut -d'.' -f2)
+micro=$(echo $full_version | cut -d'.' -f3)
+major_minor="${major}.${minor}"
+
+vivid_full_version=$(cat "${dir}"/VERSION.vivid)
+vivid_major=$(echo $vivid_full_version | cut -d'.' -f1)
+vivid_soversion=$vivid_major
+
+if [ "$distro" = "vivid" ]
+then
+    soversion=${vivid_soversion}
+else
+    soversion="${major}"
+fi
+[ -n $soversion ]
+
+echo ${full_version} >${output_dir}/libubuntu-location-service.full-version
+echo ${major} >${output_dir}/libubuntu-location-service.major-version
+echo ${minor} >${output_dir}/libubuntu-location-service.minor-version
+echo ${micro} >${output_dir}/libubuntu-location-service.micro-version
+echo ${major_minor} >${output_dir}/libubuntu-location-service.major-minor-version
+echo ${soversion} >${output_dir}/libubuntu-location-service.soversion
+echo ${vivid_soversion} >${output_dir}/libubuntu-location-service.vivid-soversion

=== removed file 'debian/libubuntu-location-service-dev.install'
--- debian/libubuntu-location-service-dev.install	2014-07-18 14:42:10 +0000
+++ debian/libubuntu-location-service-dev.install	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-usr/include/ubuntu-location-service-2
-usr/lib/*/libubuntu-location-service.so
-usr/lib/*/libubuntu-location-service-connectivity.so
-usr/lib/*/pkgconfig/ubuntu-location-service.pc
-usr/lib/*/pkgconfig/ubuntu-location-service-connectivity.pc

=== added file 'debian/libubuntu-location-service-dev.install.in'
--- debian/libubuntu-location-service-dev.install.in	1970-01-01 00:00:00 +0000
+++ debian/libubuntu-location-service-dev.install.in	2015-12-06 20:11:22 +0000
@@ -0,0 +1,5 @@
+usr/include/ubuntu-location-service-@UBUNTU_LOCATION_SERVICE_SOVERSION@
+usr/lib/*/libubuntu-location-service.so
+usr/lib/*/libubuntu-location-service-connectivity.so
+usr/lib/*/pkgconfig/ubuntu-location-service.pc
+usr/lib/*/pkgconfig/ubuntu-location-service-connectivity.pc

=== added file 'debian/libubuntu-location-service.install.in'
--- debian/libubuntu-location-service.install.in	1970-01-01 00:00:00 +0000
+++ debian/libubuntu-location-service.install.in	2015-12-06 20:11:22 +0000
@@ -0,0 +1,2 @@
+usr/lib/*/libubuntu-location-service.so.*
+usr/lib/*/libubuntu-location-service-connectivity.so.*

=== added file 'debian/libubuntu-location-service.install.with-gps.in'
--- debian/libubuntu-location-service.install.with-gps.in	1970-01-01 00:00:00 +0000
+++ debian/libubuntu-location-service.install.with-gps.in	2015-12-06 20:11:22 +0000
@@ -0,0 +1,3 @@
+usr/lib/*/libubuntu-location-service.so.*
+usr/lib/*/libubuntu-location-service-connectivity.so.*
+/etc/gps.conf

=== removed file 'debian/libubuntu-location-service2.install'
--- debian/libubuntu-location-service2.install	2014-07-30 13:55:44 +0000
+++ debian/libubuntu-location-service2.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-usr/lib/*/libubuntu-location-service.so.*
-usr/lib/*/libubuntu-location-service-connectivity.so.*

=== removed symlink 'debian/libubuntu-location-service2.install.amd64'
=== target was u'libubuntu-location-service2.install.with-gps'
=== removed symlink 'debian/libubuntu-location-service2.install.armhf'
=== target was u'libubuntu-location-service2.install.with-gps'
=== removed symlink 'debian/libubuntu-location-service2.install.i386'
=== target was u'libubuntu-location-service2.install.with-gps'
=== removed file 'debian/libubuntu-location-service2.install.with-gps'
--- debian/libubuntu-location-service2.install.with-gps	2014-07-30 13:55:44 +0000
+++ debian/libubuntu-location-service2.install.with-gps	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-usr/lib/*/libubuntu-location-service.so.*
-usr/lib/*/libubuntu-location-service-connectivity.so.*
-/etc/gps.conf

=== modified file 'debian/rules'
--- debian/rules	2015-07-15 19:04:43 +0000
+++ debian/rules	2015-12-06 20:11:22 +0000
@@ -15,6 +15,18 @@
 
 include /usr/share/dpkg/default.mk
 
+distro=$(shell lsb_release -c -s)
+
+ifeq ($(distro),vivid)
+	full_version=$(shell cat $(CURDIR)/debian/VERSION.vivid)
+else
+	full_version=$(shell cat $(CURDIR)/debian/VERSION)
+endif
+
+major=$(shell echo $(full_version) | cut -d'.' -f1)
+minor=$(shell echo $(full_version) | cut -d'.' -f2)
+patch=$(shell echo $(full_version) | cut -d'.' -f3)
+
 ifneq (,$(filter $(DEB_HOST_ARCH),ppc64el powerpc arm64))
         LOCATION_SERVICE_ENABLE_GPS_PROVIDER = OFF
 else
@@ -31,4 +43,11 @@
 	dh_strip --dbg-package=libubuntu-location-service-dbg
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/$(DEB_HOST_MULTIARCH)/ubuntu-location-service -DCMAKE_C_COMPILER=$(CC) -DCMAKE_CXX_COMPILER=$(CXX) -DLOCATION_SERVICE_ENABLE_GPS_PROVIDER=$(LOCATION_SERVICE_ENABLE_GPS_PROVIDER)
+	dh_auto_configure -- -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/$(DEB_HOST_MULTIARCH)/ubuntu-location-service -DCMAKE_C_COMPILER=$(CC) -DCMAKE_CXX_COMPILER=$(CXX) -DLOCATION_SERVICE_ENABLE_GPS_PROVIDER=$(LOCATION_SERVICE_ENABLE_GPS_PROVIDER) -DUBUNTU_LOCATION_SERVICE_VERSION_MAJOR=$(major) -DUBUNTU_LOCATION_SERVICE_VERSION_MINOR=$(minor) -DUBUNTU_LOCATION_SERVICE_VERSION_PATCH=$(patch)
+
+override_dh_auto_clean:
+	rm -f $(CURDIR)/debian/libubuntu-location-service$(major).install.amd64
+	rm -f $(CURDIR)/debian/libubuntu-location-service$(major).install.armhf
+	rm -f $(CURDIR)/debian/libubuntu-location-service$(major).install.i386
+	/bin/sh $(CURDIR)/debian/gen-debian-files.sh $(CURDIR)/debian
+	dh_auto_clean

=== modified file 'debian/source/format'
--- debian/source/format	2014-07-30 14:15:06 +0000
+++ debian/source/format	2015-12-06 20:11:22 +0000
@@ -1,1 +1,1 @@
-3.0 (quilt)
+3.0 (native)

=== modified file 'tests/acceptance_tests.cpp'
--- tests/acceptance_tests.cpp	2015-12-06 20:11:22 +0000
+++ tests/acceptance_tests.cpp	2015-12-06 20:11:22 +0000
@@ -818,7 +818,7 @@
 
         options.add(Keys::client_count,
                     "Number of clients that should be fired up.",
-                    std::uint32_t{50});
+                    std::uint32_t{10});
 
         options.add(Keys::test_duration,
                     "Test duration in [s]",