diff options
author | Sebastien Bacher <seb128@ubuntu.com> | 2012-02-20 19:40:49 +0100 |
---|---|---|
committer | Sebastien Bacher <seb128@ubuntu.com> | 2012-02-20 19:40:49 +0100 |
commit | 39bc08ed8c8c3d1be351c2642c8e2eb572a3061c (patch) | |
tree | e3fc866a6652806755760ba51dd31812299a6478 /data | |
parent | 4a2175798e434a4e33def2f30e15b49714eab33b (diff) | |
parent | ade1e121d41dd07ccc81a641862d81798e38b145 (diff) | |
download | ayatana-indicator-datetime-39bc08ed8c8c3d1be351c2642c8e2eb572a3061c.tar.gz ayatana-indicator-datetime-39bc08ed8c8c3d1be351c2642c8e2eb572a3061c.tar.bz2 ayatana-indicator-datetime-39bc08ed8c8c3d1be351c2642c8e2eb572a3061c.zip |
releasing version 0.3.90-0ubuntu1
Diffstat (limited to 'data')
-rw-r--r-- | data/Makefile.am | 22 | ||||
-rw-r--r-- | data/Makefile.in | 85 | ||||
-rw-r--r-- | data/indicator-datetime-preferences.desktop | 16 |
3 files changed, 67 insertions, 56 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index b9a9532..6d4dd72 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -10,17 +10,25 @@ dbus_services_DATA = indicator-datetime.service %.service: %.service.in sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ +EXTRA_DIST = \ + $(gsettings_SCHEMAS) \ + indicator-datetime.service.in + +CLEANFILES = indicator-datetime.service + +if BUILD_CCPANEL pkgdata_DATA = datetime-dialog.ui @INTLTOOL_DESKTOP_RULE@ desktopdir = $(datadir)/applications desktop_DATA = indicator-datetime-preferences.desktop -EXTRA_DIST = \ - $(gsettings_SCHEMAS) \ - datetime-dialog.ui \ - indicator-datetime-preferences.desktop \ - indicator-datetime-preferences.desktop.in \ - indicator-datetime.service.in +EXTRA_DIST += \ + indicator-datetime-preferences.desktop -CLEANFILES = indicator-datetime-preferences.desktop indicator-datetime.service +CLEANFILES += indicator-datetime-preferences.desktop +endif + +EXTRA_DIST += \ + datetime-dialog.ui \ + indicator-datetime-preferences.desktop.in diff --git a/data/Makefile.in b/data/Makefile.in index 31b596b..887ec42 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -36,24 +36,29 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +@BUILD_CCPANEL_TRUE@am__append_1 = \ +@BUILD_CCPANEL_TRUE@ indicator-datetime-preferences.desktop + +@BUILD_CCPANEL_TRUE@am__append_2 = indicator-datetime-preferences.desktop subdir = data DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/gcov.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -78,6 +83,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(dbus_servicesdir)" \ "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(pkgdatadir)" DATA = $(dbus_services_DATA) $(desktop_DATA) $(pkgdata_DATA) @@ -97,6 +108,9 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CCPANELDIR = @CCPANELDIR@ CFLAGS = @CFLAGS@ +COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +COVERAGE_CXXFLAGS = @COVERAGE_CXXFLAGS@ +COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -113,6 +127,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GCOVR = @GCOVR@ +GENHTML = @GENHTML@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ @@ -137,6 +153,11 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBMAP_CFLAGS = @LIBMAP_CFLAGS@ @@ -184,6 +205,7 @@ SERVICE_CFLAGS = @SERVICE_CFLAGS@ SERVICE_LIBS = @SERVICE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SHTOOL = @SHTOOL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -222,6 +244,8 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -246,17 +270,13 @@ gsettings_SCHEMAS = \ dbus_servicesdir = $(DBUSSERVICEDIR) dbus_services_DATA = indicator-datetime.service -pkgdata_DATA = datetime-dialog.ui -desktopdir = $(datadir)/applications -desktop_DATA = indicator-datetime-preferences.desktop -EXTRA_DIST = \ - $(gsettings_SCHEMAS) \ - datetime-dialog.ui \ - indicator-datetime-preferences.desktop \ - indicator-datetime-preferences.desktop.in \ - indicator-datetime.service.in - -CLEANFILES = indicator-datetime-preferences.desktop indicator-datetime.service +EXTRA_DIST = $(gsettings_SCHEMAS) indicator-datetime.service.in \ + $(am__append_1) datetime-dialog.ui \ + indicator-datetime-preferences.desktop.in +CLEANFILES = indicator-datetime.service $(am__append_2) +@BUILD_CCPANEL_TRUE@pkgdata_DATA = datetime-dialog.ui +@BUILD_CCPANEL_TRUE@desktopdir = $(datadir)/applications +@BUILD_CCPANEL_TRUE@desktop_DATA = indicator-datetime-preferences.desktop all: all-am .SUFFIXES: @@ -313,9 +333,7 @@ uninstall-dbus_servicesDATA: @$(NORMAL_UNINSTALL) @list='$(dbus_services_DATA)'; test -n "$(dbus_servicesdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(dbus_servicesdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(dbus_servicesdir)" && rm -f $$files + dir='$(DESTDIR)$(dbus_servicesdir)'; $(am__uninstall_files_from_dir) install-desktopDATA: $(desktop_DATA) @$(NORMAL_INSTALL) test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)" @@ -333,9 +351,7 @@ uninstall-desktopDATA: @$(NORMAL_UNINSTALL) @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(desktopdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(desktopdir)" && rm -f $$files + dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir) install-pkgdataDATA: $(pkgdata_DATA) @$(NORMAL_INSTALL) test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" @@ -353,9 +369,7 @@ uninstall-pkgdataDATA: @$(NORMAL_UNINSTALL) @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files + dir='$(DESTDIR)$(pkgdatadir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: @@ -410,10 +424,15 @@ install-am: all-am installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -515,7 +534,7 @@ uninstall-am: uninstall-dbus_servicesDATA uninstall-desktopDATA \ %.service: %.service.in sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ -@INTLTOOL_DESKTOP_RULE@ +@BUILD_CCPANEL_TRUE@@INTLTOOL_DESKTOP_RULE@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/data/indicator-datetime-preferences.desktop b/data/indicator-datetime-preferences.desktop deleted file mode 100644 index 8231e22..0000000 --- a/data/indicator-datetime-preferences.desktop +++ /dev/null @@ -1,16 +0,0 @@ -[Desktop Entry] -Version=1.0 - -Name=Time & Date -Comment=Change your clock and date settings - -Icon=preferences-system-time -TryExec=gnome-control-center -Exec=gnome-control-center indicator-datetime - -StartupNotify=true - -Type=Application -Categories=GNOME;GTK;Utility;DesktopSettings;Settings;X-GNOME-SystemSettings;X-GNOME-Settings-Panel; -X-GNOME-Settings-Panel=indicator-datetime -OnlyShowIn=Unity; |