diff options
| -rw-r--r-- | ChangeLog | 92 | ||||
| -rwxr-xr-x | configure | 115 | ||||
| -rw-r--r-- | debian/changelog | 35 |
3 files changed, 180 insertions, 62 deletions
@@ -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 @@ -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='' @@ -1482,7 +1482,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]... @@ -1553,7 +1553,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 @@ -1666,14 +1666,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 @@ -2039,7 +2039,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 $@ @@ -2853,7 +2853,7 @@ fi # Define the identity of the package. PACKAGE=indicator-datetime - VERSION=0.0.3 + VERSION=0.0.4 cat >>confdefs.h <<_ACEOF @@ -8700,10 +8700,6 @@ _lt_linker_boilerplate=`cat conftest.err` $RM -r conftest* -## CAVEAT EMPTOR: -## There is no encapsulation within the following macros, do not change -## the running order or otherwise move them around unless you know exactly -## what you are doing... if test -n "$compiler"; then lt_prog_compiler_no_builtin_flag= @@ -8729,11 +8725,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8732: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8728: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8736: \$? = $ac_status" >&5 + echo "$as_me:8732: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9068,11 +9064,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9071: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9067: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9075: \$? = $ac_status" >&5 + echo "$as_me:9071: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9173,11 +9169,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9176: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9172: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9180: \$? = $ac_status" >&5 + echo "$as_me:9176: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9228,11 +9224,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9231: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9227: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9235: \$? = $ac_status" >&5 + echo "$as_me:9231: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11612,7 +11608,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11615 "configure" +#line 11611 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11708,7 +11704,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11711 "configure" +#line 11707 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12414,10 +12410,55 @@ $as_echo "no" >&6; } fi gsettingsschemadir=${datadir}/glib-2.0/schemas - GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0` + if test x$cross_compiling != xyes; then + GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0` + else + # Extract the first word of "glib-compile-schemas", so it can be a program name with args. +set dummy glib-compile-schemas; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_GLIB_COMPILE_SCHEMAS+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + case $GLIB_COMPILE_SCHEMAS in + [\\/]* | ?:[\\/]*) + ac_cv_path_GLIB_COMPILE_SCHEMAS="$GLIB_COMPILE_SCHEMAS" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GLIB_COMPILE_SCHEMAS="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +GLIB_COMPILE_SCHEMAS=$ac_cv_path_GLIB_COMPILE_SCHEMAS +if test -n "$GLIB_COMPILE_SCHEMAS"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_COMPILE_SCHEMAS" >&5 +$as_echo "$GLIB_COMPILE_SCHEMAS" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + fi if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then as_fn_error "glib-compile-schemas not found." "$LINENO" 5 + else + : fi GSETTINGS_RULES=' @@ -12425,8 +12466,10 @@ fi mostlyclean-am: clean-gsettings-schemas -%.gschema.valid: %.gschema.xml - $(AM_V_GEN) if test -f "$^"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --dry-run --schema-file=$${d}$^ && touch $@ +gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE)) + +%.gschema.valid: %.gschema.xml $(gsettings__enum_file) + $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch $@ all-am: $(gsettings_SCHEMAS:.xml=.valid) uninstall-am: uninstall-gsettings-schemas @@ -12438,10 +12481,10 @@ gsettings__base_list = \ sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \ sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g" -install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) +install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) @$(NORMAL_INSTALL) test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)" - @list='\''$(gsettings_SCHEMAS)'\''; test -n "$(gsettingsschemadir)" || list=; \ + @list='\''$(gsettings__enum_file) $(gsettings_SCHEMAS)'\''; test -n "$(gsettingsschemadir)" || list=; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -12454,16 +12497,20 @@ install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) uninstall-gsettings-schemas: @$(NORMAL_UNINSTALL) - @list='\''$(gsettings_SCHEMAS)'\''; test -n "$(gsettingsschemadir)" || list=; \ + @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \ test -n "$$files" || exit 0; \ echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files - test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) --uninstall $(gsettingsschemadir) + test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) clean-gsettings-schemas: - rm -f $(gsettings_SCHEMAS:.xml=.valid) + rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) +ifdef gsettings_ENUM_NAMESPACE +$(gsettings__enum_file): $(gsettings_ENUM_FILES) + $(AM_V_GEN) glib-mkenums --comments '\''<!-- @comment@ -->'\'' --fhead "<schemalist>" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " <value nick='\''@valuenick@'\'' value='\''@valuenum@'\''/>" --vtail " </@type@>" --ftail "</schemalist>" $(gsettings_ENUM_FILES) > $@.tmp && mv $@.tmp $@ +endif ' @@ -13785,7 +13832,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 @@ -13851,7 +13898,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/debian/changelog b/debian/changelog index e37bdbd..25719dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,40 +1,19 @@ -indicator-datetime (0.0.3-0ubuntu2~ppa1~confmat4) lucid; urgency=low +indicator-datetime (0.0.4-0ubuntu2~ppa1) UNRELEASED; urgency=low * Upstream Merge - * Whew. Now it does everything, just choose your format! - - -- Ted Gould <ted@ubuntu.com> Fri, 16 Jul 2010 17:03:43 -0500 - -indicator-datetime (0.0.3-0ubuntu2~ppa1~confmat3) lucid; urgency=low - - * Upstream Merge - * Moving around the preferences to have something more flexible - and updating code. - - -- Ted Gould <ted@ubuntu.com> Thu, 15 Jul 2010 21:26:56 -0500 - -indicator-datetime (0.0.3-0ubuntu2~ppa1~confmat2) lucid; urgency=low - - * Rebuilding for new glib - - -- Ted Gould <ted@ubuntu.com> Wed, 14 Jul 2010 11:32:34 -0500 - -indicator-datetime (0.0.3-0ubuntu2~ppa1~confmat1) lucid; urgency=low - - * Merge upstream - * Adding in GSettings for configuring the format on the panel. + * Making time format configurable via translations and + gsettings. * debian/control: Adding in a glib dependency to get gsettings * Autogen update - -- Ted Gould <ted@ubuntu.com> Wed, 14 Jul 2010 11:31:28 -0500 + -- Ted Gould <ted@ubuntu.com> Mon, 19 Jul 2010 07:50:10 -0500 -indicator-datetime (0.0.3-0ubuntu2~ppa1~service1) lucid; urgency=low +indicator-datetime (0.0.4-0ubuntu1) maverick; urgency=low - * Merge upstream + * New upstream release. * Change menus to come from the service - * Autogen update - -- Ted Gould <ted@ubuntu.com> Mon, 12 Jul 2010 16:02:10 -0500 + -- Ted Gould <ted@ubuntu.com> Thu, 15 Jul 2010 10:33:14 -0500 indicator-datetime (0.0.3-0ubuntu1) maverick; urgency=low |