Ubuntu
rhythmbox package

Merge lp:~timo-jyrinki/ubuntu/utopic/rhythmbox/enable_grilo_rhythmbox into lp:ubuntu/utopic/rhythmbox

  1. Utopic (14.10)
  2. enable_grilo_rhythmbox
  3. Merge into utopic
Proposed by Timo Jyrinki
Status: Merged
Merge reported by: Iain Lane
Merged at revision: not available
Proposed branch: lp:~timo-jyrinki/ubuntu/utopic/rhythmbox/enable_grilo_rhythmbox
Merge into: lp:ubuntu/utopic/rhythmbox
Diff against target: 64 lines (+12/-4)
5 files modified
debian/changelog (+6/-0)
debian/control (+2/-1)
debian/control.in (+2/-1)
debian/rhythmbox-plugins.install (+1/-0)
debian/rules (+1/-2)
To merge this branch: bzr merge lp:~timo-jyrinki/ubuntu/utopic/rhythmbox/enable_grilo_rhythmbox
Reviewer Review Type Date Requested Status
Iain Lane Approve
Review via email: mp+219304@code.launchpad.net

Commit message

Build and install the grilo plugin (LP: #973295)

To post a comment you must log in.
Revision history for this message
Iain Lane (laney) wrote :

Merged into ubuntu-desktop branch, thanks!

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 2014-04-24 16:50:11 +0000
3+++ debian/changelog 2014-05-13 08:21:17 +0000
4@@ -1,3 +1,9 @@
5+rhythmbox (3.0.2-0ubuntu3) utopic; urgency=medium
6+
7+ * Build and install the grilo plugin (LP: #973295)
8+
9+ -- Florian Will <florian.will@googlemail.com> Wed, 30 Apr 2014 16:41:54 +0200
10+
11 rhythmbox (3.0.2-0ubuntu2) trusty; urgency=medium
12
13 * debian/patches/git_error_by_one_segfault.patch:
14
15=== modified file 'debian/control'
16--- debian/control 2014-03-20 19:57:06 +0000
17+++ debian/control 2014-05-13 08:21:17 +0000
18@@ -59,7 +59,8 @@
19 libpango1.0-doc,
20 libgdk-pixbuf2.0-doc,
21 gstreamer1.0-doc,
22- gstreamer1.0-plugins-base-doc
23+ gstreamer1.0-plugins-base-doc,
24+ libgrilo-0.2-dev
25 Build-Conflicts: libmusicbrainz3-dev
26 Standards-Version: 3.9.4
27 X-Debian-Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/packages/unstable/rhythmbox/
28
29=== modified file 'debian/control.in'
30--- debian/control.in 2014-03-20 19:57:06 +0000
31+++ debian/control.in 2014-05-13 08:21:17 +0000
32@@ -55,7 +55,8 @@
33 libpango1.0-doc,
34 libgdk-pixbuf2.0-doc,
35 gstreamer1.0-doc,
36- gstreamer1.0-plugins-base-doc
37+ gstreamer1.0-plugins-base-doc,
38+ libgrilo-0.2-dev
39 Build-Conflicts: libmusicbrainz3-dev
40 Standards-Version: 3.9.4
41 X-Debian-Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/packages/unstable/rhythmbox/
42
43=== modified file 'debian/rhythmbox-plugins.install'
44--- debian/rhythmbox-plugins.install 2013-10-24 11:01:12 +0000
45+++ debian/rhythmbox-plugins.install 2014-05-13 08:21:17 +0000
46@@ -21,3 +21,4 @@
47 usr/lib/rhythmbox/plugins/replaygain
48 usr/share/rhythmbox/plugins/replaygain
49 usr/lib/rhythmbox/plugins/sendto
50+usr/lib/rhythmbox/plugins/grilo
51
52=== modified file 'debian/rules'
53--- debian/rules 2014-02-28 12:02:38 +0000
54+++ debian/rules 2014-05-13 08:21:17 +0000
55@@ -12,8 +12,7 @@
56
57 DEB_CONFIGURE_EXTRA_FLAGS += --enable-lirc \
58 --disable-scrollkeeper \
59- --enable-gtk-doc \
60- --disable-grilo
61+ --enable-gtk-doc
62
63 ifeq ($(DEB_HOST_ARCH_OS),linux)
64 DEB_CONFIGURE_EXTRA_FLAGS += --without-hal --with-gudev

Subscribers

People subscribed via source and target branches

to all changes: