Merge into trunk : dynamic-soname : Code : messaging-framework

Status:	Merged
Approved by:	Roberto Mier Escandon on 2016-11-19
Approved revision:	84
Merged at revision:	72
Proposed branch:	lp:~phablet-team/messaging-framework/dynamic-soname
Merge into:	lp:messaging-framework
Prerequisite:	lp:~ken-vandine/messaging-framework/packaging_cleanup
Diff against target:	599 lines (+250/-107) 21 files modified CMakeLists.txt (+15/-6) HACKING.md (+77/-0) README.md (+0/-15) data/CMakeLists.txt (+4/-4) data/messaging-framework.pc.in (+10/-0) data/messaging-fw.pc.in (+0/-10) debian/bileto_pre_release_hook (+22/-0) debian/control (+0/-50) debian/control.in (+49/-0) debian/libmessaging-framework-dev.install (+3/-0) debian/libmessaging-framework1.install.in (+2/-0) debian/libmessaging-framework1.shlibs.in (+1/-0) debian/libmessaging-fw-dev.install (+0/-3) debian/libmessaging-fw1.install (+0/-2) debian/rules (+4/-3) include/CMakeLists.txt (+1/-1) src/CMakeLists.txt (+12/-11) tests/CMakeLists.txt (+1/-1) tests/unit/messaging/CMakeLists.txt (+1/-1) tools/CMakeLists.txt (+4/-0) tools/get_soversion.sh (+44/-0)
To merge this branch:	bzr merge lp:~phablet-team/messaging-framework/dynamic-soname
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
system-apps-ci-bot	continuous-integration		Approve on 2016-11-19
Gustavo Pichorim Boiko (community)		2016-11-10	Approve on 2016-11-11
Review via email: mp+310557@code.launchpad.net

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-11-10:

#

FAILED: Continuous integration, rev:77
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-ci/94/
Executed test runs:
FAILURE: https://jenkins.canonical.com/system-apps/job/build/1961/console
FAILURE: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1962/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-ci/94/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-11-11:

#

FAILED: Continuous integration, rev:79
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-ci/95/
Executed test runs:
FAILURE: https://jenkins.canonical.com/system-apps/job/build/1966/console
FAILURE: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1967/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-ci/95/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-11-11:

#

FAILED: Continuous integration, rev:80
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-ci/96/
Executed test runs:
FAILURE: https://jenkins.canonical.com/system-apps/job/build/1968/console
FAILURE: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1969/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-ci/96/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-11-11:

#

FAILED: Continuous integration, rev:81
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-ci/97/
Executed test runs:
FAILURE: https://jenkins.canonical.com/system-apps/job/build/1969/console
FAILURE: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1970/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-ci/97/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Gustavo Pichorim Boiko (boiko) wrote on 2016-11-11:

#

We probably need to get the CI jobs to run a step to generate debian/control before building the package, but other than that the code looks good!

review: Approve

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-11-11:

#

FAILED: Autolanding.
More details in the following jenkins job:
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-autoland/42/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1972/console
    None: https://jenkins.canonical.com/system-apps/job/lp-generic-land-mp/59/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1973/console

review: Needs Fixing (continuous-integration)

Revision history for this message

James Henstridge (jamesh) wrote on 2016-11-14:

#

Gary Wang mentioned this merge proposal to me, since you borrowed some of the multi-landing bits I wrote for storage-framework.

Just a small note:

For the libstorage-framework-provider library, we exposed boost types in our public API. This is why our ABI breaks with each new Boost version (since they don't maintain ABI stability).

If that's not the case for your library, you probably only need one soname for gcc 4.9 (vivid), and another for gcc >= 5.

If you're unsure, one option would be to build the library with debug symbols on xenial and zesty, and then compare the results using the abidiff tool (found in the abigail-tools package).

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-11-17:

#

FAILED: Continuous integration, rev:82
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-ci/98/
Executed test runs:
FAILURE: https://jenkins.canonical.com/system-apps/job/build/1987/console
FAILURE: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1990/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-ci/98/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-11-18:

#

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-ci/99/rebuild

FAILED: Continuous integration, rev:83
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-ci/99/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/2007/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2010
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1840/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1840
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1840/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1840
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1840/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1840/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1840
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1840/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1840
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1840/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1840/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1840
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1840/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1840
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1840/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-ci/99/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-11-18:

#

review: Needs Fixing (continuous-integration)

lp:~phablet-team/messaging-framework/dynamic-soname updated on 2016-11-18

84. By Roberto Mier Escandon on 2016-11-18: corrected minimum version for libboost be 1.55

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-11-19:

#

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-ci/100/rebuild

PASSED: Continuous integration, rev:84
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-ci/100/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/2011
    SUCCESS: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/487
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2014
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1844
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1844/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1844
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1844/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1844
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1844/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1844
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1844/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1844
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1844/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1844
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1844/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1844
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1844/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1844
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1844/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1844
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1844/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-ci/100/rebuild

review: Approve (continuous-integration)

messaging-framework

Merge lp:~phablet-team/messaging-framework/dynamic-soname into lp:messaging-framework

Commit message

Description of the change

Preview Diff

Subscribers

 === modified file 'CMakeLists.txt'
 --- CMakeLists.txt	2016-08-17 16:44:29 +0000
 +++ CMakeLists.txt	2016-11-18 23:50:42 +0000
@@ -1,5 +1,5 @@
--project(messaging-framework C CXX)
--cmake_minimum_required(VERSION 2.8.10)
++cmake_minimum_required(VERSION 3.0.2)
++project(messaging-framework VERSION "0.1" LANGUAGES C CXX)
  set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
  # Select a pedantic set of compiler flags and enable C++11 support.
@@ -31,10 +31,18 @@
  set(CMAKE_INCLUDE_CURRENT_DIR ON)
  set(CMAKE_AUTOMOC ON)
--set(SO_VERSION_MAJOR "1")
--set(SO_VERSION_MINOR "1")
--set(SO_VERSION_PATCH "0")
--set(SO_VERSION "${SO_VERSION_MAJOR}.${SO_VERSION_MINOR}.${SO_VERSION_PATCH}")
++set(API_VERSION "1")
++
++execute_process(
++  COMMAND /bin/sh ${CMAKE_CURRENT_SOURCE_DIR}/tools/get_soversion.sh
++  OUTPUT_VARIABLE SO_VERSION
++  OUTPUT_STRIP_TRAILING_WHITESPACE
++  RESULT_VARIABLE result)
++if(NOT result EQUAL 0)
++  message(FATAL_ERROR "Error running get-soversion.sh script")
++endif()
++
++set(LIB_VERSION "${SO_VERSION}.${PROJECT_VERSION}")
  option(CLICK_MODE "Installs to a contained location" on)
@@ -82,6 +90,7 @@
+ )
  add_subdirectory(data)
++add_subdirectory(tools)
  add_subdirectory(doc)
  add_subdirectory(include)
  add_subdirectory(src)
 === added file 'HACKING.md'
 --- HACKING.md	1970-01-01 00:00:00 +0000
 +++ HACKING.md	2016-11-18 23:50:42 +0000
@@ -0,0 +1,77 @@
++# Messaging Framework
++
++### Checking dependencies
++
++Check all the dependencies needed for the project to be built:
++```sh
++$ dpkg-checkbuilddeps
++```
++(this will return the list of dependencies). Install the returned dependencies:
++```sh
++$ apt-get install <list_of_dependencies>
++```
++
++### Building the code
++
++You can check the needed packages by using:
++```sh
++$ dpkg-checkdependencies
++```
++
++and install the list of needed dependencies returned. Once done, execute:
++```sh
++$ mkdir build && cd build
++$ cmake -DCMAKE_INSTALL_PREFIX=/usr ../..
++$ make -j<n>
++```
++where <n> is the number of cores available to use for building.
++You can use ccache also if expected to build several times (apt-get install ccache)
++
++
++### Running the tests
++
++Once built, into build folder, execute:
++```sh
++$ ctest -j<n>
++```
++where <n> is the number of cores available to use for executing the tests in parallel
++
++
++### Building the package
++
++NOTE: Before building the package it is needed run a hook which updates debian folder. You have to execute
++that hook from project folder:
++```sh
++$ ./debian/bileto_pre_release_hook
++```
++
++If all goes well, no response should be returned.
++
++You can build the deb package in current arch by executing:
++```sh
++$ dh_clean
++$ dpkg-buildpackage -b
++```
++
++in case you want to skip signage and dependencies to build a test package, you can use some additional params:
++```sh
++$ dpkg-buildpackage -nc -us -uc -d -b
++```
++
++besides, if you are in a lxd container and want to build a package for that container architecture:
++```sh
++$ dpkg-buildpackage -nc -us -uc -d -b --target-arch <arch> -a <arch> -j<n>
++```
++
++where <arch> is the architecture of the environment and <n> the number of cores to use
++
++Depending on the release the soname of the resultant library will be on or another. You can query file:
++```sh
++tools/get_soversion.sh
++```
++
++the soversion that will be used for the library. The resultant .deb package will be like:
++```sh
++libmessaging-framework<apiversion>-<soversion>_XXX_<arch>.deb
++```
++
 === removed file 'README.md'
 --- README.md	2016-03-30 19:19:19 +0000
 +++ README.md	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
--messaging-framework
--===================
--
--Check all the dependencies needed for the project to be built:
--`dpkg-checkbuilddeps`
--(this will return the list of dependencies)
--
--`apt-get install <list_of_dependencies>`
--
--
--Build the project
-------------------
--`build.sh [clean]`
--
--
 === modified file 'data/CMakeLists.txt'
 --- data/CMakeLists.txt	2016-03-30 19:19:19 +0000
 +++ data/CMakeLists.txt	2016-11-18 23:50:42 +0000
@@ -15,7 +15,7 @@
  ###########################################
--# Messaging-fw data and configuration files
++# messaging-framework data and configuration files
  ###########################################
  # Compose the pkg-config file needed to find the library using that tool
@@ -24,9 +24,9 @@
  set(INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/include") # /usr/include
  configure_file(
--    ${CMAKE_CURRENT_SOURCE_DIR}/messaging-fw.pc.in
--    ${CMAKE_CURRENT_BINARY_DIR}/messaging-fw.pc
++    ${CMAKE_CURRENT_SOURCE_DIR}/messaging-framework.pc.in
++    ${CMAKE_CURRENT_BINARY_DIR}/messaging-framework${API_VERSION}.pc
      @ONLY)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/messaging-fw.pc
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/messaging-framework${API_VERSION}.pc
      DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 === added file 'data/messaging-framework.pc.in'
 --- data/messaging-framework.pc.in	1970-01-01 00:00:00 +0000
 +++ data/messaging-framework.pc.in	2016-11-18 23:50:42 +0000
@@ -0,0 +1,10 @@
++prefix=@PREFIX@
++exec_prefix=@PREFIX@
++libdir=@LIBDIR@
++includedir=@INCLUDEDIR@
++
++Name: messaging-framework
++Version: @SO_VERSION@
++Description: Ubuntu Messaging Framework
++Cflags: -I${includedir}/messaging-framework@API_VERSION@
++Libs: -L${libdir} -lmessaging-framework@API_VERSION@
 === removed file 'data/messaging-fw.pc.in'
 --- data/messaging-fw.pc.in	2016-03-30 19:19:19 +0000
 +++ data/messaging-fw.pc.in	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
--prefix=@PREFIX@
--exec_prefix=@PREFIX@
--libdir=@LIBDIR@
--includedir=@INCLUDEDIR@
--
--Name: Messaging-fw
--Version: @SO_VERSION@
--Description: Ubuntu Messaging Framework
--Cflags: -I${includedir}/messaging-fw
--Libs: -L${libdir} -lmessaging-fw
 === added file 'debian/bileto_pre_release_hook'
 --- debian/bileto_pre_release_hook	1970-01-01 00:00:00 +0000
 +++ debian/bileto_pre_release_hook	2016-11-18 23:50:42 +0000
@@ -0,0 +1,22 @@
++#!/bin/sh
++
++set -eu
++
++soversion=$(sh ./tools/get_soversion.sh)
++
++substitute() {
++    cat > "$2" <<EOF
++# This file is autogenerated. DO NOT EDIT!
++#
++# Modifications should be made to $1 instead.
++# This file is regenerated automatically in the clean target.
++#
++EOF
++    sed -e "s/@SO_VERSION@/${soversion}/g" < "$1" >> "$2"
++}
++
++substitute ./debian/control.in ./debian/control
++substitute ./debian/libmessaging-framework1.install.in ./debian/libmessaging-framework1-${soversion}.install
++substitute ./debian/libmessaging-framework1.shlibs.in ./debian/libmessaging-framework1-${soversion}.shlibs
++
++exit 0
 === added file 'debian/control'
 --- debian/control	1970-01-01 00:00:00 +0000
 +++ debian/control	2016-11-18 23:50:42 +0000
@@ -0,0 +1,54 @@
++# This file is autogenerated. DO NOT EDIT!
++#
++# Modifications should be made to ./debian/control.in instead.
++# This file is regenerated automatically in the clean target.
++#
++Source: messaging-framework
++Section: libs
++Priority: optional
++Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
++Build-Depends: astyle,
++               clang-format-3.5:native,
++               clang:native,
++               cmake,
++               debhelper (>= 9),
++               dos2unix,
++               doxygen,
++               gcovr,
++               google-mock,
++               graphviz,
++               lcov,
++               libboost-filesystem-dev (>= 1.55) | libboost-filesystem1.58-dev,
++               libboost-program-options-dev (>= 1.55) | libboost-program-options1.58-dev,
++               libboost-system-dev (>= 1.55) | libboost-system1.58-dev,
++               libdbus-cpp-dev,
++               libgoogle-glog-dev,
++               libphonenumber-dev,
++               libprocess-cpp-dev,
++               libsystemd-dev,
++               libtelepathy-qt5-dev,
++               pkg-config,
++               qtbase5-dev,
++               qtpim5-dev,
++               telepathy-mission-control-5
++Standards-Version: 3.9.7
++Homepage: https://launchpad.net/messaging-framework
++Vcs-Bzr: https://code.launchpad.net/~phablet-team/messaging-framework/trunk
++
++Package: libmessaging-framework-dev
++Section: libdevel
++Architecture: any
++Multi-Arch: same
++Depends: libmessaging-framework1-2 (= ${binary:Version}), ${misc:Depends}
++Description: Ubuntu Messaging Framework header files
++ All the development headers and libraries for the Messaging Framework
++
++Package: libmessaging-framework1-2
++Section: libs
++Architecture: any
++Multi-Arch: same
++Depends: ${misc:Depends}, ${shlibs:Depends}
++Description: Ubuntu Messaging Framework to build IM plugins
++ This layer communicates third party plugins with systems like
++ telepathy allowing changing the system by other without having
++ to modify the plugins
 === removed file 'debian/control'
 --- debian/control	2016-11-03 16:27:45 +0000
 +++ debian/control	1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
--Source: messaging-framework
--Section: libs
--Priority: optional
--Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
--Build-Depends: astyle,
--               clang-format-3.5:native,
--               clang:native,
--               cmake,
--               debhelper (>= 9),
--               dos2unix,
--               doxygen,
--               gcovr,
--               google-mock,
--               graphviz,
--               lcov,
--               libboost-dev,
--               libboost-filesystem-dev,
--               libboost-program-options-dev,
--               libboost-system-dev,
--               libdbus-cpp-dev,
--               libgoogle-glog-dev,
--               libphonenumber-dev,
--               libprocess-cpp-dev,
--               libsystemd-dev,
--               libtelepathy-qt5-dev,
--               pkg-config,
--               qtbase5-dev,
--               qtpim5-dev,
--               telepathy-mission-control-5
--Standards-Version: 3.9.7
--Homepage: https://launchpad.net/messaging-framework
--Vcs-Bzr: https://code.launchpad.net/~phablet-team/messaging-framework/trunk
--
--Package: libmessaging-fw-dev
--Section: libdevel
--Architecture: any
--Multi-Arch: same
--Depends: libmessaging-fw1 (= ${binary:Version}), ${misc:Depends}
--Description: Ubuntu Messaging Framework header files
-- All the development headers and libraries for the Messaging Framework
--
--Package: libmessaging-fw1
--Section: libs
--Architecture: any
--Multi-Arch: same
--Depends: ${misc:Depends}, ${shlibs:Depends}
--Description: Ubuntu Messaging Framework to build IM plugins
-- This layer communicates third party plugins with systems like
-- telepathy allowing changing the system by other without having
-- to modify the plugins
 === added file 'debian/control.in'
 --- debian/control.in	1970-01-01 00:00:00 +0000
 +++ debian/control.in	2016-11-18 23:50:42 +0000
@@ -0,0 +1,49 @@
++Source: messaging-framework
++Section: libs
++Priority: optional
++Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
++Build-Depends: astyle,
++               clang-format-3.5:native,
++               clang:native,
++               cmake,
++               debhelper (>= 9),
++               dos2unix,
++               doxygen,
++               gcovr,
++               google-mock,
++               graphviz,
++               lcov,
++               libboost-filesystem-dev (>= 1.55) | libboost-filesystem1.58-dev,
++               libboost-program-options-dev (>= 1.55) | libboost-program-options1.58-dev,
++               libboost-system-dev (>= 1.55) | libboost-system1.58-dev,
++               libdbus-cpp-dev,
++               libgoogle-glog-dev,
++               libphonenumber-dev,
++               libprocess-cpp-dev,
++               libsystemd-dev,
++               libtelepathy-qt5-dev,
++               pkg-config,
++               qtbase5-dev,
++               qtpim5-dev,
++               telepathy-mission-control-5
++Standards-Version: 3.9.7
++Homepage: https://launchpad.net/messaging-framework
++Vcs-Bzr: https://code.launchpad.net/~phablet-team/messaging-framework/trunk
++
++Package: libmessaging-framework-dev
++Section: libdevel
++Architecture: any
++Multi-Arch: same
++Depends: libmessaging-framework1-@SO_VERSION@ (= ${binary:Version}), ${misc:Depends}
++Description: Ubuntu Messaging Framework header files
++ All the development headers and libraries for the Messaging Framework
++
++Package: libmessaging-framework1-@SO_VERSION@
++Section: libs
++Architecture: any
++Multi-Arch: same
++Depends: ${misc:Depends}, ${shlibs:Depends}
++Description: Ubuntu Messaging Framework to build IM plugins
++ This layer communicates third party plugins with systems like
++ telepathy allowing changing the system by other without having
++ to modify the plugins
 === added file 'debian/libmessaging-framework-dev.install'
 --- debian/libmessaging-framework-dev.install	1970-01-01 00:00:00 +0000
 +++ debian/libmessaging-framework-dev.install	2016-11-18 23:50:42 +0000
@@ -0,0 +1,3 @@
++usr/include/messaging-framework*
++usr/lib/*/libmessaging-framework*.so
++usr/lib/*/pkgconfig/messaging-framework*.pc
 === added file 'debian/libmessaging-framework1.install.in'
 --- debian/libmessaging-framework1.install.in	1970-01-01 00:00:00 +0000
 +++ debian/libmessaging-framework1.install.in	2016-11-18 23:50:42 +0000
@@ -0,0 +1,2 @@
++usr/lib/*/libmessaging-framework*.so.*
++usr/lib/*/messaging-framework-runner
 === added file 'debian/libmessaging-framework1.shlibs.in'
 --- debian/libmessaging-framework1.shlibs.in	1970-01-01 00:00:00 +0000
 +++ debian/libmessaging-framework1.shlibs.in	2016-11-18 23:50:42 +0000
@@ -0,0 +1,1 @@
++libmessaging-framework1 @SO_VERSION@ libmessaging-framework1-@SO_VERSION@ (>= 0.1)
 === removed file 'debian/libmessaging-fw-dev.install'
 --- debian/libmessaging-fw-dev.install	2016-11-03 16:27:45 +0000
 +++ debian/libmessaging-fw-dev.install	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
--usr/include/messaging-fw/*
--usr/lib/*/libmessaging-fw*.so
--usr/lib/*/pkgconfig/messaging-fw.pc
 === removed file 'debian/libmessaging-fw1.install'
 --- debian/libmessaging-fw1.install	2016-11-03 16:27:45 +0000
 +++ debian/libmessaging-fw1.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
--usr/lib/*/libmessaging-fw*.so.*
--usr/lib/*/messaging-fw-runner
 === modified file 'debian/rules'
 --- debian/rules	2016-07-04 15:53:42 +0000
 +++ debian/rules	2016-11-18 23:50:42 +0000
@@ -6,7 +6,8 @@
  include /usr/share/dpkg/default.mk
  %:
--	dh $@ --fail-missing
++	dh $@ --parallel --fail-missing
--override_dh_shlibdeps:
--	dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
++override_dh_auto_clean:
++	/bin/sh $(CURDIR)/debian/bileto_pre_release_hook
++	dh_auto_clean
 === modified file 'include/CMakeLists.txt'
 --- include/CMakeLists.txt	2016-03-30 19:19:19 +0000
 +++ include/CMakeLists.txt	2016-11-18 23:50:42 +0000
@@ -4,5 +4,5 @@
  install(
      DIRECTORY messaging
--    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/messaging-fw
++    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/messaging-framework${API_VERSION}
+ )
 === modified file 'src/CMakeLists.txt'
 --- src/CMakeLists.txt	2016-11-03 16:27:45 +0000
 +++ src/CMakeLists.txt	2016-11-18 23:50:42 +0000
@@ -57,24 +57,25 @@
      messaging/runner.cpp
+ )
--# The general messaging-fw shared library.
++# The general messaging-framework shared library.
  add_library(
--    messaging-fw SHARED
++    messaging-framework SHARED
      ${MESSAGING_FW_MOCS}
      ${MESSAGING_FW_SRCS}
+ )
  set_target_properties(
--    messaging-fw
++    messaging-framework
      PROPERTIES
--    VERSION ${SO_VERSION_MAJOR}.${SO_VERSION_MINOR}.${SO_VERSION_PATCH}
--    SOVERSION ${SO_VERSION_MAJOR}
++    OUTPUT_NAME "messaging-framework${API_VERSION}"
++    VERSION ${LIB_VERSION}
++    SOVERSION ${SO_VERSION}
+ )
  target_link_libraries(
--    messaging-fw
++    messaging-framework
      ${Boost_LIBRARIES}
      ${CMAKE_THREAD_LIBS_INIT}
@@ -93,15 +94,15 @@
      dl)
  install(
--    TARGETS messaging-fw
++    TARGETS messaging-framework
      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
--# messaging-fw-runner is the standalone executable for executing
++# messaging-framework-runner is the standalone executable for executing
  # a given messaging::Connector.
--add_executable(messaging-fw-runner messaging/runner_main.cpp)
++add_executable(messaging-framework-runner messaging/runner_main.cpp)
  # We keep the Runner::main symbol evolvable by putting it into the main so.
--target_link_libraries(messaging-fw-runner messaging-fw ${TP_QT5_LDFLAGS})
++target_link_libraries(messaging-framework-runner messaging-framework ${TP_QT5_LDFLAGS})
  # We install the runner to the libdir as it is not meant to be run by a user.
  install(
--    TARGETS messaging-fw-runner
++    TARGETS messaging-framework-runner
      RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR})
 === modified file 'tests/CMakeLists.txt'
 --- tests/CMakeLists.txt	2016-06-07 18:15:24 +0000
 +++ tests/CMakeLists.txt	2016-11-18 23:50:42 +0000
@@ -44,6 +44,6 @@
  file(GLOB_RECURSE TEST_H_FILES *.h)
  add_custom_target(test_dot_h_files ALL SOURCES ${TEST_H_FILES})
--target_link_libraries(testing-mocks messaging-fw gmock gmock_main)
++target_link_libraries(testing-mocks messaging-framework gmock gmock_main)
  add_subdirectory(unit)
 === modified file 'tests/unit/messaging/CMakeLists.txt'
 --- tests/unit/messaging/CMakeLists.txt	2016-08-16 16:31:31 +0000
 +++ tests/unit/messaging/CMakeLists.txt	2016-11-18 23:50:42 +0000
@@ -46,7 +46,7 @@
      testing-framework
      testing-mocks
--    messaging-fw
++    messaging-framework
      gmock
      gmock_main
 === added directory 'tools'
 === added file 'tools/CMakeLists.txt'
 --- tools/CMakeLists.txt	1970-01-01 00:00:00 +0000
 +++ tools/CMakeLists.txt	2016-11-18 23:50:42 +0000
@@ -0,0 +1,4 @@
++# make the .sh files visible on qtcreator
++file(GLOB_RECURSE SH_FILES *.sh)
++add_custom_target(dot_sh_files ALL SOURCES ${SH_FILES})
++
 === added file 'tools/get_soversion.sh'
 --- tools/get_soversion.sh	1970-01-01 00:00:00 +0000
 +++ tools/get_soversion.sh	2016-11-18 23:50:42 +0000
@@ -0,0 +1,44 @@
++#!/bin/sh
++# Copyright (C) 2016 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/>.
++#
++# Authors: James Henstridge <james.henstridge@canonical.com>
++
++set -eu
++
++[ -n "${SERIES:-}" ] || SERIES=$(lsb_release -c -s)
++
++case "$SERIES" in
++    trusty)
++        # TODO: the CI systems are running Trusty, so don't bomb out
++        # when they try to build the source package.
++        echo 0
++        ;;
++    vivid)
++        # Old C++11 ABI, Boost 1.55
++        echo 0
++        ;;
++    xenial)
++        # New C++11 ABI, Boost 1.58
++        echo 1
++        ;;
++    yakkety|zesty)
++        # New C++11 ABI, Boost 1.61
++        echo 2
++        ;;
++    *)
++        echo "Unknown distro series $SERIES" >&2
++        exit 1
++        ;;
++esac