[nautilus/wip/gaction_: 28/38] Remove saved search mimetype association
- From: Carlos Soriano Sánchez <csoriano src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus/wip/gaction_: 28/38] Remove saved search mimetype association
- Date: Wed, 21 Jan 2015 13:21:08 +0000 (UTC)
commit c072d79cc494837e7f56b74731785585b3c9de71
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Tue Jan 20 10:17:38 2015 -0800
Remove saved search mimetype association
It's not used anymore.
data/Makefile.am | 20 +-------------------
data/nautilus.xml.in | 8 --------
2 files changed, 1 insertions(+), 27 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index f069d30..2d93553 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,9 +1,5 @@
NULL=
-xml_in_files = nautilus.xml.in
-xml_files = $(xml_in_files:.xml.in=.xml)
- INTLTOOL_XML_RULE@
-
desktopdir = $(datadir)/applications
desktop_DATA = \
$(desktop_in_files:.desktop.in=.desktop) \
@@ -24,9 +20,6 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
@INTLTOOL_DESKTOP_RULE@
-mimedir = $(datadir)/mime/packages
-mime_DATA = $(xml_files)
-
servicedir = $(datadir)/dbus-1/services
service_DATA = $(service_in_files:.service.in=.service)
service_in_files = \
@@ -48,7 +41,6 @@ EXTRA_DIST = \
dbus-interfaces.xml \
freedesktop-dbus-interfaces.xml \
shell-search-provider-dbus-interfaces.xml \
- $(xml_in_files) \
$(desktop_in_files) \
$(service_in_files) \
$(autostart_in_files) \
@@ -56,21 +48,11 @@ EXTRA_DIST = \
$(appdata_in_files) \
$(NULL)
-CLEANFILES = $(xml_files) \
+CLEANFILES = \
$(desktop_DATA) \
$(service_DATA) \
$(autostart_DATA) \
$(appdata_DATA) \
$(NULL)
-install-data-hook:
-if ENABLE_UPDATE_MIMEDB
- $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"
-endif
-
-uninstall-hook:
-if ENABLE_UPDATE_MIMEDB
- $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"
-endif
-
-include $(top_srcdir)/git.mk
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]