[easytag/wip/unstable: 32/56] Move desktop file to data subdirectory

[David King <davidk src gnome org>]

commit 1948d4cac50d96f56f11cf2e47982b32bb60cb18
Author: David King <amigadave amigadave com>
Date:   Mon Mar 25 09:52:17 2013 +0000

    Move desktop file to data subdirectory
    
    Additionally, add a translator comment for the keywords field. Add a
    stamp rule to ensure that the data subdirectory exists in the build
    directory.

 .gitignore                                    |    6 +++++-
 Makefile.am                                   |   23 ++++++++++++++++-------
 configure.ac                                  |    2 +-
 easytag.desktop.in => data/easytag.desktop.in |    1 +
 po/POTFILES.in                                |    2 +-
 5 files changed, 24 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bf14331..a51ec9b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 # ignore file
 *.o
 .dirstamp
+.dstamp
 /build-aux
 m4/*
 Makefile
@@ -12,10 +13,13 @@ config.h.in
 config.log
 config.status
 configure
+/data/easytag.desktop
+/doc/easytag.1
+/doc/version.xml
 /doc/easytag.1
 /doc/version.xml
 /easytag
-/easytag.desktop
+/easytag-*.tar.xz
 /easytag-*-setup.exe
 /easytag-win32-installer.nsi
 /easytag.exe
diff --git a/Makefile.am b/Makefile.am
index 211eab3..2a3e3c7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -124,9 +124,17 @@ easytag-win32-installer.nsi: easytag-win32-installer.nsi.in Makefile
                -e "s|\ PACKAGE_URL\@|$(PACKAGE_URL)|" \
                -e "s|\ PACKAGE_VERSION\@|$(PACKAGE_VERSION)|" $< > $@
 
+# Create a directory stamp in the build dir. Used to workaround the case where
+# a pattern rule is used for a target with a path that does not ordinarily
+# exist in the build dir.
+%/.dstamp:
+       $(AM_V_at)$(MKDIR_P) $(@D)
+       $(AM_V_at)touch $@
+
 @INTLTOOL_DESKTOP_RULE@
 desktopdir = $(datadir)/applications
-desktop_in_files = easytag.desktop.in
+desktop_in_files = data/easytag.desktop.in
+$(desktop_in_files:.desktop.in=.desktop): data/.dstamp
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
 if ENABLE_MAN
@@ -296,8 +304,7 @@ dist_noinst_SCRIPTS = \
        autogen.sh
 
 if EASYTAG_ENABLE_TESTS
-tests/test-desktop-file-validate.sh: Makefile
-       $(MKDIR_P) $(top_builddir)/tests
+tests/test-desktop-file-validate.sh: Makefile tests/.dstamp
        $(AM_V_GEN)echo "#!/bin/sh -e" > $@; \
                echo "$(DESKTOP_FILE_VALIDATE) $(top_builddir)/$(desktop_DATA) || exit 1" >> $@; \
                chmod +x $@
@@ -316,11 +323,13 @@ CLEANFILES = \
        easytag-win32-installer.nsi
 
 DISTCLEANFILES = \
-       intltool-extract \
-       intltool-merge \
-       intltool-update \
        po/.intltool-merge-cache
 
+clean-local: clean-local-dstamp
+clean-local-dstamp:
+       -rm -f data/.dstamp
+       -rm -f tests/.dstamp
+
 git-changelog-hook:
        $(AM_V_at)if $(top_srcdir)/build-aux/missing --run git \
                --git-dir=$(top_srcdir)/.git --work-tree=$(top_srcdir) log \
@@ -331,4 +340,4 @@ git-changelog-hook:
 
 dist-hook: git-changelog-hook
 
-.PHONY: git-changelog-hook
+.PHONY: clean-local-dstamp git-changelog-hook
diff --git a/configure.ac b/configure.ac
index 259d17e..fb7d8b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4])
 dnl -------------------------------
 dnl Init automake
 dnl -------------------------------
-AM_INIT_AUTOMAKE([1.11 -Wall check-news no-define dist-xz no-dist-gzip nostdinc subdir-objects])
+AM_INIT_AUTOMAKE([1.11 -Wall -Wno-portability check-news no-define dist-xz no-dist-gzip nostdinc 
subdir-objects])
 AM_MAINTAINER_MODE([enable])
 AM_SILENT_RULES([yes])
 
diff --git a/easytag.desktop.in b/data/easytag.desktop.in
similarity index 73%
rename from easytag.desktop.in
rename to data/easytag.desktop.in
index 8146928..905c888 100644
--- a/easytag.desktop.in
+++ b/data/easytag.desktop.in
@@ -2,6 +2,7 @@
 Name=EasyTAG
 _GenericName=Sound File Metadata Editor
 _Comment=Edit sound file metadata
+# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
 _Keywords=mp3;tag;audio;
 Type=Application
 Icon=easytag
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 414f84d..9ec12e7 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,4 +1,4 @@
-easytag.desktop.in
+data/easytag.desktop.in
 src/about.c
 src/ape_tag.c
 src/application.c