aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-08-13 14:38:39 -0500
committerTed Gould <ted@gould.cx>2010-08-13 14:38:39 -0500
commit45fc7d96061fda667fe12ee1b00d869e6373d4d5 (patch)
tree16051e231618127c4fc4124709a271b510e28013 /data
parent91c8163bb8d2adb3c07047d25d53240a09432bb7 (diff)
parentba5b85a76a469fb5fa860a723ffd09c939bc7f0e (diff)
downloadayatana-indicator-application-45fc7d96061fda667fe12ee1b00d869e6373d4d5.tar.gz
ayatana-indicator-application-45fc7d96061fda667fe12ee1b00d869e6373d4d5.tar.bz2
ayatana-indicator-application-45fc7d96061fda667fe12ee1b00d869e6373d4d5.zip
* Upstream Merge
* Updating to trunk * Fixing application list
Diffstat (limited to 'data')
-rw-r--r--data/Makefile.am10
-rw-r--r--data/ordering-override.keyfile2
2 files changed, 10 insertions, 2 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index cc1961b..c142c4e 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -5,7 +5,13 @@ dbus_services_DATA = indicator-application.service
%.service: %.service.in
sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-EXTRA_DIST = indicator-application.service.in
+overridedir = $(pkgdatadir)
+override_DATA = ordering-override.keyfile
-CLEANFILES = indicator-application.service
+EXTRA_DIST = \
+ indicator-application.service.in \
+ ordering-override.keyfile
+
+CLEANFILES = \
+ indicator-application.service
diff --git a/data/ordering-override.keyfile b/data/ordering-override.keyfile
new file mode 100644
index 0000000..dcfb75b
--- /dev/null
+++ b/data/ordering-override.keyfile
@@ -0,0 +1,2 @@
+[Ordering Index Overrides]
+gnome-power-manager=1