From b75ff3338651932962baf57076a9261bbe57a7d1 Mon Sep 17 00:00:00 2001
From: William Jon McCann <jmccann@redhat.com>
Date: Wed, 26 Sep 2012 11:38:05 -0400
Subject: Remove desktop file

https://bugzilla.gnome.org/show_bug.cgi?id=684887
---
 data/Makefile.am        |  8 ++------
 data/caribou.desktop.in | 15 ---------------
 2 files changed, 2 insertions(+), 21 deletions(-)
 delete mode 100644 data/caribou.desktop.in

(limited to 'data')

diff --git a/data/Makefile.am b/data/Makefile.am
index 16e9b1f..2e83b85 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -7,10 +7,6 @@ gsettings_schemas_in_files = \
 	org.gnome.antler.gschema.xml.in
 gsettings_SCHEMAS = $(gsettings_schemas_in_files:.gschema.xml.in=.gschema.xml)
 
-desktopdir = $(datadir)/applications
-desktop_in_files = caribou.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
 autostartdir	 = $(sysconfdir)/xdg/autostart
 autostart_in_files = caribou-autostart.desktop.in
 autostart_DATA   = $(autostart_in_files:.desktop.in=.desktop)
@@ -24,7 +20,7 @@ org.gnome.Caribou.Antler.service: org.gnome.Caribou.Antler.service.in
 
 @INTLTOOL_DESKTOP_RULE@
 
-EXTRA_DIST = $(desktop_in_files) $(autostart_in_files) $(servicefile_in_files)
+EXTRA_DIST = $(autostart_in_files) $(servicefile_in_files)
 
 org.gnome.caribou.gschema.xml.in: $(top_srcdir)/caribou/settings/caribou_settings.py
 	$(AM_V_GEN)$(PYTHON) -B $(top_srcdir)/tools/make_schema.py \
@@ -36,7 +32,7 @@ org.gnome.antler.gschema.xml.in: $(top_srcdir)/caribou/antler/antler_settings.py
 		-d "$(GETTEXT_PACKAGE)" \
 		-o $@ caribou.antler.AntlerSettings
 
-CLEANFILES = $(desktop_DATA) \
+CLEANFILES = \
 	$(autostart_DATA) \
 	$(gsettings_schemas_in_files) \
 	$(gsettings_SCHEMAS) \
diff --git a/data/caribou.desktop.in b/data/caribou.desktop.in
deleted file mode 100644
index 312d766..0000000
--- a/data/caribou.desktop.in
+++ /dev/null
@@ -1,15 +0,0 @@
-[Desktop Entry]
-Name=Caribou
-GenericName=Virtual on-screen keyboard
-Comment=Enter text with a virtual keyboard
-Exec=caribou
-Icon=caribou
-Terminal=false
-Type=Application
-StartupNotify=true
-Categories=GNOME;GTK;Utility;Accessibility;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=caribou
-X-GNOME-Bugzilla-Component=default
-X-GNOME-Bugzilla-Version=@VERSION@
-X-Ubuntu-Gettext-Domain=caribou
-- 
cgit v1.2.1