Merge lp:~dobey/indicator-me/no-ubuntuone into lp:~ubuntu-desktop/indicator-me/ubuntu

Proposed by dobey
Status: Work in progress
Proposed branch: lp:~dobey/indicator-me/no-ubuntuone
Merge into: lp:~ubuntu-desktop/indicator-me/ubuntu
Diff against target: 35 lines (+8/-2)
2 files modified
debian/changelog (+8/-0)
debian/control (+0/-2)
To merge this branch: bzr merge lp:~dobey/indicator-me/no-ubuntuone
Reviewer Review Type Date Requested Status
Ubuntu Desktop Pending
Review via email: mp+74271@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

37. By dobey

* debian/control
  - Don't depend on ubuntuone-control-panel-gtk any more
    (LP: #711233, #833824)

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 2011-07-08 14:22:59 +0000
3+++ debian/changelog 2011-09-06 19:12:32 +0000
4@@ -1,3 +1,11 @@
5+indicator-me (0.2.92-0ubuntu2) oneiric; urgency=low
6+
7+ * debian/control
8+ - Don't depend on ubuntuone-control-panel-gtk any more
9+ (LP: #711233, #833824)
10+
11+ -- Rodney Dawes <rodney.dawes@ubuntu.com> Tue, 06 Sep 2011 13:41:50 -0400
12+
13 indicator-me (0.2.92-0ubuntu1) oneiric; urgency=low
14
15 * New upstream release.
16
17=== modified file 'debian/control'
18--- debian/control 2011-07-08 14:22:59 +0000
19+++ debian/control 2011-09-06 19:12:32 +0000
20@@ -27,7 +27,6 @@
21 Architecture: any
22 Depends: ${shlibs:Depends}, ${misc:Depends}
23 Recommends: gwibber (>= 2.29.90),
24- ubuntuone-control-panel-gtk (>= 0.8.0),
25 unity | indicator-renderer
26 Conflicts: indicator-session (<< 0.2.0)
27 Description: indicator showing user information and status
28@@ -41,7 +40,6 @@
29 Architecture: any
30 Depends: ${shlibs:Depends}, ${misc:Depends}
31 Recommends: gwibber (>= 2.29.90),
32- ubuntuone-control-panel-gtk (>= 0.8.0),
33 unity | indicator-renderer,
34 Replaces: indicator-me (<< 0.2.90)
35 Conflicts: indicator-session (<< 0.2.0)

Subscribers

People subscribed via source and target branches

to all changes: