Debian Emacs Devel Commit: rev 51 - emacs21/pkg/trunk/debian

[Jerome Marant]

Author: jerome
Date: 2004-02-26 23:28:20 +0100 (Thu, 26 Feb 2004)
New Revision: 51

Added:
   emacs21/pkg/trunk/debian/emacs.desktop
Modified:
   emacs21/pkg/trunk/debian/changelog
   emacs21/pkg/trunk/debian/rules
Log:
Added desktop entry (#233711) ; Rewritten my changelog entries

Modified: emacs21/pkg/trunk/debian/changelog
===================================================================
--- emacs21/pkg/trunk/debian/changelog	2004-02-22 18:40:13 UTC (rev 50)
+++ emacs21/pkg/trunk/debian/changelog	2004-02-26 22:28:20 UTC (rev 51)
@@ -4,28 +4,46 @@
   ==============================================================
   =============   UNRELEASED DEVELOPMENT VERSION   =============
   ==============================================================  
-  ==============================================================  
-  * debian/patches/emacsclient-alternate-editor.dpatch: new patch
-    allowing emacsclient to handle ALTERNATE_EDITOR properly when the
-    command is run without any parameter. Closes: Bug#219658.
-    [Jérôme Marant]
-  * debian/control.in: emacs and emacs-nox now provide the `editor'
-    virtual package. (closes: #66243, #90154) [Jérôme Marant]
-  * debian/control: synchronized with debian/control.in.
-  * debian/emacs.postinst: adding an `editor' alternative with a priority
-    of 0 as discussed in
-    http://lists.debian.org/debian-policy/2000/debian-policy-200006/msg00122.html
-    [Jérôme Marant]
-  * debian/emacs.prerm: removing the `editor' alternative on package
-    removal. [Jérôme Marant]
-  * debian/changelog: added Emacs local variables forcing coding
-    to UTF-8. [Jérôme Marant]
-  * debian/menu.in: call the text version of emacs correctly.
-    (closes: #221171) [Jérôme Marant]
-  * debian/build-common-pkg: install missing emacsclient manpage.
-    (closes: #222767) [Jérôme Marant]
-  * debian/emacs-common.postinst: install alternative for emacsclient
-    manpage. [Jérôme Marant]
+  ==============================================================
+
+  * Apply patch allowing emacsclient to handle ALTERNATE_EDITOR properly
+    when the command is run without any parameter [Jérôme Marant]
+    (closes: #219658)
+    - debian/patches/emacsclient-alternate-editor.dpatch: new
+
+  * Provide the `editor' virtual package. [Jérôme Marant]
+    (closes: #66243, #90154) 
+    - debian/control.in: emacs and emacs-nox now provide the `editor'
+      virtual package. 
+    - debian/control: synchronized with debian/control.in
+    - debian/emacs.postinst: adding an `editor' alternative with a priority
+      of 0 as discussed in
+      http://lists.debian.org/debian-policy/2000/debian-policy-200006/msg00122.html
+    - debian/emacs.prerm: removing the `editor' alternative on package
+      removal
+
+  * Added automatic switching to UTF-8 encoding when editing the debian
+    changelog file. [Jérôme Marant]
+    - debian/changelog: added Emacs local variables forcing coding
+      to UTF-8 
+
+  * Fix handling of menu entry for text version of Emacs [Jérôme Marant]
+    (closes: #221171)
+    - debian/menu.in: call the text version of emacs with the `-nw'
+      parameter
+
+  * Install the emacsclient manpage [Jérôme Marant] (closes: #222767) 
+    - debian/build-common-pkg: install missing emacsclient manpage.
+    - debian/emacs-common.postinst: install alternative for emacsclient
+      manpage
+  
+  * Install .desktop entry in order to make Emacs easy to start in
+    both GNOME and KDE. Thanks to Adam C Powell IV <hazelsct@debian.org>
+    [Jérôme Marant] (closes: #233711)
+    - emacs.desktop: new template file for desktop entries
+    - debian/rules: generate desktop file from emacs.desktop template
+      and install it for emacs21.
+  
   * test -n "${major_ver}" in a few places so that we don't accidentally
     generate bad output files from our .in files.
   * truncate aclocal.m4 during autofiles-sync so that old bits won't kill new

Added: emacs21/pkg/trunk/debian/emacs.desktop
===================================================================
--- emacs21/pkg/trunk/debian/emacs.desktop	2004-02-22 18:40:13 UTC (rev 50)
+++ emacs21/pkg/trunk/debian/emacs.desktop	2004-02-26 22:28:20 UTC (rev 51)
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=Emacs @MAJOR_VERSION@ (X11)
+GenericName=Emacs
+Comment=GNU Emacs @MAJOR_VERSION@ Text Editor
+Exec=/usr/bin/emacs@MAJOR_VERSION@
+TryExec=emacs@MAJOR_VERSION@
+Terminal=false
+Type=Application
+Icon=/usr/share/emacs/@FULL_VERSION@/etc/gnu-32x32.xpm
+Categories=Application;Utility;TextEditor;

Modified: emacs21/pkg/trunk/debian/rules
===================================================================
--- emacs21/pkg/trunk/debian/rules	2004-02-22 18:40:13 UTC (rev 50)
+++ emacs21/pkg/trunk/debian/rules	2004-02-26 22:28:20 UTC (rev 51)
@@ -170,7 +170,8 @@
   debian/README \
   debian/README.binpkg \
   debian/menu-emacs${major_ver} \
-  debian/menu-emacs${major_ver}-nox
+  debian/menu-emacs${major_ver}-nox \
+  debian/emacs${major_ver}.desktop
 
 DEBPKGFILES := ${PERSISTENT_AUTOGEN_FILES} ${NONPERSISTENT_AUTOGEN_FILES}
 
@@ -383,6 +384,9 @@
 debian/menu-emacs${major_ver}-nox: debian/menu.in
 	${expand_file_subst_vars}
 
+debian/emacs${major_ver}.desktop: debian/emacs.desktop
+	${expand_file_subst_vars}
+
 debian/%: debian/%.in debian/changelog
 	${expand_file_subst_vars}
 
@@ -577,6 +581,11 @@
 	mv debian/pkg-common/usr/lib/emacs/${runtime_ver}/${target}/fns-*-x.el \
 	   debian/pkg-x/usr/lib/emacs/${runtime_ver}/${target}/
 
+	# install desktop entry
+	install -d debian/pkg-x/usr/share/applications
+	install -m 0644 emacs${major_ver}.desktop \
+	  debian/pkg-x/usr/share/applications
+
         ##################################################
         # build packages