Applied patch #826108: Installs files to register glabels and glabels filetypes...

	pixmaps/glabels.png
	data/glabels.mime
	data/glabels.applications
	data/glabels.keys.in

git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@324 f5e0f49d-192f-0410-a22d-a8d8700d0965

diff --git a/glabels2/data/Makefile.am b/glabels2/data/Makefile.am
index a4b1a4037587c59fed2a9ed4759a2bb9ee35f8f0..22133d58d8583c061220d4b2c4d842c9f54d5255 100644 (file)
--- a/glabels2/data/Makefile.am
+++ b/glabels2/data/Makefile.am
@@ -1,10 +1,24 @@
 ## Process this file with automake to produce Makefile.in
 
-desktopdir      = $(datadir)/applications
-desktop_in_files = glabels.desktop.in
-desktop_DATA    = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
+DESKTOP_IN_FILES = glabels.desktop.in
+DESKTOP_FILES =$(DESKTOP_IN_FILES:.desktop.in=.desktop)
+
+desktopdir = $(datadir)/applications
+desktop_DATA = $(DESKTOP_FILES)
+
+@INTLTOOL_KEYS_RULE@
+
+KEYS_IN_FILES=glabels.keys.in
+KEYS_FILES = $(KEYS_IN_FILES:.keys.in=.keys)
+
+mimedir = $(datadir)/mime-info
+mime_DATA = $(KEYS_FILES) glabels.mime
+
+appdir = $(datadir)/application-registry
+app_DATA = glabels.applications
+
 runtime_files = \
        glabels-2.0.dtd \
        paper-sizes.xml \
@@ -15,7 +29,10 @@ runtime_files = \
        misc-iso-templates.xml
 
 EXTRA_DIST = \
-       $(desktop_DATA) \
+       $(DESKTOP_IN_FILES)     \
+       $(KEYS_IN_FILES)        \
+       $(mime_DATA)            \
+       $(app_DATA)             \
        $(runtime_files)
 
 configdir=$(datadir)/glabels
@@ -27,3 +44,5 @@ install-data-local:
            fi \
          done
 
+CLEANFILES = $(KEY_FILES) $(DESKTOP_FILES)
+

diff --git a/glabels2/data/glabels.applications b/glabels2/data/glabels.applications
new file mode 100644 (file)
index 0000000..1391018
--- /dev/null
+++ b/glabels2/data/glabels.applications
@@ -0,0 +1,9 @@
+glabels
+       command=glabels
+       name=gLabels
+       can_open_multiple_files=true
+       expects_uris=false
+       requires_terminal=false
+       mime_types=application/x-glabels
+       uses_gnomevfs=false
+

diff --git a/glabels2/data/glabels.desktop.in b/glabels2/data/glabels.desktop.in
index 64bce2228f982c4ffa3c5a19e69587aab9a24963..dadebe9551fd1c95939c17fe2153b57eba8a8bc0 100644 (file)
--- a/glabels2/data/glabels.desktop.in
+++ b/glabels2/data/glabels.desktop.in
@@ -7,5 +7,5 @@ Exec=glabels
 Icon=glabels/glabels-icon.png
 Terminal=0
 Type=Application
-Categories=Application;X-Red-Hat-BaseApplication;Office;X-Red-Hat-Base;
+Categories=GNOME;Application;Office
 StartupNotify=true

diff --git a/glabels2/data/glabels.keys.in b/glabels2/data/glabels.keys.in
new file mode 100644 (file)
index 0000000..82d143a
--- /dev/null
+++ b/glabels2/data/glabels.keys.in
@@ -0,0 +1,9 @@
+application/x-glabels:
+       open=glabels %f
+       description=gLabels Project File
+        icon_filename=glabels.png
+        default_action_type=application
+       category=Documents
+        short_list_application_ids_for_novice_user_level=glabels
+        short_list_application_ids_for_intermediate_user_level=glabels
+        short_list_application_ids_for_advanced_user_level=glabels

diff --git a/glabels2/data/glabels.mime b/glabels2/data/glabels.mime
new file mode 100644 (file)
index 0000000..ab2f8cd
--- /dev/null
+++ b/glabels2/data/glabels.mime
@@ -0,0 +1,2 @@
+application/x-glabels
+        ext: glabels

diff --git a/glabels2/pixmaps/Makefile.am b/glabels2/pixmaps/Makefile.am
index 6f322fd8a12486dadbcd637efdf83c391346edef..dff7dc6b998147303b7ef31a7e6db8d25940adad 100644 (file)
--- a/glabels2/pixmaps/Makefile.am
+++ b/glabels2/pixmaps/Makefile.am
@@ -7,4 +7,9 @@ glabels_pixmaps_DATA = \
        glabels-logo.png        \
        glabels-about-logo.png
 
-EXTRA_DIST = $(glabels_pixmaps_DATA)
+glabels_mime_icondir = $(datadir)/pixmaps
+
+glabels_mime_icon_DATA = glabels.png
+
+EXTRA_DIST = $(glabels_pixmaps_DATA) \
+            $(glabels_mime_icon_DATA)

diff --git a/glabels2/pixmaps/glabels.png b/glabels2/pixmaps/glabels.png
new file mode 100644 (file)
index 0000000..376a2de
Binary files /dev/null and b/glabels2/pixmaps/glabels.png differ