aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog7
-rw-r--r--debian/control3
2 files changed, 9 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 3ab87f5..9a71a72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+indicator-messages (0.4.92-0ubuntu2) oneiric; urgency=low
+
+ * debian/control:
+ - use conflicts against indicator-me
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 29 Jul 2011 15:49:40 +0200
+
indicator-messages (0.4.92-0ubuntu1) oneiric; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index 605f65b..b336742 100644
--- a/debian/control
+++ b/debian/control
@@ -30,7 +30,8 @@ Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: indicator-applet | indicator-renderer, indicator-status-provider-mc5
Replaces: indicator-me
-Breaks: indicator-applet (<< 0.3.0), indicator-me
+Breaks: indicator-applet (<< 0.3.0)
+Conflicts: indicator-me
Description: indicator that collects messages that need a response
A place on the user's desktop that collects messages that need a response.
This menu provides a condensed and collected view of all of those messages