aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2012-03-21 15:27:52 -0500
committerTed Gould <ted@gould.cx>2012-03-21 15:27:52 -0500
commitb4a2449ace91863bc187500e1a4eb3048c350711 (patch)
treecbca4ffcf3bea98adff7a7293dd9f0f18aa96fb6 /debian
parent2cb10b4b604e7e7d66fb6f6183755afcad57723a (diff)
parent2ac0106d8114b81b86bfaeabf8746375425563a2 (diff)
downloadayatana-indicator-messages-b4a2449ace91863bc187500e1a4eb3048c350711.tar.gz
ayatana-indicator-messages-b4a2449ace91863bc187500e1a4eb3048c350711.tar.bz2
ayatana-indicator-messages-b4a2449ace91863bc187500e1a4eb3048c350711.zip
Sync up to Ubuntu Desktop
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog15
-rw-r--r--debian/control2
2 files changed, 13 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 0fa0d23..4426e3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,22 @@
-indicator-messages (0.5.93-0ubuntu1~ppa1) precise; urgency=low
+indicator-messages (0.5.93-0ubuntu2) precise; urgency=low
+ * src/im-menu-item.c
+ - cherry picked fix for missing icons in the messaging menu (LP: #960553)
+
+ -- Ken VanDine <ken.vandine@canonical.com> Tue, 20 Mar 2012 16:41:13 -0400
+
+indicator-messages (0.5.93-0ubuntu1) precise; urgency=low
+
+ * debian/control:
+ - drop build-depends on gnome-doc-utils and scrollkeeper, not required
+
+ [ Ted Gould ]
* New upstream release.
* Fixing alignment of menu items (LP: #939953)
* Vertically centering alignment of double high items (LP: #770486)
* Fixing setting of status on telepathy (LP: #943757)
- -- Ted Gould <ted@ubuntu.com> Thu, 08 Mar 2012 14:29:54 -0600
+ -- Sebastien Bacher <seb128@ubuntu.com> Thu, 08 Mar 2012 22:11:24 +0100
indicator-messages (0.5.92-0ubuntu1) precise; urgency=low
diff --git a/debian/control b/debian/control
index 4c623c8..40b8dd5 100644
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,6 @@ Build-Depends: debhelper (>= 5.0),
libgtk2.0-dev (>= 2.12.0),
libgtk-3-dev,
libdbus-glib-1-dev,
- gnome-doc-utils,
- scrollkeeper,
intltool,
libindicate-dev (>= 0.6.90),
libindicate-gtk-dev (>= 0.6.90),