Redid the framework that deals with installing desktop files. Fixes bug

2005-06-16  Sven Neumann  <[email protected]>

	Redid the framework that deals with installing desktop files.
	Fixes bug #307705:

	* data/misc/*: removed.

	* desktop/*: readded the desktop files in a new directory.

	* Makefile.am
	* configure.in
	* data/Makefile.am: changed accordingly.

ChangeLog

@@ -1,3 +1,16 @@
+2005-06-16  Sven Neumann  <[email protected]>
+
+	Redid the framework that deals with installing desktop files.
+	Fixes bug #307705:
+
+	* data/misc/*: removed.
+
+	* desktop/*: readded the desktop files in a new directory.
+
+	* Makefile.am
+	* configure.in
+	* data/Makefile.am: changed accordingly.
+
 2005-06-16  Michael Natterer  <[email protected]>
 
 	* tools/pdb/pdbgen/edit.pdb: revert accidential commit.

Makefile.am

@@ -11,6 +11,7 @@ SUBDIRS = \
 	po-plug-ins	\
 	po-script-fu	\
 	data		\
+	desktop		\
 	menus		\
 	libgimpbase	\
 	libgimpcolor	\

configure.in

@@ -111,16 +111,6 @@ fi
 AM_CONDITIONAL(GIMP_UNSTABLE, test "x$GIMP_UNSTABLE" = "xyes")
 
 
-dnl Choose a desktop icon
-if test "x$GIMP_UNSTABLE" = "xyes"; then
-  GIMP_DESKTOP_ICON="wilber-devel-icon.png"
-else
-  GIMP_DESKTOP_ICON="wilber-icon.png"
-fi
-
-AC_SUBST(GIMP_DESKTOP_ICON)
-
-
 # libtool versioning
 m4_define([lt_current], [m4_eval(100 * gimp_minor_version + gimp_micro_version - gimp_interface_age)])
 m4_define([lt_revision], [gimp_interface_age])
@@ -1438,7 +1428,6 @@ else
   DESKTOP_DATADIR="$datadir"
 fi
 
-AM_CONDITIONAL(DESKTOP_DATADIR, test "x$with_desktop_dir" != xno)
 AC_SUBST(DESKTOP_DATADIR)
 
 
@@ -1731,13 +1720,13 @@ data/environ/Makefile
 data/gradients/Makefile
 data/images/Makefile
 data/interpreters/Makefile
-data/misc/Makefile
-data/misc/gimp.applications
-data/misc/gimp.desktop.in
-data/misc/gimp.keys
 data/palettes/Makefile
 data/patterns/Makefile
 data/tips/Makefile
+desktop/Makefile
+desktop/gimp.applications
+desktop/gimp.desktop.in
+desktop/gimp.keys
 etc/Makefile
 m4macros/Makefile
 po/Makefile.in

data/Makefile.am

@@ -6,7 +6,6 @@ SUBDIRS = \
 	gradients	\
 	images		\
 	interpreters	\
-	misc		\
 	palettes	\
 	patterns	\
 	tips

data/misc/.cvsignore → desktop/.cvsignore

@@ -1,7 +1,7 @@
 Makefile.in
 Makefile
-gimp.desktop
+gimp.applications
 gimp.desktop.in
-gimp.desktop.in.in.h
+gimp.desktop
 gimp.keys
-gimp.applications
+.thumbnails

desktop/Makefile.am

@@ -0,0 +1,48 @@
+## Makefile.am for gimp/desktop
+
+desktop_in_files = gimp.desktop.in.in
+desktop_files = $(desktop_in_files:.desktop.in.in=.desktop)
+
+
+applicationsdir = @DESKTOP_DATADIR@/applications
+
+applications_DATA = $(desktop_files)
+
+
+icondir = @DESKTOP_DATADIR@/icons/hicolor/48x48/apps
+
+icon_DATA = gimp.png
+
+
+mimeinfodir = @DESKTOP_DATADIR@/mime-info
+
+mimeinfo_DATA = gimp.keys
+
+
+registrydir = @DESKTOP_DATADIR@/application-registry
+
+registry_DATA = gimp.applications
+
+
+EXTRA_DIST = \
+	$(desktop_in_files)	\
+	$(icon_DATA)		\
+	$(mimeinfo_DATA)	\
+	$(registry_DATA)
+
+
+DISTCLEANFILES = $(desktop_files)
+
+
+gimp.desktop: gimp.desktop.in $(wildcard $(top_srcdir)/po/*.po)
+	$(INTLTOOL_MERGE) $(top_srcdir)/po $< $(@) -d -u -c $(top_builddir)/po/.intltool-merge-cachemake
+
+validate: gimp.desktop
+	( dfvalidate=`which desktop-file-validate`; \
+	  if test x$$dfvalidate != x && test -x $$dfvalidate; then \
+            $$dfvalidate $< || ( echo "* $< INVALID *"; exit 1 ) \
+	  else \
+	    echo "Can't find desktop-file-validate to validate $<; proceed with fingers crossed..."; \
+          fi )
+
+dist-hook: validate