diff options
author | Sense Egbert Hofstede <sense@ubuntu.com> | 2010-08-24 16:04:05 +0200 |
---|---|---|
committer | Sense Egbert Hofstede <sense@ubuntu.com> | 2010-08-24 16:04:05 +0200 |
commit | c553ba560850d76ee92d705bfc37a0fa39a37d72 (patch) | |
tree | 1e7542e2f2768bf97fbe65a7a6efc6d243863166 /data | |
parent | 1a0c666b3461d13265a52d35e38d260d975f02aa (diff) | |
parent | b51c1debf9807ad357564975c394badbafccaa1b (diff) | |
download | libayatana-appindicator-c553ba560850d76ee92d705bfc37a0fa39a37d72.tar.gz libayatana-appindicator-c553ba560850d76ee92d705bfc37a0fa39a37d72.tar.bz2 libayatana-appindicator-c553ba560850d76ee92d705bfc37a0fa39a37d72.zip |
Merging with trunk
Diffstat (limited to 'data')
-rw-r--r-- | data/Makefile.am | 10 | ||||
-rw-r--r-- | data/ordering-override.keyfile | 2 |
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 |