Merge lp:~ken-vandine/messaging-framework/packaging_cleanup into lp:messaging-framework

Proposed by Ken VanDine on 2016-11-03
Status: Merged
Approved by: Roberto Mier Escandón  on 2016-11-11
Approved revision: 76
Merged at revision: 71
Proposed branch: lp:~ken-vandine/messaging-framework/packaging_cleanup
Merge into: lp:messaging-framework
Diff against target: 126 lines (+38/-12)
7 files modified
debian/control (+12/-9)
debian/libmessaging-fw-dev.install (+1/-0)
debian/libmessaging-fw1.install (+1/-1)
debian/source/format (+0/-1)
src/CMakeLists.txt (+8/-0)
src/utils.cpp (+0/-1)
tests/mock_group_starter.h (+16/-0)
To merge this branch: bzr merge lp:~ken-vandine/messaging-framework/packaging_cleanup
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Needs Fixing on 2016-11-09
Gustavo Pichorim Boiko (community) Approve on 2016-11-07
Roberto Mier Escandón  (community) 2016-11-03 Approve on 2016-11-07
Review via email: mp+309971@code.launchpad.net

Commit message

Packaging related fixes

Description of the change

Some packaging cleanup

To post a comment you must log in.

FAILED: Continuous integration, rev:75
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-ci/92/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1929/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1930
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1769
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1769/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1769
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1769/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1769
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1769/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1769
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1769/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1769/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1769
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1769/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1769
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1769/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1769
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1769/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1769
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1769/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

FAILED: Continuous integration, rev:76
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-ci/93/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1930/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1931
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1770
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1770/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1770
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1770/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1770
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1770/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1770
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1770/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1770/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1770
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1770/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1770
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1770/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1770
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1770/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1770
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1770/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

LGTM

review: Approve

FAILED: Autolanding.
More details in the following jenkins job:
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-autoland/39/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1938/console
    None: https://jenkins.canonical.com/system-apps/job/lp-generic-land-mp/56/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1939
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1778
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1778/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1778
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1778/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1778
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1778/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1778
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1778/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1778/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1778
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1778/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1778
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1778/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1778
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1778/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1778
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1778/artifact/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)
Gustavo Pichorim Boiko (boiko) wrote :

Looks good! Thanks for the fixes!

review: Approve

FAILED: Autolanding.
More details in the following jenkins job:
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-autoland/40/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1939/console
    None: https://jenkins.canonical.com/system-apps/job/lp-generic-land-mp/57/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1940
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1779
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1779/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1779
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1779/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1779
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1779/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1779
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1779/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1779/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1779
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1779/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1779
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1779/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1779
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1779/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1779
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1779/artifact/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

FAILED: Autolanding.
More details in the following jenkins job:
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-autoland/41/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1951/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1952
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1791
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1791/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1791
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1791/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1791
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1791/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1791
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1791/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1791
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1791/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1791
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1791/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1791
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1791/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1791
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1791/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1791/console

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2016-07-08 08:25:39 +0000
3+++ debian/control 2016-11-03 16:28:03 +0000
4@@ -1,9 +1,10 @@
5 Source: messaging-framework
6+Section: libs
7 Priority: optional
8 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
9 Build-Depends: astyle,
10+ clang-format-3.5:native,
11 clang:native,
12- clang-format-3.5:native,
13 cmake,
14 debhelper (>= 9),
15 dos2unix,
16@@ -18,29 +19,31 @@
17 libboost-system-dev,
18 libdbus-cpp-dev,
19 libgoogle-glog-dev,
20+ libphonenumber-dev,
21 libprocess-cpp-dev,
22+ libsystemd-dev,
23 libtelepathy-qt5-dev,
24- libphonenumber-dev,
25 pkg-config,
26 qtbase5-dev,
27 qtpim5-dev,
28- telepathy-mission-control-5,
29- libsystemd-dev
30-Standards-Version: 3.9.5
31-Section: libs
32+ telepathy-mission-control-5
33+Standards-Version: 3.9.7
34 Homepage: https://launchpad.net/messaging-framework
35 Vcs-Bzr: https://code.launchpad.net/~phablet-team/messaging-framework/trunk
36
37 Package: libmessaging-fw-dev
38 Section: libdevel
39 Architecture: any
40-Depends: libmessaging-fw (= ${binary:Version})
41+Multi-Arch: same
42+Depends: libmessaging-fw1 (= ${binary:Version}), ${misc:Depends}
43 Description: Ubuntu Messaging Framework header files
44+ All the development headers and libraries for the Messaging Framework
45
46-Package: libmessaging-fw
47+Package: libmessaging-fw1
48 Section: libs
49 Architecture: any
50-Depends: ${shlibs:Depends}, ${misc:Depends}
51+Multi-Arch: same
52+Depends: ${misc:Depends}, ${shlibs:Depends}
53 Description: Ubuntu Messaging Framework to build IM plugins
54 This layer communicates third party plugins with systems like
55 telepathy allowing changing the system by other without having
56
57=== modified file 'debian/libmessaging-fw-dev.install'
58--- debian/libmessaging-fw-dev.install 2016-03-30 19:19:19 +0000
59+++ debian/libmessaging-fw-dev.install 2016-11-03 16:28:03 +0000
60@@ -1,2 +1,3 @@
61 usr/include/messaging-fw/*
62+usr/lib/*/libmessaging-fw*.so
63 usr/lib/*/pkgconfig/messaging-fw.pc
64
65=== renamed file 'debian/libmessaging-fw.install' => 'debian/libmessaging-fw1.install'
66--- debian/libmessaging-fw.install 2016-03-30 19:19:19 +0000
67+++ debian/libmessaging-fw1.install 2016-11-03 16:28:03 +0000
68@@ -1,2 +1,2 @@
69-usr/lib/*/libmessaging-fw*.so*
70+usr/lib/*/libmessaging-fw*.so.*
71 usr/lib/*/messaging-fw-runner
72
73=== removed directory 'debian/source'
74=== removed file 'debian/source/format'
75--- debian/source/format 2016-06-23 05:48:49 +0000
76+++ debian/source/format 1970-01-01 00:00:00 +0000
77@@ -1,1 +0,0 @@
78-3.0 (native)
79
80=== modified file 'src/CMakeLists.txt'
81--- src/CMakeLists.txt 2016-09-17 21:42:07 +0000
82+++ src/CMakeLists.txt 2016-11-03 16:28:03 +0000
83@@ -65,6 +65,14 @@
84 ${MESSAGING_FW_SRCS}
85 )
86
87+set_target_properties(
88+ messaging-fw
89+
90+ PROPERTIES
91+ VERSION ${SO_VERSION_MAJOR}.${SO_VERSION_MINOR}.${SO_VERSION_PATCH}
92+ SOVERSION ${SO_VERSION_MAJOR}
93+)
94+
95 target_link_libraries(
96 messaging-fw
97
98
99=== removed file 'src/utils.cpp'
100--- src/utils.cpp 2016-05-30 16:43:03 +0000
101+++ src/utils.cpp 1970-01-01 00:00:00 +0000
102@@ -1,1 +0,0 @@
103-
104
105=== modified file 'tests/mock_group_starter.h'
106--- tests/mock_group_starter.h 2016-09-28 12:26:21 +0000
107+++ tests/mock_group_starter.h 2016-11-03 16:28:03 +0000
108@@ -1,3 +1,19 @@
109+/*
110+ * Copyright © 2016 Canonical Ltd.
111+ *
112+ * This program is free software: you can redistribute it and/or modify it
113+ * under the terms of the GNU Lesser General Public License version 3,
114+ * as published by the Free Software Foundation.
115+ *
116+ * This program is distributed in the hope that it will be useful,
117+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
118+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
119+ * GNU Lesser General Public License for more details.
120+ *
121+ * You should have received a copy of the GNU Lesser General Public License
122+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
123+ */
124+
125 #ifndef TESTING_MOCK_GROUP_STARTER_H
126 #define TESTING_MOCK_GROUP_STARTER_H
127

Subscribers

People subscribed via source and target branches