[gentoo-commits] proj/emacs-tools:emacs-common-gentoo commit in: /

["Sebastian Pipping" <sping@gentoo.org>]

commit:     9d2f78e1a08b8b1dbdb8bc81acf2b1036de1b8de
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 28 11:16:02 2007 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Dec 28 11:16:02 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=9d2f78e1

Canonical ordering for desktop entry keys. Version key added.
Release version 0.3.

svn path=/emacs-extra/emacs-desktop/; revision=892

---
 ChangeLog           |   11 +++++++++++
 Makefile            |    8 ++++++--
 emacs.desktop       |    7 ++++---
 emacsclient.desktop |    5 +++--
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f5020d0..e4b1451 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2007-12-28  Ulrich Mueller  <ulm@gentoo.org>
+
+	* version 0.3
+
+	* Makefile (DESKTOPFILES): Validate with desktop-file-validate.
+
+	* emacsclient.desktop: Ditto.
+
+	* emacs.desktop: Canonical ordering for desktop entry keys.
+	(Version): Key added.
+
 2007-12-10  Christian Faulhammer  <opfer@gentoo.org>
 
 	* emacsclient.desktop (Comment): Correct typo in Spanish

diff --git a/Makefile b/Makefile
index b6e71e1..4eca6f4 100644
--- a/Makefile
+++ b/Makefile
@@ -4,12 +4,13 @@ PV = $(shell sed '/^[ \t]*\* [Vv]ersion/!d;s/[^0-9.]*\([0-9.]*\).*/\1/;q' \
 	ChangeLog)
 P = $(PN)-$(PV)
 
-DISTFILES = emacs.desktop emacsclient.desktop \
+DESKTOPFILES = emacs.desktop emacsclient.desktop
+DISTFILES = $(DESKTOPFILES) \
 	README.icons emacs.png \
 	emacs_16.png emacs_24.png emacs_32.png emacs_48.png gnured_48.png
 
 
-.PHONY: all dist clean
+.PHONY: all dist clean $(DESKTOPFILES)
 
 all:
 
@@ -17,5 +18,8 @@ dist: $(DISTFILES)
 	tar -czf $(P).tar.gz --transform='s%^%$(P)/%' $^
 	tar -tzvf $(P).tar.gz
 
+$(DESKTOPFILES):
+	desktop-file-validate $@
+
 clean:
 	-rm -f *~ *.tmp *.gz *.bz2

diff --git a/emacs.desktop b/emacs.desktop
index 4192803..2e7318f 100644
--- a/emacs.desktop
+++ b/emacs.desktop
@@ -1,7 +1,9 @@
 [Desktop Entry]
+Type=Application
+Version=1.0
 Name=GNU Emacs
 GenericName=Emacs
-Comment=Emacs is the extensible, customizable, self-documenting real-time display editor.
+Comment=Emacs is the extensible, customizable, self-documenting real-time display editor
 Comment[de]=Emacs ist der erweiterbare, anpassbare, selbst-dokumentierende Echtzeit-Editor
 Comment[es]=Emacs es un editor ampliable, adaptable, mismo documentado, de tiempo real
 Comment[fr]=Emacs est l'éditeur plein écran avancé, auto-documenté, personnalisable et extensible
@@ -9,6 +11,5 @@ Icon=emacs
 TryExec=/usr/bin/emacs
 Exec=/usr/bin/emacs %F
 Terminal=false
-Type=Application
-Categories=Development;TextEditor;
 MimeType=text/css;text/english;text/html;text/plain;text/x-c;text/x-chdr;text/x-csrc;text/x-c++;text/x-c++hdr;text/x-c++src;text/x-java;text/x-makefile;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;
+Categories=Development;TextEditor;

diff --git a/emacsclient.desktop b/emacsclient.desktop
index 4a43404..cc03ba0 100644
--- a/emacsclient.desktop
+++ b/emacsclient.desktop
@@ -1,13 +1,14 @@
 [Desktop Entry]
+Type=Application
+Version=1.0
 Name=Emacsclient
+NoDisplay=true
 Comment=Tell a running Emacs to visit a file
 Comment[de]=In einer laufenden Emacs-Instanz eine Datei öffnen
 Comment[es]=Abrir un archivo en un Emacs corriente
 Comment[fr]=Ouvre un fichier dans une instance d'Emacs qui est déjà lancée
 Icon=emacs
-NoDisplay=true
 TryExec=/usr/bin/emacsclient
 Exec=/usr/bin/emacsclient %F
 Terminal=false
-Type=Application
 MimeType=text/css;text/english;text/html;text/plain;text/x-c;text/x-chdr;text/x-csrc;text/x-c++;text/x-c++hdr;text/x-c++src;text/x-java;text/x-makefile;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;