diff -u xemacs21-21.4.20/debian/xemacs@MAJVERSION@@SUBNAME@-support.prerm.in xemacs21-21.4.20/debian/xemacs@MAJVERSION@@SUBNAME@-support.prerm.in
--- xemacs21-21.4.20/debian/xemacs@MAJVERSION@@SUBNAME@-support.prerm.in
+++ xemacs21-21.4.20/debian/xemacs@MAJVERSION@@SUBNAME@-support.prerm.in
@@ -1,7 +1,7 @@
 #!/bin/sh -e
 set -e
 
-install-info --quiet --remove xemacs@MAJVERSION@.info
+install-info --quiet --remove-exactly xemacs21/xemacs
 
 rmdir /usr/local/lib/xemacs/site-lisp > /dev/null 2>&1 && \
    rmdir /usr/local/lib/xemacs > /dev/null 2>&1 || \
diff -u xemacs21-21.4.20/debian/changelog xemacs21-21.4.20/debian/changelog
--- xemacs21-21.4.20/debian/changelog
+++ xemacs21-21.4.20/debian/changelog
@@ -1,3 +1,11 @@
+xemacs21 (21.4.20-1.1ubuntu1) gutsy; urgency=low
+
+  * Corrected dir entry for info file. 
+    Fixed install-info for entry.
+    Fixed install-info removal of it closes: #4883
+
+ -- Ralph Janke <raj@oulp>  Wed, 28 Nov 2007 01:22:28 +0000
+
 xemacs21 (21.4.20-1.1) unstable; urgency=low
 
   * NMU
diff -u xemacs21-21.4.20/debian/xemacs@MAJVERSION@@SUBNAME@-support.postinst.in xemacs21-21.4.20/debian/xemacs@MAJVERSION@@SUBNAME@-support.postinst.in
--- xemacs21-21.4.20/debian/xemacs@MAJVERSION@@SUBNAME@-support.postinst.in
+++ xemacs21-21.4.20/debian/xemacs@MAJVERSION@@SUBNAME@-support.postinst.in
@@ -10,7 +10,7 @@
 test -L ${OLDDATADIR}/etc || ln -s ${NEWDATADIR}/etc ${OLDDATADIR}/etc
 test -L ${OLDDATADIR}/lisp || ln -s ${NEWDATADIR}/lisp ${OLDDATADIR}/lisp
 
-#install-info --quiet --section "Emacs" "XEmacs@VERSION@" /@PREFIX@/share/info/xemacs@MAJVERSION@/xemacs@MAJVERSION@.info
+install-info --quiet --section "Emacs" "XEmacs@VERSION@" /@PREFIX@/share/info/xemacs@MAJVERSION@/xemacs.info
 
 mkdir -p /usr/local/lib/xemacs/site-lisp > /dev/null 2>&1 || true
 
diff -u xemacs21-21.4.20/debian/patches/00list xemacs21-21.4.20/debian/patches/00list
--- xemacs21-21.4.20/debian/patches/00list
+++ xemacs21-21.4.20/debian/patches/00list
@@ -4,6 +4,7 @@
 04_ia64_not_export_dynamic
 05_fix_FTBFS_on_kFreeBSD
 10_gnuserv_disable_inet
+10_info_correct_dir
 10_info_el_with_line_number
 10_itimer_error_with_de
 20_gcc_4.0_compiling
diff -u xemacs21-21.4.20/debian/xemacs21.info xemacs21-21.4.20/debian/xemacs21.info
--- xemacs21-21.4.20/debian/xemacs21.info
+++ xemacs21-21.4.20/debian/xemacs21.info
@@ -4,7 +4,7 @@
    This file documents XEmacs 21.4.17
 
 START-INFO-DIR-ENTRY
-* XEmacs21: (xemacs21/xemacs21). Documentation for XEmacs 21.4.17
+* XEmacs21: (xemacs21/xemacs). Documentation for XEmacs 21.4.17
 END-INFO-DIR-ENTRY
 
 
only in patch2:
unchanged:
--- xemacs21-21.4.20.orig/debian/patches/10_info_correct_dir.dpatch
+++ xemacs21-21.4.20/debian/patches/10_info_correct_dir.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_debian_patch.dpatch by  <schizo@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -Nurad xemacs21-21.4.20/man/xemacs/xemacs.texi.orig xemacs21-21.4.20/man/xemacs/xemacs.texi
+--- xemacs21-21.4.20/man/xemacs/xemacs.texi.orig	2007-11-27 23:45:42.000000000 +0000
++++ xemacs21-21.4.20/man/xemacs/xemacs.texi	2007-11-27 23:46:14.000000000 +0000
+@@ -6,7 +6,7 @@
+ @ifinfo
+ @dircategory XEmacs Editor
+ @direntry
+-* XEmacs: (xemacs).		XEmacs Editor.
++* XEmacs: (xemacs21/xemacs).		XEmacs Editor.
+ @end direntry
+ 
+ This file documents the XEmacs editor.