1 files changed, 20 insertions, 16 deletions
diff --git a/debian/changelog b/debian/changelog
index d7b1a6f..e555f3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,31 +1,35 @@
-indicator-datetime (0.1.92-0ubuntu2~ppa1~apnt4) natty; urgency=low
+indicator-datetime (0.1.92-0ubuntu5~ppa1) UNRELEASED; urgency=low
 
   * Upstream Merge
-    * Adding some color support along with times
+    * Merging in first EDS branch
+  * debian/rules: Adding in autoreconf 
 
- -- Ted Gould <ted@ubuntu.com>  Tue, 08 Feb 2011 14:26:28 -0600
+ -- Ted Gould <ted@ubuntu.com>  Tue, 08 Feb 2011 22:21:14 -0600
 
-indicator-datetime (0.1.92-0ubuntu2~ppa1~apnt3) natty; urgency=low
+indicator-datetime (0.1.92-0ubuntu4) natty; urgency=low
 
-  * Upstream Merge
-    * Debugging statements and cleaning code a bit
+  * debian/source/format
+    - Source format v1 instead of v3
 
- -- Ted Gould <ted@ubuntu.com>  Fri, 04 Feb 2011 15:53:05 -0600
+ -- Ken VanDine <ken.vandine@canonical.com>  Tue, 08 Feb 2011 13:59:35 -0500
 
-indicator-datetime (0.1.92-0ubuntu2~ppa1~apnt2) natty; urgency=low
+indicator-datetime (0.1.92-0ubuntu3) natty; urgency=low
 
-  * Upstream Merge
-    * Unreffing the menu item
+  * debian/control
+    - Bump standards version to 3.9.1
+    - Set Vcs-Bzr
+  * +debian/source/format
 
- -- Ted Gould <ted@ubuntu.com>  Fri, 04 Feb 2011 15:35:12 -0600
+ -- Ken VanDine <ken.vandine@canonical.com>  Tue, 08 Feb 2011 11:14:02 -0500
 
-indicator-datetime (0.1.92-0ubuntu2~ppa1~apnt1) natty; urgency=low
+indicator-datetime (0.1.92-0ubuntu2) natty; urgency=low
 
-  * Upstream Merge
-    * Merging in first EDS branch
-  * debian/rules: Adding in autoreconf 
+  * debian/control
+    - Depend on geoclue-ubuntu-geoip | geoclue-provider (LP: #714763)
+  * src/datetime-service.c
+    - Don't crash if we can get a geoclue provider (LP: #714763)
 
- -- Ted Gould <ted@ubuntu.com>  Fri, 04 Feb 2011 15:25:13 -0600
+ -- Ken VanDine <ken.vandine@canonical.com>  Tue, 08 Feb 2011 11:02:31 -0500
 
 indicator-datetime (0.1.92-0ubuntu1) natty; urgency=low