Merge lp:~thomas-voss/location-service/enable-dual-landings-take-2 into lp:location-service/trunk

[Thomas Voß]

* Enable dual landings according to https://wiki.ubuntu.com/citrain/LandingProcess#Dual-landing_for_stable_and_devel:
  * Both vivid+overlay and xenial packages are built from the same source.
  * To account for differences in major revisions (necessary to handle the g++ 5 ABI break),
    we generate install files on the fly.

* Enable dual landings according to https://wiki.ubuntu.com/citrain/LandingProcess#Dual-landing_for_stable_and_devel:
  * Both vivid+overlay and xenial packages are built from the same source.
  * To account for differences in major revisions (necessary to handle the g++ 5 ABI break),
    we generate install files on the fly.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~thomas-voss/location-service/enable-dual-landings-take-2]

223. By Thomas Voß on 2016-03-11

Add missing files.

224. By Thomas Voß on 2016-03-11

Remove obsolete install files.
Adjust setup of major.minor.patch triplet in CMakeLists.txt.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

Why both with different major version numbers for vivid and xenial? If the code is the same, I'd rather use the same major version and just make sure the package provides the old version to keep from breaking depends.

review: Needs Information

[Thomas Voß (thomas-voss)]

> Why both with different major version numbers for vivid and xenial? If the
> code is the same, I'd rather use the same major version and just make sure the
> package provides the old version to keep from breaking depends.

We can't keep the same major version due to the ABI break introduced by GCC 5 in Xenial.

[lp:~thomas-voss/location-service/enable-dual-landings-take-2]

225. By Thomas Voß on 2016-03-15

* Remove explicit option to disable satellite-based positioning
  services.
[ Alberto Mardegan ]
* Set debian source format to "3.0 (native)"
[ Scott Sweeny ]
* Allow providers to register themselves asynchronously (LP: #1415029)
* Account for changes in trust-store w.r.t. assembling the description
  of a trust prompt.
* Fix settings not being applied correctly.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[Łukasz Zemczak (sil2100)]

Hey! Thanks for submitting this branch, would be nice to dual-land this.

So there's one small thing that's 'Needs Fixing' and two 'Needs Information'.

Needs Fixing:
You would need to include the changelog entry for this landing in the changelog diff here since this file has been touched. Train in such cases won't add the changelog entry based on the commit message in this case. Be sure to leave it as UNRELEASED.

Needs Information:
Small thing: I was wondering, I see we have an explicit -dbg package. Aren't those auto-generated on uploads? Just wondering if in this case we need one explicitly.
The second one is, of course, any chance for ABI compliance checking + some shlibs? ;) I suppose we export some symbols here, would be nice to have the some checks here for dual landing. Not sure how far Michi went with implementing abigail [1] in his ABI checking - I see there are some commits in their staging branch.

[1] https://sourceware.org/libabigail/

review: Needs Fixing

[Thomas Voß (thomas-voss)]

> Hey! Thanks for submitting this branch, would be nice to dual-land this.
>
> So there's one small thing that's 'Needs Fixing' and two 'Needs Information'.
>
> Needs Fixing:
> You would need to include the changelog entry for this landing in the
> changelog diff here since this file has been touched. Train in such cases
> won't add the changelog entry based on the commit message in this case. Be
> sure to leave it as UNRELEASED.
>

Should be fixed.

> Needs Information:
> Small thing: I was wondering, I see we have an explicit -dbg package. Aren't
> those auto-generated on uploads? Just wondering if in this case we need one
> explicitly.

It's an artifact originating in the times when the train did not offer dbgsym packages for silos.
However, I would rather prefer to keep the packaging changes introduced in this branch limited and follow up with an MP that removes the package.

> The second one is, of course, any chance for ABI compliance checking + some
> shlibs? ;) I suppose we export some symbols here, would be nice to have the
> some checks here for dual landing. Not sure how far Michi went with
> implementing abigail [1] in his ABI checking - I see there are some commits in
> their staging branch.
>

I would love to have abigail integrated and I'm happy to file and assign a critical bug for tracking the issue. That being said, I would think we shouldn't block on the lack of symbol checking. It was missing before this branch and the changes do not make the situation worse ;-)

> [1] https://sourceware.org/libabigail/

[lp:~thomas-voss/location-service/enable-dual-landings-take-2]

226. By Thomas Voß on 2016-03-16

* Enable dual landings according to https://wiki.ubuntu.com/citrain/LandingProcess#Dual-landing_for_stable_and_devel:
  * Both vivid+overlay and xenial packages are built from the same source.
  * To account for differences in major revisions (necessary to handle the g++ 5 ABI break), we generate install files on the fly.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[Łukasz Zemczak (sil2100)]

Almost there! Cosmetic changes are left. The new debian/changelog entry should have lines wrapped at 80 characters. If there's a long link then it's okayish to have it >80 (since we can't cut it in-between), but otherwise lines should be wrapped. Be sure to, when you're wrapping lines, to align them correctly with the previous lines.

Lintian also mentiones some warnings during source package build, but I guess those are all old issues.

review: Needs Fixing

[lp:~thomas-voss/location-service/enable-dual-landings-take-2]

227. By Thomas Voß on 2016-03-17

Address review comments and tidy up line length.

[Łukasz Zemczak (sil2100)]

Ok, looks goodish enough.

But please be sure to fill in a critical bug about ABI compliance!

review: Approve

[lp:~thomas-voss/location-service/enable-dual-landings-take-2]

228. By Thomas Voß on 2016-04-04

Pull in missing revisions to changelog.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-04-04 19:18:28 +0000
+++ CMakeLists.txt	2016-04-04 19:18:28 +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	2016-04-04 19:18:28 +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	2016-04-04 19:18:28 +0000
@@ -0,0 +1,1 @@
+2.0.0

=== modified file 'debian/changelog'
--- debian/changelog	2016-04-04 19:18:28 +0000
+++ debian/changelog	2016-04-04 19:18:28 +0000
@@ -1,40 +1,37 @@
-location-service (2.1+15.10.20150727-0ubuntu1) wily; urgency=medium
-
-  [ CI Train Bot ]
-  * New rebuild forced.
-
-  [ Charles Kerr ]
-  * drop build-dependency on g++-4.9 (LP: #1452329)
-
- -- CI Train Bot <[e-mail]>  Mon, 27 Jul 2015 18:07:37 +0000
-
-location-service (2.1+15.10.20150706-0ubuntu1) wily; urgency=medium
-
-  [ Alberto Aguirre ]
-  * No change rebuild against platform-api 3
-
-  [ CI Train Bot ]
-  * New rebuild forced.
-
- -- CI Train Bot <[e-mail]>  Mon, 06 Jul 2015 18:22:22 +0000
-
-location-service (2.1+15.10.20150601.2-0ubuntu1) wily; urgency=medium
-
-  [ CI Train Bot ]
-  * New rebuild forced.
-
-  [ Manuel de la Pena ]
-  * Ensure that the trust store is started when is needed.
-
- -- CI Train Bot <[e-mail]>  Mon, 01 Jun 2015 15:13:06 +0000
-
-location-service (2.1+15.10.20150528.3-0ubuntu1) wily; urgency=medium
-
-  [ Thomas Voß ]
-  * Make sure we always hand a lock owning its mutex to
-    on_access_point_added. (LP: #1426307)
-
- -- CI Train Bot <[e-mail]>  Thu, 28 May 2015 11:40:58 +0000
+location-service (3.0.0-0ubuntu5) UNRELEASED; urgency=medium
+
+  * Enable dual landings according to https://wiki.ubuntu.com/citrain/LandingProcess#Dual-landing_for_stable_and_devel:
+    * Both vivid+overlay and xenial packages are built from the same
+      source.
+    * To account for differences in major revisions (necessary to handle
+      the g++ 5 ABI break), we generate install files on the fly.
+
+ -- Thomas Voß <[e-mail]>  Wed, 16 Mar 2016 20:15:57 +0100
+
+location-service (3.0.0-0ubuntu4) wily-proposed; urgency=medium
+
+  * No change rebuild.
+
+ -- Ken VanDine <[e-mail]>  Mon, 03 Aug 2015 13:33:13 -0400
+
+location-service (3.0.0-0ubuntu3) wily; urgency=medium
+
+  * No change rebuild.
+
+ -- Matthias Klose <[e-mail]>  Fri, 31 Jul 2015 00:23:18 +0200
+
+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.04.20160302.1-0ubuntu1) vivid; urgency=medium
 

=== modified file 'debian/control'
--- debian/control	2015-07-15 19:04:43 +0000
+++ debian/control	2016-04-04 19:18:28 +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

=== added file 'debian/control.in'
--- debian/control.in	1970-01-01 00:00:00 +0000
+++ debian/control.in	2016-04-04 19:18:28 +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	2016-04-04 19:18:28 +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	2016-04-04 19:18:28 +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

=== modified 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	2016-04-04 19:18:28 +0000
@@ -1,3 +1,8 @@
+# This file is autogenerated. DO NOT EDIT!
+#
+# Modifications should be made to libubuntu-location-service-dev.install.in instead.
+# This file is regenerated automatically in the clean target.
+#
 usr/include/ubuntu-location-service-2
 usr/lib/*/libubuntu-location-service.so
 usr/lib/*/libubuntu-location-service-connectivity.so

=== 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	2016-04-04 19:18:28 +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	2016-04-04 19:18:28 +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	2016-04-04 19:18:28 +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	2016-04-04 19:18:28 +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