Bug#362780: reinstall of x11-common fails during post-install script

[Bart Vanhaute <bart_vanhaute_@hotmail.com>]

Package: x11-common
Version: 1:7.0.11
Severity: normal

If I reinstall x11-common (because I wronly removed the X
symlink, see e.g. bug 362685), the post-install script fails:
Setting up x11-common (7.0.11) ...
rmdir: /usr/X11R6/bin: Not a directory
x11-common postinst error: Could not remove /usr/X11R6/bin. Is not yet empty

However:
$ file /usr/X11R6/bin
/usr/X11R6/bin: symbolic link to `/usr/bin'

The script does not correctly recognize it as being a symbolic link.
The test on line 904 of x11-common.postinst
if [ -d "/usr/X11R6/bin" ]; then
should be changed into
if [ ! -L "/usr/X11R6/bin" -a -d "/usr/X11R6/bin" ]; then



-- System Information:
Debian Release: testing/unstable
  APT prefers unstable
  APT policy: (500, 'unstable'), (101, 'experimental')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.16-1-686
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)

Versions of packages x11-common depends on:
ii  debconf [debconf-2.0]         1.4.72     Debian configuration management sy
ii  debianutils                   2.15.5     Miscellaneous utilities specific t
ii  laptop-detect                 0.12.1     attempt to detect a laptop
ii  lsb-base                      3.1-3      Linux Standard Base 3.1 init scrip

x11-common recommends no packages.

-- debconf information excluded