Don't assume /usr/info/dir exists if /usr/info does.

diff --git a/ChangeLog b/ChangeLog
index 0f4732c2e2fd50fe9115cf0391d482f637eebb10..1175cab8904351185817de4f22ea2553354b7cec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Oct 27 11:06:25 CST 2003 Adam Heath <doogie@debian.org>
+
+  * debian/dpkg.postinst: Don't assume /usr/info/dir exists if /usr/info
+    does.
+
 Mon Oct 27 10:57:54 CST 2003 Adam Heath <doogie@debian.org>
 
   * scripts/dpkg-source.pl: Add .#* to the default ignore filter.

diff --git a/debian/changelog b/debian/changelog
index ab19b01f7ba828dd5e4b091fe97e51ed20ea9234..d46e69661dd335f482bb10f08e86dbfc44a0ac4c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ dpkg (1.10.17) unstable; urgency=medium
     Add -u in dpkg-scanpackages.  Closes: #214123.
     Add -a<arch> command to dpkg-scanpackages.
   * Add .#* to dpkg-source's default ignore filter.  Closes: #217380.
+  * Matthias Urlichs <smurf@smurf.noris.de>:
+    Don't assume /usr/info/dir exists if /usr/info does.  Closes: #165770.
 
  -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
 

diff --git a/debian/dpkg.postinst b/debian/dpkg.postinst
index b29de4725a1cd6a67ad404e2bbe9408957106be3..38d7f196e78ff5e24b8555f0c98f364590dd2800 100755 (executable)
--- a/debian/dpkg.postinst
+++ b/debian/dpkg.postinst
@@ -114,7 +114,8 @@ OK.
        esac
 fi
 
-if [ -d /usr/info -a ! -L /usr/info -a ! -L /usr/info/dir ]; then              
+if [ -d /usr/info -a ! -L /usr/info -a ! -L /usr/info/dir \
+               -a -f /usr/info/dir ]; then              
        echo Moving /usr/info/dir to /usr/share/info/dir.
        mv /usr/info/dir /usr/share/info/dir
        if [ -f /usr/info/dir.old ]; then