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
1
Source: messaging-framework
1
Source: messaging-framework
6
2
Section: libs
7
2
Priority: optional
3
Priority: optional
8
3
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
4
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
9
4
Build-Depends: astyle,
5
Build-Depends: astyle,
10
6
               clang-format-3.5:native,
11
5
               clang:native,
7
               clang:native,
12
6
               clang-format-3.5:native,
13
7
               cmake,
8
               cmake,
14
8
               debhelper (>= 9),
9
               debhelper (>= 9),
15
9
               dos2unix,
10
               dos2unix,
16
@@ -18,29 +19,31 @@
17
18
               libboost-system-dev,
19
               libboost-system-dev,
18
19
               libdbus-cpp-dev,
20
               libdbus-cpp-dev,
19
20
               libgoogle-glog-dev,
21
               libgoogle-glog-dev,
20
22
               libphonenumber-dev,
21
21
               libprocess-cpp-dev,
23
               libprocess-cpp-dev,
22
24
               libsystemd-dev,
23
22
               libtelepathy-qt5-dev,
25
               libtelepathy-qt5-dev,
24
23
               libphonenumber-dev,
25
24
               pkg-config,
26
               pkg-config,
26
25
               qtbase5-dev,
27
               qtbase5-dev,
27
26
               qtpim5-dev,
28
               qtpim5-dev,
32
27
               telepathy-mission-control-5,
29
               telepathy-mission-control-5
33
28
	       libsystemd-dev
30
Standards-Version: 3.9.7
30
29
Standards-Version: 3.9.5
31
30
Section: libs
34
31
Homepage: https://launchpad.net/messaging-framework
31
Homepage: https://launchpad.net/messaging-framework
35
32
Vcs-Bzr: https://code.launchpad.net/~phablet-team/messaging-framework/trunk
32
Vcs-Bzr: https://code.launchpad.net/~phablet-team/messaging-framework/trunk
36
33
33
37
34
Package: libmessaging-fw-dev
34
Package: libmessaging-fw-dev
38
35
Section: libdevel
35
Section: libdevel
39
36
Architecture: any
36
Architecture: any
41
37
Depends: libmessaging-fw (= ${binary:Version})
37
Multi-Arch: same
42
38
Depends: libmessaging-fw1 (= ${binary:Version}), ${misc:Depends}
43
38
Description: Ubuntu Messaging Framework header files
39
Description: Ubuntu Messaging Framework header files
44
40
 All the development headers and libraries for the Messaging Framework
45
39
41
47
40
Package: libmessaging-fw
42
Package: libmessaging-fw1
48
41
Section: libs
43
Section: libs
49
42
Architecture: any
44
Architecture: any
51
43
Depends: ${shlibs:Depends}, ${misc:Depends}
45
Multi-Arch: same
52
46
Depends: ${misc:Depends}, ${shlibs:Depends}
53
44
Description: Ubuntu Messaging Framework to build IM plugins
47
Description: Ubuntu Messaging Framework to build IM plugins
54
45
 This layer communicates third party plugins with systems like
48
 This layer communicates third party plugins with systems like
55
46
 telepathy allowing changing the system by other without having
49
 telepathy allowing changing the system by other without having
56
47
50
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
1
usr/include/messaging-fw/*
1
usr/include/messaging-fw/*
62
2
usr/lib/*/libmessaging-fw*.so
63
2
usr/lib/*/pkgconfig/messaging-fw.pc
3
usr/lib/*/pkgconfig/messaging-fw.pc
64
3
4
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 @@
70
1
usr/lib/*/libmessaging-fw*.so*
1
usr/lib/*/libmessaging-fw*.so.*
71
2
usr/lib/*/messaging-fw-runner
2
usr/lib/*/messaging-fw-runner
72
3
3
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
1
3.0 (native)
79
2
0
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
65
    ${MESSAGING_FW_SRCS}
65
    ${MESSAGING_FW_SRCS}
85
66
)
66
)
86
67
67
87
68
set_target_properties(
88
69
    messaging-fw
89
70
90
71
    PROPERTIES
91
72
    VERSION ${SO_VERSION_MAJOR}.${SO_VERSION_MINOR}.${SO_VERSION_PATCH}
92
73
    SOVERSION ${SO_VERSION_MAJOR}
93
74
)
94
75
95
68
target_link_libraries(
76
target_link_libraries(
96
69
    messaging-fw
77
    messaging-fw
97
70
78
98
71
79
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
1
104
2
0
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
1
/*
110
2
 * Copyright © 2016 Canonical Ltd.
111
3
 *
112
4
 * This program is free software: you can redistribute it and/or modify it
113
5
 * under the terms of the GNU Lesser General Public License version 3,
114
6
 * as published by the Free Software Foundation.
115
7
 *
116
8
 * This program is distributed in the hope that it will be useful,
117
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
118
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
119
11
 * GNU Lesser General Public License for more details.
120
12
 *
121
13
 * You should have received a copy of the GNU Lesser General Public License
122
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
123
15
 */
124
16
125
1
#ifndef TESTING_MOCK_GROUP_STARTER_H
17
#ifndef TESTING_MOCK_GROUP_STARTER_H
126
2
#define TESTING_MOCK_GROUP_STARTER_H
18
#define TESTING_MOCK_GROUP_STARTER_H
127
3
19
Status:	Merged
Approved by:	Roberto Mier Escandon 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
Related bugs:	Link a bug report
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 Escandon (community)		2016-11-03	Approve on 2016-11-07
Review via email: mp+309971@code.launchpad.net