releasing version 0.1.93-0ubuntu10.1.93-0ubuntu1

6 files changed, 467 insertions, 79 deletions

diff --git a/AUTHORS b/AUTHORS
index d4af5cd..dc6a01a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,6 +1,7 @@
 # Generated by Makefile. Do not edit.
 
  David Barth 
+ karl-qdh 
  Kyle Nitzsche 
  Marco Trevisan (Treviño) 
  Michael Terry 
diff --git a/ChangeLog b/ChangeLog
index 1811bc7..0f5af8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,130 @@
 # Generated by Makefile. Do not edit.
 
+2011-02-09  Ted Gould  <ted@gould.cx>
+
+	0.1.93
+
+2011-02-08  Ted Gould  <ted@gould.cx>
+
+	Checking for NULL clients and giving a message
+
+2011-02-08  Ted Gould  <ted@gould.cx>
+
+	Made translatable as it's a user focused message.
+
+2011-02-08  Ted Gould  <ted@gould.cx>
+
+	Changing warning.
+
+2011-02-07  Ted Gould  <ted@gould.cx>
+
+	Check to make sure we can allocate a client.
+
+2011-02-08  Ted Gould  <ted@gould.cx>
+
+	Commenting out unused code for now
+
+2011-02-08  Ted Gould  <ted@gould.cx>
+
+	Adding in basic EDS appointment support.
+
+2011-02-08  karl-qdh  <karl@qdh.org.uk>
+
+	Re-adding tedg's changes
+
+2011-02-08  karl-qdh  <karl@qdh.org.uk>
+
+	Merging ted's branch
+
+2011-02-04  Ted Gould  <ted@gould.cx>
+
+	Reshuffle some code and add a couple of debug statements
+
+2011-02-04  Ted Gould  <ted@gould.cx>
+
+	Removing comment
+
+2011-02-04  Ted Gould  <ted@gould.cx>
+
+	Removing a ref on the item
+
+2011-02-07  karl-qdh  <karl@qdh.org.uk>
+
+	Updated datetime service slightly to draw coloured dots for evolution colours, evolution is still slightly broken at doing it's part here and returns null colours.
+	Updated configure.ac (hope this doesn't break merge), and added the radio menu item with a right aligned time to the indicator so we can have location/timezone entries.
+
+2011-02-04  karl-qdh  <karl@qdh.org.uk>
+
+	Added ESource Colours a circle drawn onto a cairo surface, however this code
+	has one caveat, it's un-testable with evolution as evolutions color peek is
+	currently broken. However I've used a very similar method of exchanging 
+	GdkDrawables and cairo_surface_t before and it worked... Lets see this time :/
+
+2011-02-04  karl-qdh  <karl@qdh.org.uk>
+
+	Added the timezone/location menu item code.
+
+2011-02-04  karl-qdh  <karl@qdh.org.uk>
+
+	Updated the service, better memory handling, menu item sorting, triggered by about to show signal, discovered a new bug in dbusmenu
+	https://bugs.launchpad.net/dbusmenu/+bug/713041
+
+2011-02-02  karl-qdh  <karl@qdh.org.uk>
+
+	Getting the menu working almost correctly
+
+2011-01-31  karl-qdh  <karl@qdh.org.uk>
+
+	Removed all buggy code from the datetime-service to push for A2
+
+2011-01-31  karl-qdh  <karl@qdh.org.uk>
+
+	Updated add type handler functions
+
+2011-01-31  karl-qdh  <karl@qdh.org.uk>
+
+	Added mterry's merge
+
+2011-01-26  Michael Terry  <mike@mterry.name>
+
+	fix some crashes
+
+2011-01-24  karl-qdh  <karl@qdh.org.uk>
+
+	Final few fixes making it buildable
+
+2011-01-20  karl-qdh  <karl@qdh.org.uk>
+
+	Minor fix from blotted out version numbers
+
+2011-01-19  karl-qdh  <karl@qdh.org.uk>
+
+	Merged gdbus etc... from trunk
+
+2011-01-19  karl-qdh  <karl@qdh.org.uk>
+
+	Updated the eds code to use ecalcomponents rather than ical so we get colours etc...
+
+2011-01-12  karl-qdh  <karl@qdh.org.uk>
+
+	Added missing stuff, getting it ready to be buildable
+
+2011-01-12  karl-qdh  <karl@qdh.org.uk>
+
+	Added most likely broken URI callback, but at least our debugging messages will show us something :)
+
+2011-01-12  karl-qdh  <karl@qdh.org.uk>
+
+	Updated configure with ecal/ical
+
+2011-01-11  karl-qdh  <karl@qdh.org.uk>
+
+	Updated some minor things, the last commit wasn't exactly great, still untested, looking for a way to pull the evolution URI out of the events.
+
+2011-01-11  karl-qdh  <karl@qdh.org.uk>
+
+	Added initial support for ecal (untested)
+
 2011-02-03  Ted Gould  <ted@gould.cx>
 
 	0.1.92
diff --git a/configure b/configure
index c124970..71432e1 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for indicator-datetime 0.1.92.
+# Generated by GNU Autoconf 2.67 for indicator-datetime 0.1.93.
 #
 # Report bugs to <ted@canonical.com>.
 #
@@ -703,8 +703,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='indicator-datetime'
 PACKAGE_TARNAME='indicator-datetime'
-PACKAGE_VERSION='0.1.92'
-PACKAGE_STRING='indicator-datetime 0.1.92'
+PACKAGE_VERSION='0.1.93'
+PACKAGE_STRING='indicator-datetime 0.1.93'
 PACKAGE_BUGREPORT='ted@canonical.com'
 PACKAGE_URL=''
 
@@ -1493,7 +1493,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures indicator-datetime 0.1.92 to adapt to many kinds of systems.
+\`configure' configures indicator-datetime 0.1.93 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1564,7 +1564,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of indicator-datetime 0.1.92:";;
+     short | recursive ) echo "Configuration of indicator-datetime 0.1.93:";;
    esac
   cat <<\_ACEOF
 
@@ -1687,7 +1687,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-indicator-datetime configure 0.1.92
+indicator-datetime configure 0.1.93
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2058,7 +2058,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by indicator-datetime $as_me 0.1.92, which was
+It was created by indicator-datetime $as_me 0.1.93, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -2879,7 +2879,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=indicator-datetime
- VERSION=0.1.92
+ VERSION=0.1.93
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12210,6 +12210,11 @@ GIO_REQUIRED_VERSION=2.25.11
 INDICATOR_DISPLAY_OBJECTS=0.1.10
 GEOCLUE_REQUIRED_VERSION=0.12.0
 OOBS_REQUIRED_VERSION=2.31.0
+ECAL_REQUIRED_VERSION=2.30
+EDS_REQUIRED_VERSION=2.30
+ICAL_REQUIRED_VERSION=0.44
+CAIRO_REQUIRED_VERSION=1.10
+GDK_REQUIRED_VERSION=2.22
 
 if test "x$with_gtk" = x3; then :
 
@@ -12455,6 +12460,7 @@ See \`config.log' for more details" "$LINENO" 5 ; }
 
 fi
 
+if test "x$with_gtk" = x3; then :
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SERVICE" >&5
@@ -12465,26 +12471,44 @@ if test -n "$SERVICE_CFLAGS"; then
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"indicator >= \$INDICATOR_REQUIRED_VERSION
-                             dbusmenu-glib-0.4 >= \$DBUSMENUGLIB_REQUIRED_VERSION
-                             libido-0.1 >= \$INDICATOR_DISPLAY_OBJECTS
-                             gio-2.0 >= \$GIO_REQUIRED_VERSION
-                             geoclue >= \$GEOCLUE_REQUIRED_VERSION
-                             liboobs-1 >= \$OOBS_REQUIRED_VERSION\""; } >&5
+	                             dbusmenu-glib-0.4 >= \$DBUSMENUGLIB_REQUIRED_VERSION
+                                 dbusmenu-gtk3-0.4 >= \$DBUSMENUGTK_REQUIRED_VERSION
+	                             libido-0.1 >= \$INDICATOR_DISPLAY_OBJECTS
+	                             gio-2.0 >= \$GIO_REQUIRED_VERSION
+	                             geoclue >= \$GEOCLUE_REQUIRED_VERSION
+	                             liboobs-1 >= \$OOBS_REQUIRED_VERSION
+	                             libecal-1.2 >= \$ECAL_REQUIRED_VERSION
+	                             libical >= \$ICAL_REQUIRED_VERSION
+	                             libedataserver-1.2 >= EDS_REQUIRED_VERSION
+	                             cairo >= CAIRO_REQUIRED_VERSION
+	                             gdk-2.0 >= GDK_REQUIRED_VERSION\""; } >&5
   ($PKG_CONFIG --exists --print-errors "indicator >= $INDICATOR_REQUIRED_VERSION
-                             dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
-                             libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS
-                             gio-2.0 >= $GIO_REQUIRED_VERSION
-                             geoclue >= $GEOCLUE_REQUIRED_VERSION
-                             liboobs-1 >= $OOBS_REQUIRED_VERSION") 2>&5
+	                             dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
+                                 dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
+	                             libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS
+	                             gio-2.0 >= $GIO_REQUIRED_VERSION
+	                             geoclue >= $GEOCLUE_REQUIRED_VERSION
+	                             liboobs-1 >= $OOBS_REQUIRED_VERSION
+	                             libecal-1.2 >= $ECAL_REQUIRED_VERSION
+	                             libical >= $ICAL_REQUIRED_VERSION
+	                             libedataserver-1.2 >= EDS_REQUIRED_VERSION
+	                             cairo >= CAIRO_REQUIRED_VERSION
+	                             gdk-2.0 >= GDK_REQUIRED_VERSION") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_SERVICE_CFLAGS=`$PKG_CONFIG --cflags "indicator >= $INDICATOR_REQUIRED_VERSION
-                             dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
-                             libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS
-                             gio-2.0 >= $GIO_REQUIRED_VERSION
-                             geoclue >= $GEOCLUE_REQUIRED_VERSION
-                             liboobs-1 >= $OOBS_REQUIRED_VERSION" 2>/dev/null`
+	                             dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
+                                 dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
+	                             libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS
+	                             gio-2.0 >= $GIO_REQUIRED_VERSION
+	                             geoclue >= $GEOCLUE_REQUIRED_VERSION
+	                             liboobs-1 >= $OOBS_REQUIRED_VERSION
+	                             libecal-1.2 >= $ECAL_REQUIRED_VERSION
+	                             libical >= $ICAL_REQUIRED_VERSION
+	                             libedataserver-1.2 >= EDS_REQUIRED_VERSION
+	                             cairo >= CAIRO_REQUIRED_VERSION
+	                             gdk-2.0 >= GDK_REQUIRED_VERSION" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -12496,26 +12520,44 @@ if test -n "$SERVICE_LIBS"; then
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"indicator >= \$INDICATOR_REQUIRED_VERSION
-                             dbusmenu-glib-0.4 >= \$DBUSMENUGLIB_REQUIRED_VERSION
-                             libido-0.1 >= \$INDICATOR_DISPLAY_OBJECTS
-                             gio-2.0 >= \$GIO_REQUIRED_VERSION
-                             geoclue >= \$GEOCLUE_REQUIRED_VERSION
-                             liboobs-1 >= \$OOBS_REQUIRED_VERSION\""; } >&5
+	                             dbusmenu-glib-0.4 >= \$DBUSMENUGLIB_REQUIRED_VERSION
+                                 dbusmenu-gtk3-0.4 >= \$DBUSMENUGTK_REQUIRED_VERSION
+	                             libido-0.1 >= \$INDICATOR_DISPLAY_OBJECTS
+	                             gio-2.0 >= \$GIO_REQUIRED_VERSION
+	                             geoclue >= \$GEOCLUE_REQUIRED_VERSION
+	                             liboobs-1 >= \$OOBS_REQUIRED_VERSION
+	                             libecal-1.2 >= \$ECAL_REQUIRED_VERSION
+	                             libical >= \$ICAL_REQUIRED_VERSION
+	                             libedataserver-1.2 >= EDS_REQUIRED_VERSION
+	                             cairo >= CAIRO_REQUIRED_VERSION
+	                             gdk-2.0 >= GDK_REQUIRED_VERSION\""; } >&5
   ($PKG_CONFIG --exists --print-errors "indicator >= $INDICATOR_REQUIRED_VERSION
-                             dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
-                             libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS
-                             gio-2.0 >= $GIO_REQUIRED_VERSION
-                             geoclue >= $GEOCLUE_REQUIRED_VERSION
-                             liboobs-1 >= $OOBS_REQUIRED_VERSION") 2>&5
+	                             dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
+                                 dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
+	                             libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS
+	                             gio-2.0 >= $GIO_REQUIRED_VERSION
+	                             geoclue >= $GEOCLUE_REQUIRED_VERSION
+	                             liboobs-1 >= $OOBS_REQUIRED_VERSION
+	                             libecal-1.2 >= $ECAL_REQUIRED_VERSION
+	                             libical >= $ICAL_REQUIRED_VERSION
+	                             libedataserver-1.2 >= EDS_REQUIRED_VERSION
+	                             cairo >= CAIRO_REQUIRED_VERSION
+	                             gdk-2.0 >= GDK_REQUIRED_VERSION") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_SERVICE_LIBS=`$PKG_CONFIG --libs "indicator >= $INDICATOR_REQUIRED_VERSION
-                             dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
-                             libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS
-                             gio-2.0 >= $GIO_REQUIRED_VERSION
-                             geoclue >= $GEOCLUE_REQUIRED_VERSION
-                             liboobs-1 >= $OOBS_REQUIRED_VERSION" 2>/dev/null`
+	                             dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
+                                 dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
+	                             libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS
+	                             gio-2.0 >= $GIO_REQUIRED_VERSION
+	                             geoclue >= $GEOCLUE_REQUIRED_VERSION
+	                             liboobs-1 >= $OOBS_REQUIRED_VERSION
+	                             libecal-1.2 >= $ECAL_REQUIRED_VERSION
+	                             libical >= $ICAL_REQUIRED_VERSION
+	                             libedataserver-1.2 >= EDS_REQUIRED_VERSION
+	                             cairo >= CAIRO_REQUIRED_VERSION
+	                             gdk-2.0 >= GDK_REQUIRED_VERSION" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -12536,28 +12578,46 @@ else
 fi
         if test $_pkg_short_errors_supported = yes; then
 	        SERVICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "indicator >= $INDICATOR_REQUIRED_VERSION
-                             dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
-                             libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS
-                             gio-2.0 >= $GIO_REQUIRED_VERSION
-                             geoclue >= $GEOCLUE_REQUIRED_VERSION
-                             liboobs-1 >= $OOBS_REQUIRED_VERSION" 2>&1`
+	                             dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
+                                 dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
+	                             libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS
+	                             gio-2.0 >= $GIO_REQUIRED_VERSION
+	                             geoclue >= $GEOCLUE_REQUIRED_VERSION
+	                             liboobs-1 >= $OOBS_REQUIRED_VERSION
+	                             libecal-1.2 >= $ECAL_REQUIRED_VERSION
+	                             libical >= $ICAL_REQUIRED_VERSION
+	                             libedataserver-1.2 >= EDS_REQUIRED_VERSION
+	                             cairo >= CAIRO_REQUIRED_VERSION
+	                             gdk-2.0 >= GDK_REQUIRED_VERSION" 2>&1`
         else
 	        SERVICE_PKG_ERRORS=`$PKG_CONFIG --print-errors "indicator >= $INDICATOR_REQUIRED_VERSION
-                             dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
-                             libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS
-                             gio-2.0 >= $GIO_REQUIRED_VERSION
-                             geoclue >= $GEOCLUE_REQUIRED_VERSION
-                             liboobs-1 >= $OOBS_REQUIRED_VERSION" 2>&1`
+	                             dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
+                                 dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
+	                             libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS
+	                             gio-2.0 >= $GIO_REQUIRED_VERSION
+	                             geoclue >= $GEOCLUE_REQUIRED_VERSION
+	                             liboobs-1 >= $OOBS_REQUIRED_VERSION
+	                             libecal-1.2 >= $ECAL_REQUIRED_VERSION
+	                             libical >= $ICAL_REQUIRED_VERSION
+	                             libedataserver-1.2 >= EDS_REQUIRED_VERSION
+	                             cairo >= CAIRO_REQUIRED_VERSION
+	                             gdk-2.0 >= GDK_REQUIRED_VERSION" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$SERVICE_PKG_ERRORS" >&5
 
 	as_fn_error $? "Package requirements (indicator >= $INDICATOR_REQUIRED_VERSION
-                             dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
-                             libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS
-                             gio-2.0 >= $GIO_REQUIRED_VERSION
-                             geoclue >= $GEOCLUE_REQUIRED_VERSION
-                             liboobs-1 >= $OOBS_REQUIRED_VERSION) were not met:
+	                             dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
+                                 dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
+	                             libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS
+	                             gio-2.0 >= $GIO_REQUIRED_VERSION
+	                             geoclue >= $GEOCLUE_REQUIRED_VERSION
+	                             liboobs-1 >= $OOBS_REQUIRED_VERSION
+	                             libecal-1.2 >= $ECAL_REQUIRED_VERSION
+	                             libical >= $ICAL_REQUIRED_VERSION
+	                             libedataserver-1.2 >= EDS_REQUIRED_VERSION
+	                             cairo >= CAIRO_REQUIRED_VERSION
+	                             gdk-2.0 >= GDK_REQUIRED_VERSION) were not met:
 
 $SERVICE_PKG_ERRORS
 
@@ -12590,6 +12650,203 @@ $as_echo "yes" >&6; }
 
 fi
 
+elif test "x$with_gtk" = x2; then :
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SERVICE" >&5
+$as_echo_n "checking for SERVICE... " >&6; }
+
+if test -n "$SERVICE_CFLAGS"; then
+    pkg_cv_SERVICE_CFLAGS="$SERVICE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"indicator >= \$INDICATOR_REQUIRED_VERSION
+	                             dbusmenu-glib-0.4 >= \$DBUSMENUGLIB_REQUIRED_VERSION
+                                 dbusmenu-gtk-0.4 >= \$DBUSMENUGTK_REQUIRED_VERSION
+	                             libido-0.1 >= \$INDICATOR_DISPLAY_OBJECTS
+	                             gio-2.0 >= \$GIO_REQUIRED_VERSION
+	                             geoclue >= \$GEOCLUE_REQUIRED_VERSION
+	                             liboobs-1 >= \$OOBS_REQUIRED_VERSION
+	                             libecal-1.2 >= \$ECAL_REQUIRED_VERSION
+	                             libical >= \$ICAL_REQUIRED_VERSION
+	                             libedataserver-1.2 >= EDS_REQUIRED_VERSION
+	                             cairo >= CAIRO_REQUIRED_VERSION
+	                             gdk-2.0 >= GDK_REQUIRED_VERSION\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "indicator >= $INDICATOR_REQUIRED_VERSION
+	                             dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
+                                 dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
+	                             libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS
+	                             gio-2.0 >= $GIO_REQUIRED_VERSION
+	                             geoclue >= $GEOCLUE_REQUIRED_VERSION
+	                             liboobs-1 >= $OOBS_REQUIRED_VERSION
+	                             libecal-1.2 >= $ECAL_REQUIRED_VERSION
+	                             libical >= $ICAL_REQUIRED_VERSION
+	                             libedataserver-1.2 >= EDS_REQUIRED_VERSION
+	                             cairo >= CAIRO_REQUIRED_VERSION
+	                             gdk-2.0 >= GDK_REQUIRED_VERSION") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_SERVICE_CFLAGS=`$PKG_CONFIG --cflags "indicator >= $INDICATOR_REQUIRED_VERSION
+	                             dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
+                                 dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
+	                             libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS
+	                             gio-2.0 >= $GIO_REQUIRED_VERSION
+	                             geoclue >= $GEOCLUE_REQUIRED_VERSION
+	                             liboobs-1 >= $OOBS_REQUIRED_VERSION
+	                             libecal-1.2 >= $ECAL_REQUIRED_VERSION
+	                             libical >= $ICAL_REQUIRED_VERSION
+	                             libedataserver-1.2 >= EDS_REQUIRED_VERSION
+	                             cairo >= CAIRO_REQUIRED_VERSION
+	                             gdk-2.0 >= GDK_REQUIRED_VERSION" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$SERVICE_LIBS"; then
+    pkg_cv_SERVICE_LIBS="$SERVICE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"indicator >= \$INDICATOR_REQUIRED_VERSION
+	                             dbusmenu-glib-0.4 >= \$DBUSMENUGLIB_REQUIRED_VERSION
+                                 dbusmenu-gtk-0.4 >= \$DBUSMENUGTK_REQUIRED_VERSION
+	                             libido-0.1 >= \$INDICATOR_DISPLAY_OBJECTS
+	                             gio-2.0 >= \$GIO_REQUIRED_VERSION
+	                             geoclue >= \$GEOCLUE_REQUIRED_VERSION
+	                             liboobs-1 >= \$OOBS_REQUIRED_VERSION
+	                             libecal-1.2 >= \$ECAL_REQUIRED_VERSION
+	                             libical >= \$ICAL_REQUIRED_VERSION
+	                             libedataserver-1.2 >= EDS_REQUIRED_VERSION
+	                             cairo >= CAIRO_REQUIRED_VERSION
+	                             gdk-2.0 >= GDK_REQUIRED_VERSION\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "indicator >= $INDICATOR_REQUIRED_VERSION
+	                             dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
+                                 dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
+	                             libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS
+	                             gio-2.0 >= $GIO_REQUIRED_VERSION
+	                             geoclue >= $GEOCLUE_REQUIRED_VERSION
+	                             liboobs-1 >= $OOBS_REQUIRED_VERSION
+	                             libecal-1.2 >= $ECAL_REQUIRED_VERSION
+	                             libical >= $ICAL_REQUIRED_VERSION
+	                             libedataserver-1.2 >= EDS_REQUIRED_VERSION
+	                             cairo >= CAIRO_REQUIRED_VERSION
+	                             gdk-2.0 >= GDK_REQUIRED_VERSION") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_SERVICE_LIBS=`$PKG_CONFIG --libs "indicator >= $INDICATOR_REQUIRED_VERSION
+	                             dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
+                                 dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
+	                             libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS
+	                             gio-2.0 >= $GIO_REQUIRED_VERSION
+	                             geoclue >= $GEOCLUE_REQUIRED_VERSION
+	                             liboobs-1 >= $OOBS_REQUIRED_VERSION
+	                             libecal-1.2 >= $ECAL_REQUIRED_VERSION
+	                             libical >= $ICAL_REQUIRED_VERSION
+	                             libedataserver-1.2 >= EDS_REQUIRED_VERSION
+	                             cairo >= CAIRO_REQUIRED_VERSION
+	                             gdk-2.0 >= GDK_REQUIRED_VERSION" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        SERVICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "indicator >= $INDICATOR_REQUIRED_VERSION
+	                             dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
+                                 dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
+	                             libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS
+	                             gio-2.0 >= $GIO_REQUIRED_VERSION
+	                             geoclue >= $GEOCLUE_REQUIRED_VERSION
+	                             liboobs-1 >= $OOBS_REQUIRED_VERSION
+	                             libecal-1.2 >= $ECAL_REQUIRED_VERSION
+	                             libical >= $ICAL_REQUIRED_VERSION
+	                             libedataserver-1.2 >= EDS_REQUIRED_VERSION
+	                             cairo >= CAIRO_REQUIRED_VERSION
+	                             gdk-2.0 >= GDK_REQUIRED_VERSION" 2>&1`
+        else
+	        SERVICE_PKG_ERRORS=`$PKG_CONFIG --print-errors "indicator >= $INDICATOR_REQUIRED_VERSION
+	                             dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
+                                 dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
+	                             libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS
+	                             gio-2.0 >= $GIO_REQUIRED_VERSION
+	                             geoclue >= $GEOCLUE_REQUIRED_VERSION
+	                             liboobs-1 >= $OOBS_REQUIRED_VERSION
+	                             libecal-1.2 >= $ECAL_REQUIRED_VERSION
+	                             libical >= $ICAL_REQUIRED_VERSION
+	                             libedataserver-1.2 >= EDS_REQUIRED_VERSION
+	                             cairo >= CAIRO_REQUIRED_VERSION
+	                             gdk-2.0 >= GDK_REQUIRED_VERSION" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$SERVICE_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (indicator >= $INDICATOR_REQUIRED_VERSION
+	                             dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
+                                 dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
+	                             libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS
+	                             gio-2.0 >= $GIO_REQUIRED_VERSION
+	                             geoclue >= $GEOCLUE_REQUIRED_VERSION
+	                             liboobs-1 >= $OOBS_REQUIRED_VERSION
+	                             libecal-1.2 >= $ECAL_REQUIRED_VERSION
+	                             libical >= $ICAL_REQUIRED_VERSION
+	                             libedataserver-1.2 >= EDS_REQUIRED_VERSION
+	                             cairo >= CAIRO_REQUIRED_VERSION
+	                             gdk-2.0 >= GDK_REQUIRED_VERSION) were not met:
+
+$SERVICE_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables SERVICE_CFLAGS
+and SERVICE_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables SERVICE_CFLAGS
+and SERVICE_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5 ; }
+else
+	SERVICE_CFLAGS=$pkg_cv_SERVICE_CFLAGS
+	SERVICE_LIBS=$pkg_cv_SERVICE_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "Value for --with-gtk was neither 2 nor 3
+See \`config.log' for more details" "$LINENO" 5 ; }
+
+fi
 
 
 
@@ -14158,7 +14415,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by indicator-datetime $as_me 0.1.92, which was
+This file was extended by indicator-datetime $as_me 0.1.93, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14224,7 +14481,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-indicator-datetime config.status 0.1.92
+indicator-datetime config.status 0.1.93
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index b5b1781..9aedb49 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
 
-AC_INIT(indicator-datetime, 0.1.92, ted@canonical.com)
+AC_INIT(indicator-datetime, 0.1.93, ted@canonical.com)
 AC_COPYRIGHT([Copyright 2009,2010 Canonical])
 
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-datetime, 0.1.92)
+AM_INIT_AUTOMAKE(indicator-datetime, 0.1.93)
 
 AM_MAINTAINER_MODE
 
diff --git a/debian/changelog b/debian/changelog
index aca05e3..63cb9b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
-indicator-datetime (0.1.92-0ubuntu4+r41) UNRELEASED; urgency=low
+indicator-datetime (0.1.93-0ubuntu1) natty; urgency=low
 
-  * New upstream snapshot
+  * New upstream release.
+    * Merging in first EDS branch
+  * debian/rules: Adding in autoreconf 
+
+  [ Ken VanDine ]
   * debian/control
     - New build deps for eds integration, libecal1.2-dev, libical-dev, 
       libgtk2.0-dev, libcairo2-dev, libedataserver1.2-dev
 
- -- Ken VanDine <ken.vandine@canonical.com>  Wed, 09 Feb 2011 12:11:45 -0500
+ -- Ted Gould <ted@ubuntu.com>  Wed, 09 Feb 2011 13:25:57 -0600
 
 indicator-datetime (0.1.92-0ubuntu4) natty; urgency=low
 
@@ -52,24 +56,6 @@ indicator-datetime (0.1.91-0ubuntu1~ppa1) natty; urgency=low
 
  -- Ted Gould <ted@ubuntu.com>  Thu, 27 Jan 2011 16:48:48 -0600
 
-indicator-datetime (0.1.90-0ubuntu2) natty; urgency=low
-
-  * debian/control
-    - Bump build depends for libdbusmenu-* to >= 0.3.90
-
- -- Ken VanDine <ken.vandine@canonical.com>  Thu, 09 Dec 2010 11:46:00 -0500
-
-indicator-datetime (0.1.90-0ubuntu1) natty; urgency=low
-
-  * New upstream release.
-    * Generate the format string at init
-    * Add in Geoclue support for setting proper timezone
-    * Add support for building GTK2 and GTK3 versions
-  * debian/control: Add recommends for geoclue-ubuntu-geoip
-  * debian/control: Adding dependencies on Geoclue and OOBS
-
- -- Ted Gould <ted@ubuntu.com>  Fri, 03 Dec 2010 13:46:32 -0600
-
 indicator-datetime (0.1.90.is.0.0.6-0ubuntu2) natty; urgency=low
 
   * Merged gdbus and dbusmenu-glib-0.4 port
@@ -88,6 +74,24 @@ indicator-datetime (0.1.90.is.0.0.6-0ubuntu1) natty; urgency=low
 
  -- Ken VanDine <ken.vandine@canonical.com>  Mon, 13 Dec 2010 11:30:25 -0500
 
+indicator-datetime (0.1.90-0ubuntu2) natty; urgency=low
+
+  * debian/control
+    - Bump build depends for libdbusmenu-* to >= 0.3.90
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Thu, 09 Dec 2010 11:46:00 -0500
+
+indicator-datetime (0.1.90-0ubuntu1) natty; urgency=low
+
+  * New upstream release.
+    * Generate the format string at init
+    * Add in Geoclue support for setting proper timezone
+    * Add support for building GTK2 and GTK3 versions
+  * debian/control: Add recommends for geoclue-ubuntu-geoip
+  * debian/control: Adding dependencies on Geoclue and OOBS
+
+ -- Ted Gould <ted@ubuntu.com>  Fri, 03 Dec 2010 13:46:32 -0600
+
 indicator-datetime (0.0.6-0ubuntu3) maverick; urgency=low
 
   * Cherry-picked from upstream:
diff --git a/debian/control b/debian/control
index 06e1ec6..25f13c6 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,8 @@ Build-Depends: cdbs,
                libical-dev (>= 0.44),
                libgtk2.0-dev (>= 2.22),
                libcairo2-dev (>= 1.10),
-               libedataserver1.2-dev (>= 2.30)
+               libedataserver1.2-dev (>= 2.30),
+               dh-autoreconf
 Standards-Version: 3.9.1
 Homepage: https://launchpad.net/indicator-datetime
 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-datetime/ubuntu