Move freedesktop stuff from Packaging to a new "desktop" subdirectory…

…. Implement a Makefile for it. Add Esperanto to the .desktop file.

--HG--
rename : Packaging/fontforge.desktop => desktop/fontforge.desktop
rename : Packaging/fontforge.xml => desktop/fontforge.xml
rename : Packaging/icons-old/FFbutton-128.png => desktop/icons-old/FFbutton-128.png
rename : Packaging/icons-old/FFbutton-32.png => desktop/icons-old/FFbutton-32.png
rename : Packaging/icons-old/FFslug-128.png => desktop/icons-old/FFslug-128.png
rename : Packaging/icons-old/FFslug-32.png => desktop/icons-old/FFslug-32.png
rename : Packaging/icons-old/FFslug-48.png => desktop/icons-old/FFslug-48.png
rename : Packaging/icons-old/ffanvil32.gif => desktop/icons-old/ffanvil32.gif
rename : Packaging/icons-old/fontforge.png => desktop/icons-old/fontforge.png
rename : Packaging/icons-old/fontforge.svg => desktop/icons-old/fontforge.svg
rename : Packaging/icons/16x16/apps/fontforge.png => desktop/icons/16x16/apps/fontforge.png
rename : Packaging/icons/22x22/apps/fontforge.png => desktop/icons/22x22/apps/fontforge.png
rename : Packaging/icons/24x24/apps/fontforge.png => desktop/icons/24x24/apps/fontforge.png
rename : Packaging/icons/32x32/apps/fontforge.png => desktop/icons/32x32/apps/fontforge.png
rename : Packaging/icons/48x48/apps/fontforge.png => desktop/icons/48x48/apps/fontforge.png
rename : Packaging/icons/scalable/apps/fontforge.svg => desktop/icons/scalable/apps/fontforge.svg
rename : Packaging/icons/src/icon-16x16-apps-fontforge.svg => desktop/icons/src/icon-16x16-apps-fontforge.svg
rename : Packaging/icons/src/icon-24x24-apps-fontforge.svg => desktop/icons/src/icon-24x24-apps-fontforge.svg
rename : Packaging/icons/src/icon-32x32-apps-fontforge.svg => desktop/icons/src/icon-32x32-apps-fontforge.svg

Makefile.am

@@ -59,8 +59,10 @@ if MACINTOSH
 SUBDIRS += mackeys
 endif MACINTOSH
 
-# The following conditional may always be false, but is here so the
-# fonttools directory is included by "make dist".
+if DESKTOP
+SUBDIRS += desktop
+endif DESKTOP
+
 if FONTTOOLS
 SUBDIRS += fonttools
 endif FONTTOOLS

configure.ac

@@ -110,6 +110,8 @@ AC_PATH_PROG([MSGFMT],[msgfmt],[msgfmt])
 AC_PATH_PROG([XGETTEXT],[xgettext],[xgettext])
 AC_PATH_PROG([CPROTO],[cproto],[cproto])
 AC_PATH_PROG([UNZIP],[unzip],[unzip])
+AC_PATH_PROG([UPDATE_MIME_DATABASE],[update-mime-database],[update-mime-database])
+AC_PATH_PROG([UPDATE_DESKTOP_DATABASE],[update-desktop-database],[update-desktop-database])
 AC_PATH_PROG([PLUTIL],[plutil],[:])
 
 FONTFORGE_ARG_ENABLE_REAL
@@ -291,8 +293,11 @@ i_do_have_gui="${i_do_have_x}"
 AM_CONDITIONAL([GRAPHICAL_USER_INTERFACE],[test x"${i_do_have_gui}" = xyes])
 AM_CONDITIONAL([MACINTOSH],[test x"${gww_ismac}" = xyes])
 
-# See Makefile.am for an explanation of why this exists despite always
-# being "false".
+# FIXME: Make it necessary to enable this.
+AM_CONDITIONAL([DESKTOP],[test x = x])
+
+# The following conditional is always false, so the fonttools never
+# get built by default, but they will be included by "make dist".
 AM_CONDITIONAL([FONTTOOLS],[test x != x])
 
 FONTFORGE_SET_MY_CFLAGS

desktop/Makefile.am

@@ -0,0 +1,71 @@
+# Copyright (C) 2000-2012 by George Williams
+# Copyright (C) 2012 by Barry Schwartz
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# Redistributions of source code must retain the above copyright notice, this
+# list of conditions and the following disclaimer.
+#
+# Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# The name of the author may not be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PACKAGEROOTDIR = ${datarootdir}
+
+DESKTOPDIR = ${PACKAGEROOTDIR}/applications
+MIMEDIR = ${PACKAGEROOTDIR}/mime
+ICONSDIR = ${PACKAGEROOTDIR}/icons
+HICOLORDIR = ${ICONSDIR}/hicolor
+
+desktopdir = ${DESKTOPDIR}
+mimedir= ${MIMEDIR}
+mimepackagesdir = ${MIMEDIR}/packages
+iconsdir = ${ICONSDIR}
+hicolordir = ${HICOLORDIR}
+
+hicolor16x16dir = ${hicolordir}/16x16/apps
+hicolor22x22dir = ${hicolordir}/22x22/apps
+hicolor24x24dir = ${hicolordir}/24x24/apps
+hicolor32x32dir = ${hicolordir}/32x32/apps
+hicolor48x48dir = ${hicolordir}/48x48/apps
+hicolorscalabledir = ${hicolordir}/scalable/apps
+
+desktop_DATA = fontforge.desktop
+hicolor16x16_DATA = icons/16x16/apps/fontforge.png
+hicolor22x22_DATA = icons/22x22/apps/fontforge.png
+hicolor24x24_DATA = icons/24x24/apps/fontforge.png
+hicolor32x32_DATA = icons/32x32/apps/fontforge.png
+hicolor48x48_DATA = icons/48x48/apps/fontforge.png
+hicolorscalable_DATA = icons/scalable/apps/fontforge.svg
+mimepackages_DATA = fontforge.xml
+
+update-database: update-mime-database update-desktop-database
+
+# The following ignores DESTDIR on purpose. Run after install or
+# uninstall.
+update-mime-database:
+	$(UPDATE_MIME_DATABASE) ${mimedir}
+
+# The following ignores DESTDIR on purpose. Run after install or
+# uninstall.
+update-desktop-database:
+	$(UPDATE_DESKTOP_DATABASE) ${applicationsdir}
+
+EXTRA_DIST = icons/src/icon-16x16-apps-fontforge.svg	\
+	icons/src/icon-24x24-apps-fontforge.svg				\
+	icons/src/icon-32x32-apps-fontforge.svg

Packaging/fontforge.desktop → desktop/fontforge.desktop

@@ -4,12 +4,14 @@ Name[ru]=FontForge
 Name[fr]=FontForge
 Name[zh_TW]=字型鍛造廠
 Name[uk]=FontForge
+Name[eo]=FontForge
 Comment=An outline font editor
 Comment[ru]=Редактор шрифтов
 Comment[fr]=Un constructeur des polices
 Comment[zh_TW]=FontForge 描邊字型編輯器
 Comment[pl_PL]=Edytor fontów
 Comment[uk]=Редактор шрифтів
+Comment[eo]=Tipardosiero-redaktilo
 Exec=fontforge %U
 Icon=fontforge
 StartupWMClass=fontforge

m4/fontforge_create_makefiles.m4

@@ -19,6 +19,7 @@ AC_CONFIG_FILES([pycontrib/Makefile])
 AC_CONFIG_FILES([cidmap/Makefile])
 AC_CONFIG_FILES([plugins/Makefile])
 AC_CONFIG_FILES([tests/Makefile])
+AC_CONFIG_FILES([desktop/Makefile])
 AC_CONFIG_FILES([fonttools/Makefile])
 
 # GNUmakefiles that act as wrappers around portable makefiles and