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

Proposed by dobey on 2013-04-24
Status: Merged
Approved by: dobey on 2013-04-24
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) 2013-04-24 Approve on 2013-04-24
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.
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
1=== modified file 'control'
2--- control 2012-08-27 20:35:30 +0000
3+++ control 2013-04-24 21:39:27 +0000
4@@ -2,10 +2,9 @@
5 Section: gnome
6 Priority: extra
7 Build-Depends: debhelper (>= 7.0.14),
8+ dh-translations,
9 gir1.2-glib-2.0,
10 gir1.2-peas-1.0,
11- gir1.2-rb-3.0,
12- gir1.2-ubuntuoneui-3.0,
13 intltool,
14 pep8,
15 pyflakes,
16@@ -15,7 +14,7 @@
17 python-gi,
18 ubuntuone-dev-tools
19 Maintainer: Ubuntu One Developers <ubuntuone-users@lists.launchpad.net>
20-Standards-Version: 3.9.2
21+Standards-Version: 3.9.4
22 Homepage: https://launchpad.net/rhythmbox-ubuntuone
23
24 Package: rhythmbox-ubuntuone
25@@ -25,8 +24,6 @@
26 ${python:Depends},
27 gir1.2-glib-2.0,
28 gir1.2-peas-1.0,
29- gir1.2-rb-3.0,
30- gir1.2-ubuntuoneui-3.0,
31 python-dirspec,
32 python-gi,
33 rhythmbox-plugins (>= 2.90.1+r7846)
34
35=== modified file 'rules'
36--- rules 2012-08-20 20:03:00 +0000
37+++ rules 2013-04-24 21:39:27 +0000
38@@ -1,7 +1,7 @@
39 #!/usr/bin/make -f
40
41 %:
42- dh $@ --with-python2 --fail-missing
43+ dh $@ --with-python2,translations --fail-missing
44
45 override_dh_auto_test:
46 ./run-tests

Subscribers

People subscribed via source and target branches

to all changes: