diff options
| author | Ken VanDine <ken.vandine@canonical.com> | 2011-08-25 09:03:29 -0400 |
|---|---|---|
| committer | Ken VanDine <ken.vandine@canonical.com> | 2011-08-25 09:03:29 -0400 |
| commit | 6bacf14ef210f0ff8a2cc179f235d70906485698 (patch) | |
| tree | 3d4b01e0562a1c44e396ce0a45004d618757728d /data/Makefile.am | |
| parent | 92cb2ff94b4efb98437639a7c37fa894efa03556 (diff) | |
| parent | ce36ed0c35e58f0244a090250ab7f96b8e5915ac (diff) | |
| download | ayatana-indicator-session-6bacf14ef210f0ff8a2cc179f235d70906485698.tar.gz ayatana-indicator-session-6bacf14ef210f0ff8a2cc179f235d70906485698.tar.bz2 ayatana-indicator-session-6bacf14ef210f0ff8a2cc179f235d70906485698.zip | |
* New upstream release.
- User menu should still show even if there is only 1 user (LP: #831758)
- Bluetooth item in menu not needed (LP: #825111)
- Newly created users are not added to the menu until next
login (LP: #552048)
- Users list in shutdown menu is not updated on user
deletion (LP: #557608)
- should use gsettings rather than gconf (LP: #656323)
Diffstat (limited to 'data/Makefile.am')
| -rw-r--r-- | data/Makefile.am | 49 |
1 files changed, 27 insertions, 22 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 1f522d7..7e851a7 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -9,37 +9,42 @@ dbus_services_DATA = $(service_in_files:.service.in=.service) %.service: %.service.in sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ -############################## -# GConf Schema -############################## +@INTLTOOL_SCHEMAS_RULE@ +@INTLTOOL_XML_NOMERGE_RULE@ -schemadir = \ - $(GCONF_SCHEMA_FILE_DIR) +@GSETTINGS_RULES@ +gsettings_SCHEMAS = com.canonical.indicator.session.gschema.xml -schema_in_files = \ - indicator-session.schemas.in +convertdir = $(datadir)/GConf/gsettings +dist_convert_DATA = indicator-session.convert -schema_DATA = \ - $(schema_in_files:.schemas.in=.schemas) +@INTLTOOL_DESKTOP_RULE@ -@INTLTOOL_SCHEMAS_RULE@ +%.desktop.in: %.desktop.in.in + sed \ + -e "s|\@libexecdir\@|$(libexecdir)|" \ + -e "s|\@bindir\@|$(bindir)|" \ + $< > $@ +logout_helper_desktop_in_in_files = \ + indicator-session-lock-screen.desktop.in.in \ + indicator-session-logout.desktop.in.in \ + indicator-session-restart.desktop.in.in \ + indicator-session-shutdown.desktop.in.in -#$(dbus_services_DATA): $(service_in_files) Makefile -# sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ +logout_helperdir = $(datadir)/applications +logout_helper_desktop_files = \ + $(logout_helper_desktop_in_in_files:.desktop.in.in=.desktop) +logout_helper_DATA = $(logout_helper_desktop_files) EXTRA_DIST = \ $(service_in_files) \ - $(schema_in_files) + $(gsettings_SCHEMAS:.xml=.xml.in) \ + $(logout_helper_desktop_in_in_files) + CLEANFILES = \ $(dbus_services_DATA) \ - $(schema_DATA) - -if GCONF_SCHEMAS_INSTALL -install-data-local: - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ - gconftool-2 --makefile-install-rule $(schema_DATA) -else -install-data-local: -endif + $(gsettings_SCHEMAS) \ + $(logout_helper_desktop_files) + |