commit cfea628da679c3fd48a6d574869a70f13a02c7c7
author Jonathan Nieder <jrnieder@gmail.com> Wed Mar 09 17:07:29 2011 -0600
committer Jonathan Nieder <jrnieder@gmail.com> Wed Mar 09 17:10:45 2011 -0600
tree ffc117cac73f0e97284f062c15f84c8c7f09ac04
parent 16ac8f045be3413f812f1d9a629ee3d27fdb8fde

debian/git-el: remove spurious doc/git/contrib/emacs.old directory

Now that git-el's postinst uses lstat(2) and no longer confuses
a symlink to a directory for a directory, spurious emacs.old
directories in /usr/share/doc/git/contrib should be a thing of
the past.  Clean up the old mess:

 - if contrib/emacs.old is a symlink (from trying to install git-el
   once), remove it.
 - if contrib/emacs/emacs is a symlink (from trying to install git-el
   twice), remove it.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>

debian/git-el.postinst

diff --git a/debian/git-el.postinst b/debian/git-el.postinst
index 18af229..5ffd7c9 100644
--- a/debian/git-el.postinst
+++ b/debian/git-el.postinst
@@ -3,6 +3,12 @@
 test "$1" = configure || exit 0
 /usr/lib/emacsen-common/emacs-package-install git
 
+# Clean up after 1:1.7.4.1-1 through 1:1.7.4.1-3.
+! test -L /usr/share/git-core/emacs/emacs ||
+rm -f /usr/share/git-core/emacs/emacs
+! test -L /usr/share/doc/git/contrib/emacs.old ||
+rm -f /usr/share/doc/git/contrib/emacs.old
+
 # Replace the old /usr/share/doc/git/contrib/emacs directory
 # with a symlink.
 test -z "$2" &&