diff options
| author | Ted Gould <ted@gould.cx> | 2011-01-27 16:42:22 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-01-27 16:42:22 -0600 |
| commit | 28f84ee512a35e2b04b211b7c1705a6eef4368ab (patch) | |
| tree | c4594e72d714db7fd1d688844f3b3f63b3cbc1c7 /data | |
| parent | 8e1fbde30cfce799b64477113b404d5cda3306aa (diff) | |
| parent | aaae5863299681153898d4e701f44aed85c780e9 (diff) | |
| download | ayatana-indicator-datetime-28f84ee512a35e2b04b211b7c1705a6eef4368ab.tar.gz ayatana-indicator-datetime-28f84ee512a35e2b04b211b7c1705a6eef4368ab.tar.bz2 ayatana-indicator-datetime-28f84ee512a35e2b04b211b7c1705a6eef4368ab.zip | |
Import upstream version 0.1.91
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.am | 2 | ||||
| -rw-r--r-- | data/Makefile.in | 7 | ||||
| -rw-r--r-- | data/com.canonical.indicator.datetime.gschema.xml (renamed from data/org.ayatana.indicator.datetime.gschema.xml) | 4 | ||||
| -rw-r--r-- | data/indicator-datetime.service.in | 2 |
4 files changed, 6 insertions, 9 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 0e8dec3..de417b2 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,7 +1,7 @@ #SUBDIRS = icons gsettings_SCHEMAS = \ - org.ayatana.indicator.datetime.gschema.xml + com.canonical.indicator.datetime.gschema.xml @GSETTINGS_RULES@ dbus_servicesdir = $(DBUSSERVICEDIR) diff --git a/data/Makefile.in b/data/Makefile.in index 27596cb..2f3399f 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -39,10 +39,7 @@ host_triplet = @host@ 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 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -234,7 +231,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ gsettings_SCHEMAS = \ - org.ayatana.indicator.datetime.gschema.xml + com.canonical.indicator.datetime.gschema.xml dbus_servicesdir = $(DBUSSERVICEDIR) dbus_services_DATA = indicator-datetime.service diff --git a/data/org.ayatana.indicator.datetime.gschema.xml b/data/com.canonical.indicator.datetime.gschema.xml index c794d83..fe493f7 100644 --- a/data/org.ayatana.indicator.datetime.gschema.xml +++ b/data/com.canonical.indicator.datetime.gschema.xml @@ -5,7 +5,7 @@ <value nick="24-hour" value="2" /> <value nick="custom" value="3" /> </enum> - <schema id="org.ayatana.indicator.datetime" path="/apps/indicators/datetime/" gettext-domain="indicator-datetime"> + <schema id="com.canonical.indicator.datetime" path="/com/canonical/indicator/datetime/" gettext-domain="indicator-datetime"> <key name="time-format" enum="time-enum"> <default>'locale-default'</default> <summary>What the time format should be</summary> @@ -13,7 +13,7 @@ Controls the time format that is displayed in the indicator. For almost all users this should be the default for their locale. If you think the setting is wrong for your locale please join or talk to the translation - team for your langauge. If you just want something different you can + team for your language. If you just want something different you can adjust this to be either 12 or 24 time. Or, you can use a custom format string and set the custom-time-format setting. </description> diff --git a/data/indicator-datetime.service.in b/data/indicator-datetime.service.in index bcb70e3..e7735ce 100644 --- a/data/indicator-datetime.service.in +++ b/data/indicator-datetime.service.in @@ -1,3 +1,3 @@ [D-BUS Service] -Name=org.ayatana.indicator.datetime +Name=com.canonical.indicator.datetime Exec=@libexecdir@/indicator-datetime-service |