aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-08-10 21:26:08 -0500
committerTed Gould <ted@gould.cx>2010-08-10 21:26:08 -0500
commit21fcf7a390364a622f3f51d529f33603983a78e8 (patch)
treed6bb72442c33caac9966fe02b652393c7ab485af /data
parent1c31b31680c5664bb2034f1c4374312b57f29ea7 (diff)
parent51de4ced42e132fa3a66a2739e8a3ba861842467 (diff)
downloadayatana-indicator-application-21fcf7a390364a622f3f51d529f33603983a78e8.tar.gz
ayatana-indicator-application-21fcf7a390364a622f3f51d529f33603983a78e8.tar.bz2
ayatana-indicator-application-21fcf7a390364a622f3f51d529f33603983a78e8.zip
* Upstream Merge
* Adding in override files for the ordering IDs
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..6665b7a
--- /dev/null
+++ b/data/ordering-override.keyfile
@@ -0,0 +1,2 @@
+[Ordering Index Overides]
+gnome-power-manager=1