aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2013-06-21 15:01:54 +0000
committerTarmac <Unknown>2013-06-21 15:01:54 +0000
commit854fb1a47bed41e41e6fed9c5e498dc81146302a (patch)
treec0db59a66b90162a7f8ae2519430249ce5a5ffb6 /data
parent05ba6fa097260473c774d0d077d4e3add3db134b (diff)
parent51bd7465ac148a34ec37cb8760daf3b282b5ed6a (diff)
downloadayatana-indicator-datetime-854fb1a47bed41e41e6fed9c5e498dc81146302a.tar.gz
ayatana-indicator-datetime-854fb1a47bed41e41e6fed9c5e498dc81146302a.tar.bz2
ayatana-indicator-datetime-854fb1a47bed41e41e6fed9c5e498dc81146302a.zip
This push extracts geoclue to its own self-contained module, fixes an errant g_critical, and merges ryan's timedate1 changes from the 13.04 branch.
Approved by PS Jenkins bot, Lars Uebernickel.
Diffstat (limited to 'data')
-rw-r--r--data/Makefile.am61
-rw-r--r--data/com.canonical.indicator.datetime9
2 files changed, 45 insertions, 25 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 91a49d7..1a33447 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,34 +1,45 @@
-#SUBDIRS = icons
+BUILT_SOURCES=
+CLEANFILES=
+EXTRA_DIST=
-gsettings_SCHEMAS = \
- com.canonical.indicator.datetime.gschema.xml
-@GSETTINGS_RULES@
+#
+# the indicator bus file
+#
-dbus_servicesdir = $(DBUSSERVICEDIR)
-dbus_services_DATA = indicator-datetime.service
+indicatorsdir = $(prefix)/share/unity/indicators
+dist_indicators_DATA = com.canonical.indicator.datetime
-%.service: %.service.in
- sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+#
+# the gsettings
+#
-EXTRA_DIST = \
- $(gsettings_SCHEMAS) \
- indicator-datetime.service.in
-
-CLEANFILES = indicator-datetime.service
+gsettings_SCHEMAS = com.canonical.indicator.datetime.gschema.xml
+@GSETTINGS_RULES@
+EXTRA_DIST += $(gsettings_SCHEMAS)
-if BUILD_CCPANEL
-pkgdata_DATA = datetime-dialog.ui
+#
+# the dbus service file
+#
-@INTLTOOL_DESKTOP_RULE@
-desktopdir = $(datadir)/applications
-desktop_DATA = gnome-indicator-datetime-panel.desktop
+dbus_servicesdir = $(DBUSSERVICEDIR)
+dbus_services_DATA = indicator-datetime.service
+dbus_services_in = $(dbus_services_DATA:.service=.service.in)
+$(dbus_services_DATA): $(dbus_services_in)
+ $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+BUILT_SOURCES += $(dbus_services_DATA)
+CLEANFILES += $(dbus_services_DATA)
+EXTRA_DIST += $(dbus_services_in)
-EXTRA_DIST += \
- gnome-indicator-datetime-panel.desktop
+#
+# the gnome-control-center panel
+#
-CLEANFILES += gnome-indicator-datetime-panel.desktop
+if BUILD_CCPANEL
+ pkgdata_DATA = datetime-dialog.ui
+ @INTLTOOL_DESKTOP_RULE@
+ desktopdir = $(datadir)/applications
+ desktop_DATA = gnome-indicator-datetime-panel.desktop
+ EXTRA_DIST += $(desktop_DATA)
+ CLEANFILES += $(desktop_DATA)
endif
-
-EXTRA_DIST += \
- datetime-dialog.ui \
- gnome-indicator-datetime-panel.desktop.in
+EXTRA_DIST += datetime-dialog.ui $(desktop_DATA:.desktop=.desktop.in)
diff --git a/data/com.canonical.indicator.datetime b/data/com.canonical.indicator.datetime
new file mode 100644
index 0000000..055ea8e
--- /dev/null
+++ b/data/com.canonical.indicator.datetime
@@ -0,0 +1,9 @@
+[Indicator Service]
+Name=indicator-datetime
+ObjectPath=/com/canonical/indicator/datetime
+
+[desktop]
+ObjectPath=/com/canonical/indicator/datetime/desktop
+
+[greeter]
+ObjectPath=/com/canonical/indicator/datetime/greeter