[gnote] Make sure @GNOTE_VERSION@ gets substituted properly in .desktop file

[Hubert Figuière <hub src gnome org>]

commit 964f70f81eb75f627377026bd59fa68989e8ebed
Author: Jonathon Jongsma <jonathon quotidian org>
Date:   Sat May 2 14:18:16 2009 -0500

    Make sure @GNOTE_VERSION@ gets substituted properly in .desktop file
    
    gnote.desktop.in was not being processed by autoconf, so the @GNOTE_VERSION@
    variable was not being properly substituted.  Rename it to .in.in and add it to
    AC_CONFIG_FILES.  So now the process looks like:
        - gnote.desktop.in.in -> [autoconf] -> gnote.desktop.in
        - gnote.desktop.in -> [intltool] -> gnote.desktop
    
    Signed-off-by: Hubert Figuiere <hub figuiere net>
---
 .gitignore                                     |    1 +
 NEWS                                           |    1 +
 configure.ac                                   |    1 +
 data/{gnote.desktop.in => gnote.desktop.in.in} |    2 +-
 po/POTFILES.skip                               |    2 ++
 5 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5547ac7..20bd87a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,7 @@ Makefile.in
 gnome-doc-utils.make
 help/gnote-C.omf
 data/gnote.desktop
+data/gnote.desktop.in
 data/gnote.schemas
 data/GNOME_GnoteApplet.server
 data/GNOME_GnoteApplet.server.in
diff --git a/NEWS b/NEWS
index 60c657f..034888f 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ Fixes:
   * Cleared up a few Gtkmm warnings.
   * Applet was trying to use an icon named "tomboy" (Closes #581226) 
     (Robert Millan)
+  * .desktop file didn't have the version (Jonathon Jongsma)
 
 Translations:
 
diff --git a/configure.ac b/configure.ac
index 5df340c..7a1535c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -199,6 +199,7 @@ Makefile
 shave
 shave-libtool
 data/Makefile
+data/gnote.desktop.in
 data/icons/Makefile
 libtomboy/Makefile
 src/Makefile
diff --git a/data/gnote.desktop.in b/data/gnote.desktop.in.in
similarity index 96%
rename from data/gnote.desktop.in
rename to data/gnote.desktop.in.in
index de9ff5f..1f819f2 100644
--- a/data/gnote.desktop.in
+++ b/data/gnote.desktop.in.in
@@ -4,7 +4,7 @@ Encoding=UTF-8
 Name=Gnote
 _Comment=Take notes, link ideas, and stay organized
 _GenericName=Note-taker
-Exec=gnote 
+Exec=gnote
 Icon=gnote
 StartupNotify=false
 Terminal=false
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 9f73dd2..c491edc 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,2 +1,4 @@
 data/GNOME_GnoteApplet.server.in
+data/gnote.desktop.in.in
+