[glabels] Cleanup of mime support

[Jim Evins <jimevins src gnome org>]

commit 69f4e1fc6a8a731d8a73e020810aef5a895fba5b
Author: Jim Evins <evins snaught com>
Date:   Fri Feb 26 22:45:46 2010 -0500

    Cleanup of mime support
    
    Removed old mime support files.  Renamed mime icon file.

 .gitignore                                         |    3 +-
 Makefile.am                                        |    1 +
 data/mime/Makefile.am                              |   25 ++++---------------
 data/mime/{glabels.xml.in => glabels-3.0.xml.in}   |    0
 data/mime/glabels.applications                     |    9 -------
 data/mime/glabels.keys.in                          |    9 -------
 data/mime/glabels.mime                             |    2 -
 data/pixmaps/Makefile.am                           |    2 +-
 ...ion-x-glabels.png => application-x-glabels.png} |  Bin 2242 -> 2242 bytes
 9 files changed, 9 insertions(+), 42 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d23fe32..b9f9a4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,8 +53,7 @@ glabels-*.tar.gz
 
 /data/desktop/glabels*.desktop
 
-/data/mime/glabels.keys
-/data/mime/glabels.xml
+/data/mime/glabels*.xml
 
 /po/.intltool-merge-cache
 /po/*.gmo
diff --git a/Makefile.am b/Makefile.am
index 0b86836..efc7f29 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,6 +11,7 @@ SUBDIRS = \
 
 EXTRA_DIST = \
 	README \
+	COPYING.README_FIRST \
 	COPYING \
 	COPYING-DOCS \
 	COPYING-LIBGLABELS \
diff --git a/data/mime/Makefile.am b/data/mime/Makefile.am
index 282e184..94f2431 100644
--- a/data/mime/Makefile.am
+++ b/data/mime/Makefile.am
@@ -1,30 +1,17 @@
 ## Process this file with automake to produce Makefile.in
 
-keys_in_files=glabels.keys.in
-keys_files = $(keys_in_files:.keys.in=.keys)
- INTLTOOL_KEYS_RULE@
-
-xml_in_files=glabels.xml.in
+xml_in_files=$(GLABELS_BRANCH).xml.in
 xml_files = $(xml_in_files:.xml.in=.xml)
 @INTLTOOL_XML_RULE@
 
-mimedir = $(datadir)/mime-info
-mime_DATA = $(keys_files) glabels.mime
-
-appdir = $(datadir)/application-registry
-app_DATA = glabels.applications
-
-newmimedir = $(datadir)/mime/packages
-newmime_DATA = $(xml_files)
+mimedir = $(datadir)/mime/packages
+mime_DATA = $(xml_files)
 
 EXTRA_DIST = \
-	$(keys_in_files)	\
-	$(mime_DATA)            \
-	$(app_DATA)		\
-	$(xml_in_files)		\
-	$(newmime_DATA)
+	$(xml_in_files)
 
-CLEANFILES = $(keys_files) $(xml_files)
+CLEANFILES = \
+	$(xml_files)
 
 
 install-data-hook:
diff --git a/data/mime/glabels.xml.in b/data/mime/glabels-3.0.xml.in
similarity index 100%
rename from data/mime/glabels.xml.in
rename to data/mime/glabels-3.0.xml.in
diff --git a/data/pixmaps/Makefile.am b/data/pixmaps/Makefile.am
index ed28b9b..1e370f4 100644
--- a/data/pixmaps/Makefile.am
+++ b/data/pixmaps/Makefile.am
@@ -19,7 +19,7 @@ glabels_app_icon_DATA = \
 glabels_mime_icondir = $(datadir)/icons/hicolor/48x48/mimetypes
 
 glabels_mime_icon_DATA = \
-	$(GLABELS_BRANCH)-application-x-glabels.png
+	application-x-glabels.png
 
 EXTRA_DIST = $(glabels_pixmaps_DATA)   \
 	     $(glabels_app_icon_DATA)  \
diff --git a/data/pixmaps/glabels-3.0-application-x-glabels.png b/data/pixmaps/application-x-glabels.png
similarity index 100%
rename from data/pixmaps/glabels-3.0-application-x-glabels.png
rename to data/pixmaps/application-x-glabels.png