aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-01-08 12:13:23 -0600
committerTed Gould <ted@gould.cx>2010-01-08 12:13:23 -0600
commitd39cc3106f19eb906552e137824aabb4d648c2a1 (patch)
treeef97ee8c13404e95ee9f5444d7a82118ff737f52 /debian
parent0d4e6169ff7a28d62ce785fd61aecc201418a27a (diff)
parent1fe4c86ce7dd4f206c1b954919a262740cbf76ef (diff)
downloadayatana-indicator-messages-d39cc3106f19eb906552e137824aabb4d648c2a1.tar.gz
ayatana-indicator-messages-d39cc3106f19eb906552e137824aabb4d648c2a1.tar.bz2
ayatana-indicator-messages-d39cc3106f19eb906552e137824aabb4d648c2a1.zip
Merging in ubuntu-desktop branch
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog15
-rw-r--r--debian/control3
2 files changed, 17 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 75adc13..39b0650 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,21 @@ indicator-messages (0.2.6-0ubuntu2~ppa1) karmic; urgency=low
-- Ted Gould <ted@ubuntu.com> Mon, 26 Oct 2009 21:06:26 -0500
+indicator-messages (0.2.6+r156-0ubuntu2) lucid; urgency=low
+
+ * debian/control
+ - add a Breaks for indicator-applet (<< 0.3.0)
+
+ -- Ken VanDine <ken.vandine@canonical.com> Tue, 15 Dec 2009 11:57:42 -0500
+
+indicator-messages (0.2.6+r156-0ubuntu1) lucid; urgency=low
+
+ * New snapshot for libindicator 0.3.0
+ * debian/control
+ - Build-Depends on libindicator >= 0.3.0
+
+ -- Ken VanDine <ken.vandine@canonical.com> Thu, 10 Dec 2009 14:35:46 -0500
+
indicator-messages (0.2.6-0ubuntu1) karmic; urgency=low
* Upstream release 0.2.6 (LP: #446629)
diff --git a/debian/control b/debian/control
index 0023281..a71376c 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 5.0),
intltool,
libindicate-dev (>= 0.2.0),
libindicate-gtk-dev (>= 0.2.0),
- libindicator-dev (>= 0.3.0~dev),
+ libindicator-dev (>= 0.3.0),
libdbusmenu-gtk-dev (>= 0.2.0~dev),
libdbusmenu-glib-dev (>= 0.2.0~dev)
Standards-Version: 3.8.0
@@ -21,6 +21,7 @@ Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-messages/ubuntu
Package: indicator-messages
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, indicator-applet
+Breaks: indicator-applet (<< 0.3.0)
Description: GNOME panel indicator applet for messages
indicator-applet is an applet to display information from
various applications consistently in the GNOME panel.