aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorTed Gould <ted@canonical.com>2009-02-05 17:58:57 +0100
committerTed Gould <ted@canonical.com>2009-02-05 17:58:57 +0100
commitc18cbee8cb5197d9e2bc024e792842be6588b8da (patch)
treeee6c0db91c33e24c973946277a1c93697b27b132 /debian
parentc4db8e8c0c4978d70540d79df30d22c1afb7803f (diff)
parente6ff0d4856b0ffe1946332cd29d3a9683397c7bc (diff)
downloadlibayatana-indicator-c18cbee8cb5197d9e2bc024e792842be6588b8da.tar.gz
libayatana-indicator-c18cbee8cb5197d9e2bc024e792842be6588b8da.tar.bz2
libayatana-indicator-c18cbee8cb5197d9e2bc024e792842be6588b8da.zip
Merging in the trunk changes
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog31
-rw-r--r--debian/control2
2 files changed, 31 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 3f08411..6ecbe69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,35 @@
-indicator-applet (0.1~ppa23) intrepid; urgency=low
+indicator-applet (0.1~ppa27) intrepid; urgency=low
* Adding an API function for pixbufs
- -- Ted Gould <ted@ubuntu.com> Thu, 05 Feb 2009 14:42:46 +0100
+ -- Ted Gould <ted@ubuntu.com> Thu, 05 Feb 2009 14:46:44 +0100
+
+indicator-applet (0.1~ppa26) intrepid; urgency=low
+
+ * Removing the icons
+ * Adding in the docs
+ * Printing the icons dir
+
+ -- Ted Gould <ted@ubuntu.com> Wed, 04 Feb 2009 18:58:32 +0100
+
+indicator-applet (0.1~ppa25) intrepid; urgency=low
+
+ * Set the widget name on the applet rather than the menubar, to make sure
+ it's picked up globally.
+
+ -- Neil J. Patel <neil.patel@canonical.com> Wed, 04 Feb 2009 14:53:41 +0100
+
+indicator-applet (0.1~ppa24) intrepid; urgency=low
+
+ * Adding a conflicts and a replaces to get rid of errors.
+
+ -- Ted Gould <ted@ubuntu.com> Wed, 04 Feb 2009 14:14:25 +0100
+
+indicator-applet (0.1~ppa23) intrepid; urgency=low
+
+ * Removing border
+
+ -- Ted Gould <ted@ubuntu.com> Wed, 04 Feb 2009 13:57:23 +0100
indicator-applet (0.1~ppa22) intrepid; urgency=low
diff --git a/debian/control b/debian/control
index 9d04325..7cacf57 100644
--- a/debian/control
+++ b/debian/control
@@ -25,6 +25,8 @@ Description: Applet for the GNOME panel providing various indicators for
Package: libindicate0
Section: libs
+Conflicts: libindicate
+Replaces: libindicate
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}