New upstream release.

4 files changed, 110 insertions, 19 deletions

diff --git a/ChangeLog b/ChangeLog
index af9b92a..da21573 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,97 @@
 # Generated by Makefile. Do not edit.
 
+2010-07-13  Ted Gould  <ted@gould.cx>
+
+	Adjusting indicator to be service based.
+
+2010-07-12  Ted Gould  <ted@gould.cx>
+
+	Update to trunk to resolve conflicts
+
+2010-07-12  Ted Gould  <ted@gould.cx>
+
+	Legal stuffs
+
+2010-07-12  Ted Gould  <ted@gould.cx>
+
+	Adding a check for dbusmenu gtk as well.
+
+2010-07-12  Ted Gould  <ted@gould.cx>
+
+	Setting up checking for time-admin as well.
+
+2010-07-12  Ted Gould  <ted@gould.cx>
+
+	Removing some now service provided code.
+
+2010-07-12  Ted Gould  <ted@gould.cx>
+
+	Setting up the update of the label for the date.
+
+2010-07-12  Ted Gould  <ted@gould.cx>
+
+	Adding some good debugging messages.
+
+2010-07-12  Ted Gould  <ted@gould.cx>
+
+	Adding in a check for the calendar application.
+
+2010-07-07  Ted Gould  <ted@gould.cx>
+
+	Ignoring the generated service file.
+
+2010-07-07  Ted Gould  <ted@gould.cx>
+
+	Activating the settings
+
+2010-07-07  Ted Gould  <ted@gould.cx>
+
+	Making the separator and the settings item.
+
+2010-07-07  Ted Gould  <ted@gould.cx>
+
+	Make date and time menu items.
+
+2010-05-19  Ted Gould  <ted@gould.cx>
+
+	Comments
+
+2010-05-19  Ted Gould  <ted@gould.cx>
+
+	Now we have a menu, whoo ha! 
+
+2010-05-19  Ted Gould  <ted@gould.cx>
+
+	Switching the menu to be from the service.
+
+2010-05-18  Ted Gould  <ted@gould.cx>
+
+	Adding a service manager to start the service.
+
+2010-05-18  Ted Gould  <ted@gould.cx>
+
+	Building the basic service structure
+
+2010-05-18  Ted Gould  <ted@gould.cx>
+
+	Adding a shared version number
+
+2010-05-18  Ted Gould  <ted@gould.cx>
+
+	Deping on the header
+
+2010-05-18  Ted Gould  <ted@gould.cx>
+
+	Some shared names for our dbus stuff
+
+2010-05-18  Ted Gould  <ted@gould.cx>
+
+	Adding a dbus service file.
+
+2010-06-03  Ted Gould  <ted@gould.cx>
+
+	0.0.3
+
 2010-06-03  Ted Gould  <ted@gould.cx>
 
 	Adding copyright headers
diff --git a/configure b/configure
index 321a6be..867e5ee 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.65 for indicator-datetime 0.0.3.
+# Generated by GNU Autoconf 2.65 for indicator-datetime 0.0.4.
 #
 # Report bugs to <ted@canonical.com>.
 #
@@ -13,7 +13,7 @@
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 #
-# Copyright 2009 Canonical
+# Copyright 2009,2010 Canonical
 ## -------------------- ##
 ## M4sh Initialization. ##
 ## -------------------- ##
@@ -703,8 +703,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='indicator-datetime'
 PACKAGE_TARNAME='indicator-datetime'
-PACKAGE_VERSION='0.0.3'
-PACKAGE_STRING='indicator-datetime 0.0.3'
+PACKAGE_VERSION='0.0.4'
+PACKAGE_STRING='indicator-datetime 0.0.4'
 PACKAGE_BUGREPORT='ted@canonical.com'
 PACKAGE_URL=''
 
@@ -1477,7 +1477,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.0.3 to adapt to many kinds of systems.
+\`configure' configures indicator-datetime 0.0.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1548,7 +1548,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of indicator-datetime 0.0.3:";;
+     short | recursive ) echo "Configuration of indicator-datetime 0.0.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1659,14 +1659,14 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-indicator-datetime configure 0.0.3
+indicator-datetime configure 0.0.4
 generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 
-Copyright 2009 Canonical
+Copyright 2009,2010 Canonical
 _ACEOF
   exit
 fi
@@ -2032,7 +2032,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.0.3, which was
+It was created by indicator-datetime $as_me 0.0.4, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
@@ -2846,7 +2846,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=indicator-datetime
- VERSION=0.0.3
+ VERSION=0.0.4
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13572,7 +13572,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.0.3, which was
+This file was extended by indicator-datetime $as_me 0.0.4, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -13638,7 +13638,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.0.3
+indicator-datetime config.status 0.0.4
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 9bf0a3c..fdc85c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
 
-AC_INIT(indicator-datetime, 0.0.3, ted@canonical.com)
-AC_COPYRIGHT([Copyright 2009 Canonical])
+AC_INIT(indicator-datetime, 0.0.4, ted@canonical.com)
+AC_COPYRIGHT([Copyright 2009,2010 Canonical])
 
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-datetime, 0.0.3)
+AM_INIT_AUTOMAKE(indicator-datetime, 0.0.4)
 
 AM_MAINTAINER_MODE
 
diff --git a/debian/changelog b/debian/changelog
index d0e92e2..40c0bd0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,9 @@
-indicator-datetime (0.0.3-0ubuntu2~ppa1) lucid; urgency=low
+indicator-datetime (0.0.4-0ubuntu1~ppa1) UNRELEASED; urgency=low
 
-  * Merge upstream
+  * New upstream release.
     * Change menus to come from the service
-  * Autogen update
 
- -- Ted Gould <ted@ubuntu.com>  Tue, 13 Jul 2010 11:10:26 -0500
+ -- Ted Gould <ted@ubuntu.com>  Thu, 15 Jul 2010 10:32:12 -0500
 
 indicator-datetime (0.0.3-0ubuntu1) maverick; urgency=low