Merge lp:~sergiusens/media-hub/packaging into lp:media-hub
- packaging
- Merge into trunk
Status: | Merged |
---|---|
Merged at revision: | 27 |
Proposed branch: | lp:~sergiusens/media-hub/packaging |
Merge into: | lp:media-hub |
Diff against target: |
255 lines (+100/-54) 11 files modified
debian/changelog (+6/-24) debian/control (+51/-26) debian/copyright (+2/-2) debian/libmedia-hub-client0.install (+1/-0) debian/libmedia-hub-common0.install (+1/-2) debian/libmedia-hub-common0.symbols (+26/-0) debian/libmedia-hub-doc.lintian-overrides (+1/-0) debian/media-hub.conf (+6/-0) debian/media-hub.install (+2/-0) debian/media-hub.lintian-overrides (+1/-0) debian/rules (+3/-0) |
To merge this branch: | bzr merge lp:~sergiusens/media-hub/packaging |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Approve | |
Jim Hodapp | Pending | ||
Łukasz Zemczak | Pending | ||
Review via email:
|
This proposal supersedes a proposal from 2014-03-26.
Commit message
Package polish
Description of the change
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal | # |
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal | # |
PASSED: Continuous integration, rev:28
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:29
http://
Executed test runs:
SUCCESS: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:30
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:30
http://
Executed test runs:
SUCCESS: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal | # |
PASSED: Continuous integration, rev:31
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Sergio Schvezov (sergiusens) wrote : Posted in a previous version of this proposal | # |
Keep in mind that the diff doesn't fit anymore.
I tried creating a consolidated symbols file (with pkgkde-
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal | # |
PASSED: Continuous integration, rev:32
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Jim Hodapp (jhodapp) wrote : Posted in a previous version of this proposal | # |
Looks good, thanks for updating this.
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Łukasz Zemczak (sil2100) wrote : Posted in a previous version of this proposal | # |
Ok, from a quick glance review:
* debian/copyright has an invalid Upstream-Name: and Source: fields (still pointing at music-hub)
* debian/*symbols:
I would really opt for demangled symbol names, as this is C++. This way even a very very small toolchain change might break the symbols files. So please use the demangled notation for C++ symbols.
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Łukasz Zemczak (sil2100) wrote : Posted in a previous version of this proposal | # |
I also see that as the symbols files are really big, I guess there are some symbols exported that would not be required. This is sadly the default behaviour of g++ - we can work around that with export symbol maps (also called LD Version Scripts [1]). This way we can say the linker which symbols are relevant. I guess some upstream help would be needed here!
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:34
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:33
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:33
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:35
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
- 36. By Sergio Schvezov
-
Adding hybris build-dep
Preview Diff
1 | === modified file 'debian/changelog' |
2 | --- debian/changelog 2013-09-05 04:54:12 +0000 |
3 | +++ debian/changelog 2014-03-26 20:19:25 +0000 |
4 | @@ -1,24 +1,6 @@ |
5 | -music-hub (0.0+13.10.20130905-0ubuntu1) saucy; urgency=low |
6 | - |
7 | - [ David Henningsson ] |
8 | - * Merged "missing stop method" and "add missing c'tor". |
9 | - |
10 | - [ Ubuntu daily release ] |
11 | - * Automatic snapshot from revision 7 |
12 | - |
13 | - -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 05 Sep 2013 04:54:12 +0000 |
14 | - |
15 | -music-hub (0.0+13.10.20130823-0ubuntu1) saucy; urgency=low |
16 | - |
17 | - [ Thomas Voß ] |
18 | - * Initial release. |
19 | - |
20 | - [ Timo Jyrinki ] |
21 | - * Automatic snapshot from revision 2 (bootstrap) |
22 | - * Add COPYING, enable multi-arch and add missing copyright header. |
23 | - * Final tweaks to the packaging. |
24 | - |
25 | - [ Ubuntu daily release ] |
26 | - * Automatic snapshot from revision 5 |
27 | - |
28 | - -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 23 Aug 2013 11:14:28 +0000 |
29 | +media-hub (0.0.1-0ubuntu1) UNRELEASED; urgency=medium |
30 | + |
31 | + * Repackaging from original music-hub. |
32 | + * Polishing packaging. |
33 | + |
34 | + -- Sergio Schvezov <sergio.schvezov@canonical.com> Thu, 06 Mar 2014 16:32:48 -0300 |
35 | |
36 | === modified file 'debian/control' |
37 | --- debian/control 2014-02-14 08:12:35 +0000 |
38 | +++ debian/control 2014-03-26 20:19:25 +0000 |
39 | @@ -1,9 +1,8 @@ |
40 | -Source: music-hub |
41 | +Source: media-hub |
42 | Priority: optional |
43 | Section: libs |
44 | Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> |
45 | Build-Depends: cmake, |
46 | - dbus-cpp-dev, |
47 | dbus-test-runner, |
48 | debhelper (>= 9), |
49 | doxygen, |
50 | @@ -18,52 +17,78 @@ |
51 | libboost-program-options-dev (>=1.53), |
52 | libboost-system-dev (>=1.53), |
53 | libdbus-1-dev, |
54 | + libdbus-cpp-dev, |
55 | libgoogle-glog-dev, |
56 | + libhybris-dev (>=0.1.0+git20131207+e452e83-0ubuntu13), |
57 | libprocess-cpp-dev, |
58 | libproperties-cpp-dev, |
59 | gstreamer1.0-libav, |
60 | libgstreamer1.0-dev, |
61 | pkg-config, |
62 | -Standards-Version: 3.9.4 |
63 | -Homepage: https://launchpad.net/music-hub |
64 | +Standards-Version: 3.9.5 |
65 | +Homepage: https://launchpad.net/media-hub |
66 | # If you aren't a member of ~phablet-team but need to upload packaging changes, |
67 | # just go ahead. ~phablet-team will notice and sync up the code again. |
68 | -Vcs-Bzr: https://code.launchpad.net/~phablet-team/music-hub/trunk |
69 | +Vcs-Bzr: https://code.launchpad.net/~phablet-team/media-hub/trunk |
70 | |
71 | -Package: libmusic-hub-dev |
72 | +Package: libmedia-hub-dev |
73 | Section: libdevel |
74 | Architecture: any |
75 | Multi-Arch: same |
76 | Pre-Depends: dpkg (>= 1.15.6~) |
77 | -Depends: libmusic-hub0 (= ${binary:Version}), |
78 | +Depends: libmedia-hub-common0 (= ${binary:Version}), |
79 | + libmedia-hub-client0 (= ${binary:Version}), |
80 | ${misc:Depends}, |
81 | -Suggests: libmusic-hub-doc |
82 | -Description: Simple and lightweight music playback service - development files |
83 | - Music Hub is a simple and lightweight service for music playback using |
84 | +Suggests: libmedia-hub-doc |
85 | +Description: Simple and lightweight media playback service - development files |
86 | + Media Hub is a simple and lightweight service for media playback using |
87 | DBus. |
88 | . |
89 | This package contains the development files. |
90 | |
91 | -Package: libmusic-hub0 |
92 | -Architecture: any |
93 | -Multi-Arch: same |
94 | -Pre-Depends: dpkg (>= 1.15.6~) |
95 | -Depends: ${misc:Depends}, |
96 | - ${shlibs:Depends}, |
97 | -Description: Simple and lightweight music playback service |
98 | - Music Hub is a simple and lightweight service for music playback using |
99 | - DBus. |
100 | - . |
101 | - This package contains the library itself. |
102 | - |
103 | -Package: libmusic-hub-doc |
104 | +Package: media-hub |
105 | +Architecture: any |
106 | +Pre-Depends: dpkg (>= 1.15.6~) |
107 | +Depends: ${misc:Depends}, |
108 | + ${shlibs:Depends}, |
109 | +Description: Simple and lightweight media playback service |
110 | + Media Hub is a simple and lightweight service for media playback using |
111 | + DBus. |
112 | + . |
113 | + This package contains the runtime. |
114 | + |
115 | +Package: libmedia-hub-common0 |
116 | +Architecture: any |
117 | +Multi-Arch: same |
118 | +Pre-Depends: dpkg (>= 1.15.6~) |
119 | +Depends: ${misc:Depends}, |
120 | + ${shlibs:Depends}, |
121 | +Description: Simple and lightweight media playback service |
122 | + Media Hub is a simple and lightweight service for media playback using |
123 | + DBus. |
124 | + . |
125 | + This package contains the common libraries. |
126 | + |
127 | +Package: libmedia-hub-client0 |
128 | +Architecture: any |
129 | +Multi-Arch: same |
130 | +Pre-Depends: dpkg (>= 1.15.6~) |
131 | +Depends: ${misc:Depends}, |
132 | + ${shlibs:Depends}, |
133 | +Description: Simple and lightweight media playback service |
134 | + Media Hub is a simple and lightweight service for media playback using |
135 | + DBus. |
136 | + . |
137 | + This package contains the client libraries. |
138 | + |
139 | +Package: libmedia-hub-doc |
140 | Section: doc |
141 | Architecture: all |
142 | Depends: ${misc:Depends}, |
143 | ${shlibs:Depends}, |
144 | -Recommends: libmusic-hub-dev |
145 | -Description: Simple and lightweight music playback service - documentation |
146 | - Music Hub is a simple and lightweight service for music playback using |
147 | +Recommends: libmedia-hub-dev |
148 | +Description: Simple and lightweight media playback service - documentation |
149 | + Media Hub is a simple and lightweight service for media playback using |
150 | DBus. |
151 | . |
152 | This package contains the documentation. |
153 | |
154 | === modified file 'debian/copyright' |
155 | --- debian/copyright 2013-08-14 20:10:09 +0000 |
156 | +++ debian/copyright 2014-03-26 20:19:25 +0000 |
157 | @@ -1,6 +1,6 @@ |
158 | Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ |
159 | -Upstream-Name: music-hub |
160 | -Source: https://launchpad.net/music-hub |
161 | +Upstream-Name: media-hub |
162 | +Source: https://launchpad.net/media-hub |
163 | |
164 | Files: * |
165 | Copyright: 2013 Canonical Ltd. |
166 | |
167 | === added file 'debian/libmedia-hub-client0.install' |
168 | --- debian/libmedia-hub-client0.install 1970-01-01 00:00:00 +0000 |
169 | +++ debian/libmedia-hub-client0.install 2014-03-26 20:19:25 +0000 |
170 | @@ -0,0 +1,1 @@ |
171 | +usr/lib/*/libmedia-hub-client.so.* |
172 | |
173 | === renamed file 'debian/libmusic-hub0.install' => 'debian/libmedia-hub-common0.install' |
174 | --- debian/libmusic-hub0.install 2014-02-13 17:24:46 +0000 |
175 | +++ debian/libmedia-hub-common0.install 2014-03-26 20:19:25 +0000 |
176 | @@ -1,2 +1,1 @@ |
177 | -usr/lib/*/lib*.so.* |
178 | -usr/bin/* |
179 | +usr/lib/*/libmedia-hub-common.so.* |
180 | |
181 | === added file 'debian/libmedia-hub-common0.symbols' |
182 | --- debian/libmedia-hub-common0.symbols 1970-01-01 00:00:00 +0000 |
183 | +++ debian/libmedia-hub-common0.symbols 2014-03-26 20:19:25 +0000 |
184 | @@ -0,0 +1,26 @@ |
185 | +libmedia-hub-common.so.0 libmedia-hub-common0 #MINVER# |
186 | + (c++)"the_session_bus()@Base" 0.0.1 |
187 | + (c++)"std::shared_ptr<core::dbus::Bus>::~shared_ptr()@Base" 0.0.1 |
188 | + (c++)"std::shared_ptr<core::dbus::Bus>::~shared_ptr()@Base" 0.0.1 |
189 | + (c++)"std::shared_ptr<core::dbus::Executor>::~shared_ptr()@Base" 0.0.1 |
190 | + (c++)"std::shared_ptr<core::dbus::Executor>::~shared_ptr()@Base" 0.0.1 |
191 | + (c++)"std::_Sp_counted_base<(__gnu_cxx::_Lock_policy)2>::_M_destroy()@Base" 0.0.1 |
192 | + (c++)"std::_Sp_counted_base<(__gnu_cxx::_Lock_policy)2>::~_Sp_counted_base()@Base" 0.0.1 |
193 | + (c++)"std::_Sp_counted_base<(__gnu_cxx::_Lock_policy)2>::~_Sp_counted_base()@Base" 0.0.1 |
194 | + (c++)"std::_Sp_counted_base<(__gnu_cxx::_Lock_policy)2>::~_Sp_counted_base()@Base" 0.0.1 |
195 | + (c++)"std::_Sp_counted_ptr_inplace<core::dbus::Bus, std::allocator<core::dbus::Bus>, (__gnu_cxx::_Lock_policy)2>::_M_destroy()@Base" 0.0.1 |
196 | + (c++)"std::_Sp_counted_ptr_inplace<core::dbus::Bus, std::allocator<core::dbus::Bus>, (__gnu_cxx::_Lock_policy)2>::_M_dispose()@Base" 0.0.1 |
197 | + (c++)"std::_Sp_counted_ptr_inplace<core::dbus::Bus, std::allocator<core::dbus::Bus>, (__gnu_cxx::_Lock_policy)2>::_M_get_deleter(std::type_info const&)@Base" 0.0.1 |
198 | + (c++)"std::_Sp_counted_ptr_inplace<core::dbus::Bus, std::allocator<core::dbus::Bus>, (__gnu_cxx::_Lock_policy)2>::~_Sp_counted_ptr_inplace()@Base" 0.0.1 |
199 | + (c++)"std::_Sp_counted_ptr_inplace<core::dbus::Bus, std::allocator<core::dbus::Bus>, (__gnu_cxx::_Lock_policy)2>::~_Sp_counted_ptr_inplace()@Base" 0.0.1 |
200 | + (c++)"std::_Sp_counted_ptr_inplace<core::dbus::Bus, std::allocator<core::dbus::Bus>, (__gnu_cxx::_Lock_policy)2>::~_Sp_counted_ptr_inplace()@Base" 0.0.1 |
201 | + (c++)"typeinfo for std::_Mutex_base<(__gnu_cxx::_Lock_policy)2>@Base" 0.0.1 |
202 | + (c++)"typeinfo for std::_Sp_counted_base<(__gnu_cxx::_Lock_policy)2>@Base" 0.0.1 |
203 | + (c++)"typeinfo for std::_Sp_make_shared_tag@Base" 0.0.1 |
204 | + (c++)"typeinfo for std::_Sp_counted_ptr_inplace<core::dbus::Bus, std::allocator<core::dbus::Bus>, (__gnu_cxx::_Lock_policy)2>@Base" 0.0.1 |
205 | + (c++)"typeinfo name for std::_Mutex_base<(__gnu_cxx::_Lock_policy)2>@Base" 0.0.1 |
206 | + (c++)"typeinfo name for std::_Sp_counted_base<(__gnu_cxx::_Lock_policy)2>@Base" 0.0.1 |
207 | + (c++)"typeinfo name for std::_Sp_make_shared_tag@Base" 0.0.1 |
208 | + (c++)"typeinfo name for std::_Sp_counted_ptr_inplace<core::dbus::Bus, std::allocator<core::dbus::Bus>, (__gnu_cxx::_Lock_policy)2>@Base" 0.0.1 |
209 | + (c++)"vtable for std::_Sp_counted_base<(__gnu_cxx::_Lock_policy)2>@Base" 0.0.1 |
210 | + (c++)"vtable for std::_Sp_counted_ptr_inplace<core::dbus::Bus, std::allocator<core::dbus::Bus>, (__gnu_cxx::_Lock_policy)2>@Base" 0.0.1 |
211 | |
212 | === renamed file 'debian/libmusic-hub-dev.install' => 'debian/libmedia-hub-dev.install' |
213 | === renamed file 'debian/libmusic-hub-doc.install' => 'debian/libmedia-hub-doc.install' |
214 | === added file 'debian/libmedia-hub-doc.lintian-overrides' |
215 | --- debian/libmedia-hub-doc.lintian-overrides 1970-01-01 00:00:00 +0000 |
216 | +++ debian/libmedia-hub-doc.lintian-overrides 2014-03-26 20:19:25 +0000 |
217 | @@ -0,0 +1,1 @@ |
218 | +libmedia-hub-doc: embedded-javascript-library |
219 | |
220 | === added file 'debian/media-hub.conf' |
221 | --- debian/media-hub.conf 1970-01-01 00:00:00 +0000 |
222 | +++ debian/media-hub.conf 2014-03-26 20:19:25 +0000 |
223 | @@ -0,0 +1,6 @@ |
224 | +description "Starts the media-hub service" |
225 | + |
226 | +start on dbus |
227 | +stop on runlevel [06] |
228 | + |
229 | +exec media-hub-server |
230 | |
231 | === added file 'debian/media-hub.install' |
232 | --- debian/media-hub.install 1970-01-01 00:00:00 +0000 |
233 | +++ debian/media-hub.install 2014-03-26 20:19:25 +0000 |
234 | @@ -0,0 +1,2 @@ |
235 | +debian/media-hub.conf /usr/share/upstart/sessions/ |
236 | +usr/bin |
237 | |
238 | === added file 'debian/media-hub.lintian-overrides' |
239 | --- debian/media-hub.lintian-overrides 1970-01-01 00:00:00 +0000 |
240 | +++ debian/media-hub.lintian-overrides 2014-03-26 20:19:25 +0000 |
241 | @@ -0,0 +1,1 @@ |
242 | +media-hub: binary-without-manpage |
243 | |
244 | === modified file 'debian/rules' |
245 | --- debian/rules 2014-02-13 17:24:46 +0000 |
246 | +++ debian/rules 2014-03-26 20:19:25 +0000 |
247 | @@ -1,6 +1,9 @@ |
248 | #!/usr/bin/make -f |
249 | # -*- makefile -*- |
250 | |
251 | +# Uncomment this to turn on verbose mode. |
252 | +# export DH_VERBOSE=1 |
253 | + |
254 | export CC=gcc-4.7 |
255 | export CXX=g++-4.7 |
256 |
PASSED: Continuous integration, rev:27 jenkins. qa.ubuntu. com/job/ media-hub- ci/21/ jenkins. qa.ubuntu. com/job/ media-hub- trusty- amd64-ci/ 22 jenkins. qa.ubuntu. com/job/ media-hub- trusty- armhf-ci/ 21 jenkins. qa.ubuntu. com/job/ media-hub- trusty- armhf-ci/ 21/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ media-hub- trusty- i386-ci/ 21
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/media- hub-ci/ 21/rebuild
http://