Merge lp:~dobey/rhythmbox-ubuntuone/no-libu1 into lp:rhythmbox-ubuntuone/packaging-dailies

Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 21
Merged at revision: 21
Proposed branch: lp:~dobey/rhythmbox-ubuntuone/no-libu1
Merge into: lp:rhythmbox-ubuntuone/packaging-dailies
Diff against target: 46 lines (+3/-6)
2 files modified
control (+2/-5)
rules (+1/-1)
To merge this branch: bzr merge lp:~dobey/rhythmbox-ubuntuone/no-libu1
Reviewer Review Type Date Requested Status
Mike McCracken (community) Approve
Review via email: mp+160767@code.launchpad.net

Commit message

We don't need libubuntuone any more.
Bring the packaging up to par with the official packaging.

To post a comment you must log in.
Revision history for this message
Mike McCracken (mikemc) wrote :

Looks good to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'control'
--- control 2012-08-27 20:35:30 +0000
+++ control 2013-04-24 21:39:27 +0000
@@ -2,10 +2,9 @@
2Section: gnome2Section: gnome
3Priority: extra3Priority: extra
4Build-Depends: debhelper (>= 7.0.14),4Build-Depends: debhelper (>= 7.0.14),
5 dh-translations,
5 gir1.2-glib-2.0,6 gir1.2-glib-2.0,
6 gir1.2-peas-1.0,7 gir1.2-peas-1.0,
7 gir1.2-rb-3.0,
8 gir1.2-ubuntuoneui-3.0,
9 intltool,8 intltool,
10 pep8,9 pep8,
11 pyflakes,10 pyflakes,
@@ -15,7 +14,7 @@
15 python-gi,14 python-gi,
16 ubuntuone-dev-tools15 ubuntuone-dev-tools
17Maintainer: Ubuntu One Developers <ubuntuone-users@lists.launchpad.net>16Maintainer: Ubuntu One Developers <ubuntuone-users@lists.launchpad.net>
18Standards-Version: 3.9.217Standards-Version: 3.9.4
19Homepage: https://launchpad.net/rhythmbox-ubuntuone18Homepage: https://launchpad.net/rhythmbox-ubuntuone
2019
21Package: rhythmbox-ubuntuone20Package: rhythmbox-ubuntuone
@@ -25,8 +24,6 @@
25 ${python:Depends},24 ${python:Depends},
26 gir1.2-glib-2.0,25 gir1.2-glib-2.0,
27 gir1.2-peas-1.0,26 gir1.2-peas-1.0,
28 gir1.2-rb-3.0,
29 gir1.2-ubuntuoneui-3.0,
30 python-dirspec,27 python-dirspec,
31 python-gi,28 python-gi,
32 rhythmbox-plugins (>= 2.90.1+r7846)29 rhythmbox-plugins (>= 2.90.1+r7846)
3330
=== modified file 'rules'
--- rules 2012-08-20 20:03:00 +0000
+++ rules 2013-04-24 21:39:27 +0000
@@ -1,7 +1,7 @@
1#!/usr/bin/make -f1#!/usr/bin/make -f
22
3%:3%:
4 dh $@ --with-python2 --fail-missing4 dh $@ --with-python2,translations --fail-missing
55
6override_dh_auto_test:6override_dh_auto_test:
7 ./run-tests7 ./run-tests

Subscribers

People subscribed via source and target branches

to all changes: