Merge lp:~timo-jyrinki/music-hub/misc_packaging_fixes into lp:music-hub

Proposed by Timo Jyrinki
Status: Merged
Approved by: Thomas Voß
Approved revision: 4
Merged at revision: 3
Proposed branch: lp:~timo-jyrinki/music-hub/misc_packaging_fixes
Merge into: lp:music-hub
Diff against target: 100 lines (+37/-17)
3 files modified
debian/changelog (+4/-0)
debian/control (+31/-14)
debian/rules (+2/-3)
To merge this branch: bzr merge lp:~timo-jyrinki/music-hub/misc_packaging_fixes
Reviewer Review Type Date Requested Status
Thomas Voß (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+181554@code.launchpad.net

Commit message

Misc fixes to add to the daily release. Adding of package descriptions, build dependencies, bootstrapping and cosmetic fixes.

Description of the change

Misc fixes to add to the daily release.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
4. By Timo Jyrinki

Add missing dependencies.

Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Tested via pbuilder, was missing doxygen, libdbus-1-dev and pkg-config from build-depends.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Thomas Voß (thomas-voss) wrote :

LGTM.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-08-14 18:05:23 +0000
3+++ debian/changelog 2013-08-23 05:14:06 +0000
4@@ -1,5 +1,9 @@
5 music-hub (0.0-0ubuntu1) UNRELEASED; urgency=low
6
7+ [ Thomas Voß ]
8 * Initial release.
9
10+ [ Timo Jyrinki ]
11+ * Automatic snapshot from revision 2 (bootstrap)
12+
13 -- Thomas Voß <thomas.voss@canonical.com> Wed, 14 Aug 2013 20:02:38 +0200
14
15=== modified file 'debian/control'
16--- debian/control 2013-08-14 20:10:09 +0000
17+++ debian/control 2013-08-23 05:14:06 +0000
18@@ -1,33 +1,50 @@
19 Source: music-hub
20-Priority: extra
21-Maintainer: Thomas Voß (thomas.voss@canonical.com)
22+Priority: optional
23+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
24 Build-Depends: cmake,
25+ dbus-cpp-dev,
26+ dbus-test-runner,
27 debhelper (>= 9),
28+ doxygen,
29 libboost-dev (>=1.53),
30+ libdbus-1-dev,
31 libgoogle-glog-dev,
32- dbus-cpp-dev,
33- dbus-test-runner,
34+ pkg-config,
35 Standards-Version: 3.9.4
36 Section: libs
37 Homepage: https://launchpad.net/music-hub
38+# If you aren't a member of ~phablet-team but need to upload packaging changes,
39+# just go ahead. ~phablet-team will notice and sync up the code again.
40+Vcs-Bzr: https://code.launchpad.net/~phablet-team/music-hub/trunk
41
42 Package: libmusic-hub-dev
43 Section: libdevel
44 Architecture: any
45-Depends: libmusic-hub0 (= ${binary:Version})
46-Description: <insert up to 60 chars description>
47- <insert long description, indented with spaces>
48+Depends: libmusic-hub0 (= ${binary:Version}),
49+ ${misc:Depends},
50+Description: Simple and lightweight music playback service - development files
51+ Music Hub is a simple and lightweight service for music playback using
52+ DBus.
53+ .
54+ This package contains the development files.
55
56 Package: libmusic-hub0
57-Section: libs
58 Architecture: any
59-Depends: ${shlibs:Depends}, ${misc:Depends}
60-Description: <insert up to 60 chars description>
61- <insert long description, indented with spaces>
62+Depends: ${misc:Depends},
63+ ${shlibs:Depends},
64+Description: Simple and lightweight music playback service
65+ Music Hub is a simple and lightweight service for music playback using
66+ DBus.
67+ .
68+ This package contains the library itself.
69
70 Package: libmusic-hub-doc
71 Section: doc
72 Architecture: all
73-Depends: ${shlibs:Depends}, ${misc:Depends}
74-Description: <insert up to 60 chars description>
75- <insert long description, indented with spaces>
76+Depends: ${misc:Depends},
77+ ${shlibs:Depends},
78+Description: Simple and lightweight music playback service - documentation
79+ Music Hub is a simple and lightweight service for music playback using
80+ DBus.
81+ .
82+ This package contains the documentation.
83
84=== modified file 'debian/rules'
85--- debian/rules 2013-08-14 18:05:23 +0000
86+++ debian/rules 2013-08-23 05:14:06 +0000
87@@ -1,11 +1,10 @@
88 #!/usr/bin/make -f
89 # -*- makefile -*-
90
91-# Uncomment this to turn on verbose mode.
92-#export DH_VERBOSE=1
93+export DPKG_GENSYMBOLS_CHECK_LEVEL=4
94
95 %:
96- dh $@ -- -B build
97+ dh $@ --fail-missing -- -B build
98
99 override_dh_auto_test:
100 dbus-test-runner -t make -p "-C" -p "build" -p test

Subscribers

People subscribed via source and target branches