Merge lp:~sergiusens/media-hub/packaging into lp:media-hub

Proposed by Sergio Schvezov
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
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Jim Hodapp Pending
Łukasz Zemczak Pending
Review via email: mp+212921@code.launchpad.net

This proposal supersedes a proposal from 2014-03-26.

Commit message

Package polish

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Approve (continuous-integration)
Revision history for this message
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-symbolshelper) but the build failed after doing that locally so I opted to just split it per arch.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Approve (continuous-integration)
Revision history for this message
Jim Hodapp (jhodapp) wrote : Posted in a previous version of this proposal

Looks good, thanks for updating this.

review: Approve
Revision history for this message
Ł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.

review: Needs Fixing
Revision history for this message
Ł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!

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
lp:~sergiusens/media-hub/packaging updated
36. By Sergio Schvezov

Adding hybris build-dep

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2013-09-05 04:54:12 +0000
+++ debian/changelog 2014-03-26 20:19:25 +0000
@@ -1,24 +1,6 @@
1music-hub (0.0+13.10.20130905-0ubuntu1) saucy; urgency=low1media-hub (0.0.1-0ubuntu1) UNRELEASED; urgency=medium
22
3 [ David Henningsson ]3 * Repackaging from original music-hub.
4 * Merged "missing stop method" and "add missing c'tor".4 * Polishing packaging.
55
6 [ Ubuntu daily release ]6 -- Sergio Schvezov <sergio.schvezov@canonical.com> Thu, 06 Mar 2014 16:32:48 -0300
7 * Automatic snapshot from revision 7
8
9 -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 05 Sep 2013 04:54:12 +0000
10
11music-hub (0.0+13.10.20130823-0ubuntu1) saucy; urgency=low
12
13 [ Thomas Voß ]
14 * Initial release.
15
16 [ Timo Jyrinki ]
17 * Automatic snapshot from revision 2 (bootstrap)
18 * Add COPYING, enable multi-arch and add missing copyright header.
19 * Final tweaks to the packaging.
20
21 [ Ubuntu daily release ]
22 * Automatic snapshot from revision 5
23
24 -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 23 Aug 2013 11:14:28 +0000
257
=== modified file 'debian/control'
--- debian/control 2014-02-14 08:12:35 +0000
+++ debian/control 2014-03-26 20:19:25 +0000
@@ -1,9 +1,8 @@
1Source: music-hub1Source: media-hub
2Priority: optional2Priority: optional
3Section: libs3Section: libs
4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5Build-Depends: cmake,5Build-Depends: cmake,
6 dbus-cpp-dev,
7 dbus-test-runner,6 dbus-test-runner,
8 debhelper (>= 9),7 debhelper (>= 9),
9 doxygen,8 doxygen,
@@ -18,52 +17,78 @@
18 libboost-program-options-dev (>=1.53),17 libboost-program-options-dev (>=1.53),
19 libboost-system-dev (>=1.53),18 libboost-system-dev (>=1.53),
20 libdbus-1-dev,19 libdbus-1-dev,
20 libdbus-cpp-dev,
21 libgoogle-glog-dev,21 libgoogle-glog-dev,
22 libhybris-dev (>=0.1.0+git20131207+e452e83-0ubuntu13),
22 libprocess-cpp-dev,23 libprocess-cpp-dev,
23 libproperties-cpp-dev,24 libproperties-cpp-dev,
24 gstreamer1.0-libav,25 gstreamer1.0-libav,
25 libgstreamer1.0-dev,26 libgstreamer1.0-dev,
26 pkg-config,27 pkg-config,
27Standards-Version: 3.9.428Standards-Version: 3.9.5
28Homepage: https://launchpad.net/music-hub29Homepage: https://launchpad.net/media-hub
29# If you aren't a member of ~phablet-team but need to upload packaging changes,30# If you aren't a member of ~phablet-team but need to upload packaging changes,
30# just go ahead. ~phablet-team will notice and sync up the code again.31# just go ahead. ~phablet-team will notice and sync up the code again.
31Vcs-Bzr: https://code.launchpad.net/~phablet-team/music-hub/trunk32Vcs-Bzr: https://code.launchpad.net/~phablet-team/media-hub/trunk
3233
33Package: libmusic-hub-dev34Package: libmedia-hub-dev
34Section: libdevel35Section: libdevel
35Architecture: any36Architecture: any
36Multi-Arch: same37Multi-Arch: same
37Pre-Depends: dpkg (>= 1.15.6~)38Pre-Depends: dpkg (>= 1.15.6~)
38Depends: libmusic-hub0 (= ${binary:Version}),39Depends: libmedia-hub-common0 (= ${binary:Version}),
40 libmedia-hub-client0 (= ${binary:Version}),
39 ${misc:Depends},41 ${misc:Depends},
40Suggests: libmusic-hub-doc42Suggests: libmedia-hub-doc
41Description: Simple and lightweight music playback service - development files43Description: Simple and lightweight media playback service - development files
42 Music Hub is a simple and lightweight service for music playback using44 Media Hub is a simple and lightweight service for media playback using
43 DBus.45 DBus.
44 .46 .
45 This package contains the development files.47 This package contains the development files.
4648
47Package: libmusic-hub049Package: media-hub
48Architecture: any50Architecture: any
49Multi-Arch: same51Pre-Depends: dpkg (>= 1.15.6~)
50Pre-Depends: dpkg (>= 1.15.6~)52Depends: ${misc:Depends},
51Depends: ${misc:Depends},53 ${shlibs:Depends},
52 ${shlibs:Depends},54Description: Simple and lightweight media playback service
53Description: Simple and lightweight music playback service55 Media Hub is a simple and lightweight service for media playback using
54 Music Hub is a simple and lightweight service for music playback using56 DBus.
55 DBus.57 .
56 .58 This package contains the runtime.
57 This package contains the library itself.59
5860Package: libmedia-hub-common0
59Package: libmusic-hub-doc61Architecture: any
62Multi-Arch: same
63Pre-Depends: dpkg (>= 1.15.6~)
64Depends: ${misc:Depends},
65 ${shlibs:Depends},
66Description: Simple and lightweight media playback service
67 Media Hub is a simple and lightweight service for media playback using
68 DBus.
69 .
70 This package contains the common libraries.
71
72Package: libmedia-hub-client0
73Architecture: any
74Multi-Arch: same
75Pre-Depends: dpkg (>= 1.15.6~)
76Depends: ${misc:Depends},
77 ${shlibs:Depends},
78Description: Simple and lightweight media playback service
79 Media Hub is a simple and lightweight service for media playback using
80 DBus.
81 .
82 This package contains the client libraries.
83
84Package: libmedia-hub-doc
60Section: doc85Section: doc
61Architecture: all86Architecture: all
62Depends: ${misc:Depends},87Depends: ${misc:Depends},
63 ${shlibs:Depends},88 ${shlibs:Depends},
64Recommends: libmusic-hub-dev89Recommends: libmedia-hub-dev
65Description: Simple and lightweight music playback service - documentation90Description: Simple and lightweight media playback service - documentation
66 Music Hub is a simple and lightweight service for music playback using91 Media Hub is a simple and lightweight service for media playback using
67 DBus.92 DBus.
68 .93 .
69 This package contains the documentation.94 This package contains the documentation.
7095
=== modified file 'debian/copyright'
--- debian/copyright 2013-08-14 20:10:09 +0000
+++ debian/copyright 2014-03-26 20:19:25 +0000
@@ -1,6 +1,6 @@
1Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/1Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
2Upstream-Name: music-hub2Upstream-Name: media-hub
3Source: https://launchpad.net/music-hub3Source: https://launchpad.net/media-hub
44
5Files: *5Files: *
6Copyright: 2013 Canonical Ltd.6Copyright: 2013 Canonical Ltd.
77
=== added file 'debian/libmedia-hub-client0.install'
--- debian/libmedia-hub-client0.install 1970-01-01 00:00:00 +0000
+++ debian/libmedia-hub-client0.install 2014-03-26 20:19:25 +0000
@@ -0,0 +1,1 @@
1usr/lib/*/libmedia-hub-client.so.*
02
=== renamed file 'debian/libmusic-hub0.install' => 'debian/libmedia-hub-common0.install'
--- debian/libmusic-hub0.install 2014-02-13 17:24:46 +0000
+++ debian/libmedia-hub-common0.install 2014-03-26 20:19:25 +0000
@@ -1,2 +1,1 @@
1usr/lib/*/lib*.so.*1usr/lib/*/libmedia-hub-common.so.*
2usr/bin/*
32
=== added file 'debian/libmedia-hub-common0.symbols'
--- debian/libmedia-hub-common0.symbols 1970-01-01 00:00:00 +0000
+++ debian/libmedia-hub-common0.symbols 2014-03-26 20:19:25 +0000
@@ -0,0 +1,26 @@
1libmedia-hub-common.so.0 libmedia-hub-common0 #MINVER#
2 (c++)"the_session_bus()@Base" 0.0.1
3 (c++)"std::shared_ptr<core::dbus::Bus>::~shared_ptr()@Base" 0.0.1
4 (c++)"std::shared_ptr<core::dbus::Bus>::~shared_ptr()@Base" 0.0.1
5 (c++)"std::shared_ptr<core::dbus::Executor>::~shared_ptr()@Base" 0.0.1
6 (c++)"std::shared_ptr<core::dbus::Executor>::~shared_ptr()@Base" 0.0.1
7 (c++)"std::_Sp_counted_base<(__gnu_cxx::_Lock_policy)2>::_M_destroy()@Base" 0.0.1
8 (c++)"std::_Sp_counted_base<(__gnu_cxx::_Lock_policy)2>::~_Sp_counted_base()@Base" 0.0.1
9 (c++)"std::_Sp_counted_base<(__gnu_cxx::_Lock_policy)2>::~_Sp_counted_base()@Base" 0.0.1
10 (c++)"std::_Sp_counted_base<(__gnu_cxx::_Lock_policy)2>::~_Sp_counted_base()@Base" 0.0.1
11 (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
12 (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
13 (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
14 (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
15 (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
16 (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
17 (c++)"typeinfo for std::_Mutex_base<(__gnu_cxx::_Lock_policy)2>@Base" 0.0.1
18 (c++)"typeinfo for std::_Sp_counted_base<(__gnu_cxx::_Lock_policy)2>@Base" 0.0.1
19 (c++)"typeinfo for std::_Sp_make_shared_tag@Base" 0.0.1
20 (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
21 (c++)"typeinfo name for std::_Mutex_base<(__gnu_cxx::_Lock_policy)2>@Base" 0.0.1
22 (c++)"typeinfo name for std::_Sp_counted_base<(__gnu_cxx::_Lock_policy)2>@Base" 0.0.1
23 (c++)"typeinfo name for std::_Sp_make_shared_tag@Base" 0.0.1
24 (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
25 (c++)"vtable for std::_Sp_counted_base<(__gnu_cxx::_Lock_policy)2>@Base" 0.0.1
26 (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
027
=== renamed file 'debian/libmusic-hub-dev.install' => 'debian/libmedia-hub-dev.install'
=== renamed file 'debian/libmusic-hub-doc.install' => 'debian/libmedia-hub-doc.install'
=== added file 'debian/libmedia-hub-doc.lintian-overrides'
--- debian/libmedia-hub-doc.lintian-overrides 1970-01-01 00:00:00 +0000
+++ debian/libmedia-hub-doc.lintian-overrides 2014-03-26 20:19:25 +0000
@@ -0,0 +1,1 @@
1libmedia-hub-doc: embedded-javascript-library
02
=== added file 'debian/media-hub.conf'
--- debian/media-hub.conf 1970-01-01 00:00:00 +0000
+++ debian/media-hub.conf 2014-03-26 20:19:25 +0000
@@ -0,0 +1,6 @@
1description "Starts the media-hub service"
2
3start on dbus
4stop on runlevel [06]
5
6exec media-hub-server
07
=== added file 'debian/media-hub.install'
--- debian/media-hub.install 1970-01-01 00:00:00 +0000
+++ debian/media-hub.install 2014-03-26 20:19:25 +0000
@@ -0,0 +1,2 @@
1debian/media-hub.conf /usr/share/upstart/sessions/
2usr/bin
03
=== added file 'debian/media-hub.lintian-overrides'
--- debian/media-hub.lintian-overrides 1970-01-01 00:00:00 +0000
+++ debian/media-hub.lintian-overrides 2014-03-26 20:19:25 +0000
@@ -0,0 +1,1 @@
1media-hub: binary-without-manpage
02
=== modified file 'debian/rules'
--- debian/rules 2014-02-13 17:24:46 +0000
+++ debian/rules 2014-03-26 20:19:25 +0000
@@ -1,6 +1,9 @@
1#!/usr/bin/make -f1#!/usr/bin/make -f
2# -*- makefile -*-2# -*- makefile -*-
33
4# Uncomment this to turn on verbose mode.
5# export DH_VERBOSE=1
6
4export CC=gcc-4.77export CC=gcc-4.7
5export CXX=g++-4.78export CXX=g++-4.7
69

Subscribers

People subscribed via source and target branches