aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2011-03-23 16:18:12 -0500
committerTed Gould <ted@gould.cx>2011-03-23 16:18:12 -0500
commit5f261fbc850db9be32d2c9c381d97314e5f2043b (patch)
tree3beb73de10fedc037ab8457b1a02153c0e0a1001
parent2884233431cdd61eee5942a369a11d4daf9314aa (diff)
parent28103d195c1356c21e61b09c546e2ee583b03112 (diff)
downloadayatana-indicator-datetime-5f261fbc850db9be32d2c9c381d97314e5f2043b.tar.gz
ayatana-indicator-datetime-5f261fbc850db9be32d2c9c381d97314e5f2043b.tar.bz2
ayatana-indicator-datetime-5f261fbc850db9be32d2c9c381d97314e5f2043b.zip
Merge with U. Desktop
-rw-r--r--debian/changelog5
-rw-r--r--debian/control2
2 files changed, 5 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 5de83ed..aafbba3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,7 +12,7 @@ indicator-datetime (0.2.0-0ubuntu1~ppa1) UNRELEASED; urgency=low
-- Ted Gould <ted@ubuntu.com> Wed, 23 Mar 2011 16:15:45 -0500
-indicator-datetime (0.1.98-0ubuntu1~ppa1) natty; urgency=low
+indicator-datetime (0.1.98-0ubuntu1) natty; urgency=low
* New upstream release.
∘ Make appointments match calendar month
@@ -21,6 +21,9 @@ indicator-datetime (0.1.98-0ubuntu1~ppa1) natty; urgency=low
∘ Crash fixes (LP: #733833, LP: #729444)
∘ Valgrind invalid read (LP: #729175)
∘ Translation fixes to date label (LP: #729632)
+ * Fix handling of reoccruing events
+ * Handle settings in the indicator
+ * Allow for hiding the calendar and the clock
-- Ted Gould <ted@ubuntu.com> Wed, 16 Mar 2011 16:17:38 -0500
diff --git a/debian/control b/debian/control
index 1aacc14..ff8df82 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: cdbs,
libdbusmenu-glib-dev (>= 0.3.90),
libdbusmenu-gtk-dev (>= 0.3.90),
libglib2.0-dev (>= 2.25.0),
- libido-0.1-dev (>= 0.2.1-0ubuntu2),
+ libido-0.1-dev (>= 0.2.2),
libgeoclue-dev (>= 0.12.0),
liboobs-1-dev (>= 2.31.0),
libecal1.2-dev (>= 2.30),