aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2011-09-29 15:36:20 -0500
committerTed Gould <ted@gould.cx>2011-09-29 15:36:20 -0500
commitd6dcd6734c7316d8ff59e3f8f8f6037466fce354 (patch)
tree3c6cb735a28c113c190111a3b70c2e248f2226fc
parentb2dfc107bf3ceef3c92828982f3238904378f6b1 (diff)
parent95fcdc5a0e1e2d4184149e2354f0cb33d6755d48 (diff)
downloadayatana-indicator-datetime-d6dcd6734c7316d8ff59e3f8f8f6037466fce354.tar.gz
ayatana-indicator-datetime-d6dcd6734c7316d8ff59e3f8f8f6037466fce354.tar.bz2
ayatana-indicator-datetime-d6dcd6734c7316d8ff59e3f8f8f6037466fce354.zip
Merge from Ubuntu Desktop
-rw-r--r--debian/changelog14
-rw-r--r--debian/control4
2 files changed, 15 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 42fe0d1..61c09be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,13 @@
-indicator-datetime (0.2.95-0ubuntu1~ppa1) oneiric; urgency=low
+indicator-datetime (0.2.95-0ubuntu2) UNRELEASED; urgency=low
+ * debian/control
+ - Added recommends for e-d-s
+
+ -- Ken VanDine <ken.vandine@canonical.com> Thu, 29 Sep 2011 16:28:52 -0400
+
+indicator-datetime (0.2.95-0ubuntu1) oneiric; urgency=low
+
+ [ Ted Gould ]
* New upstream release.
* Set default timezone on events without (LP: #837359)
* Update docs to specify correct custom formats (LP: #775113)
@@ -7,6 +15,10 @@ indicator-datetime (0.2.95-0ubuntu1~ppa1) oneiric; urgency=low
* Fix gettext domain for builder files (LP: #845473)
* Update date correctly when opening menu (LP: #793450)
+ [ Didier Roche ]
+ * debian/control:
+ - bump the libglib build-dep
+
-- Ted Gould <ted@ubuntu.com> Thu, 15 Sep 2011 10:45:57 -0500
indicator-datetime (0.2.93-0ubuntu2) oneiric; urgency=low
diff --git a/debian/control b/debian/control
index 5b210b1..64abb69 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: cdbs,
libdbusmenu-glib-dev (>= 0.3.90),
libdbusmenu-gtk-dev (>= 0.3.94),
libdbusmenu-gtk3-dev (>= 0.3.94),
- libglib2.0-dev (>= 2.25.0),
+ libglib2.0-dev (>= 2.29.19),
libido-0.1-dev (>= 0.2.2),
libido3-0.1-dev (>= 0.2.90),
libunique-3.0-dev,
@@ -39,7 +39,7 @@ Depends: ${shlibs:Depends},
${misc:Depends},
gnome-control-center,
geoclue-ubuntu-geoip | geoclue-provider
-Recommends: indicator-applet | indicator-renderer
+Recommends: indicator-applet | indicator-renderer, evolution-data-server
Description: Simple clock
A simple clock appearing in the indicator bar