Merge commit 'debian/2.8.3-5'

debian/changelog

@@ -44,6 +44,13 @@ cmake (2.8.4-1) experimental; urgency=low
 
  -- Modestas Vainius <modax@debian.org>  Sat, 19 Feb 2011 20:07:33 +0200
 
+cmake (2.8.3-5) unstable; urgency=low
+
+  * Check if /usr/share/doc/$pkgname is a directory before attempting to remove
+    it in {cmake,cmake-doc,cmake-dbg,cmake-*-gui}.postinst. (Closes: #614202)
+
+ -- Modestas Vainius <modax@debian.org>  Sun, 20 Feb 2011 14:16:34 +0200
+
 cmake (2.8.3-4) unstable; urgency=low
 
   * Release to unstable.

debian/cmake-curses-gui.postinst

@@ -3,13 +3,15 @@
 set -e
 
 pkgname=`basename "$0" .postinst`
+docdir="/usr/share/doc/$pkgname"
 
 # Manually create /usr/share/doc/$pkgname symlink on upgrades (see #404850)
 if [ "$1" = "configure" ] && [ -n "$2" ] && \
+   [ ! -L "$docdir" ] &&  [ -d "$docdir" ] && \
      dpkg --compare-versions "$2" lt "2.8.3-3";
 then
-    rmdir "/usr/share/doc/$pkgname"
-    ln -s "cmake-data" "/usr/share/doc/$pkgname"
+    rmdir "$docdir"
+    ln -s "cmake-data" "$docdir"
 fi
 
 #DEBHELPER#

debian/cmake-dbg.postinst

@@ -3,13 +3,15 @@
 set -e
 
 pkgname=`basename "$0" .postinst`
+docdir="/usr/share/doc/$pkgname"
 
 # Manually create /usr/share/doc/$pkgname symlink on upgrades (see #404850)
 if [ "$1" = "configure" ] && [ -n "$2" ] && \
+   [ ! -L "$docdir" ] &&  [ -d "$docdir" ] && \
      dpkg --compare-versions "$2" lt "2.8.3-3";
 then
-    rmdir "/usr/share/doc/$pkgname"
-    ln -s "cmake-data" "/usr/share/doc/$pkgname"
+    rmdir "$docdir"
+    ln -s "cmake-data" "$docdir"
 fi
 
 #DEBHELPER#

debian/cmake-doc.postinst

@@ -3,13 +3,15 @@
 set -e
 
 pkgname=`basename "$0" .postinst`
+docdir="/usr/share/doc/$pkgname"
 
 # Manually create /usr/share/doc/$pkgname symlink on upgrades (see #404850)
 if [ "$1" = "configure" ] && [ -n "$2" ] && \
+   [ ! -L "$docdir" ] &&  [ -d "$docdir" ] && \
      dpkg --compare-versions "$2" lt "2.8.3-3";
 then
-    rmdir "/usr/share/doc/$pkgname"
-    ln -s "cmake-data" "/usr/share/doc/$pkgname"
+    rmdir "$docdir"
+    ln -s "cmake-data" "$docdir"
 fi
 
 #DEBHELPER#

debian/cmake-qt-gui.postinst

@@ -3,13 +3,15 @@
 set -e
 
 pkgname=`basename "$0" .postinst`
+docdir="/usr/share/doc/$pkgname"
 
 # Manually create /usr/share/doc/$pkgname symlink on upgrades (see #404850)
 if [ "$1" = "configure" ] && [ -n "$2" ] && \
+   [ ! -L "$docdir" ] &&  [ -d "$docdir" ] && \
      dpkg --compare-versions "$2" lt "2.8.3-3";
 then
-    rmdir "/usr/share/doc/$pkgname"
-    ln -s "cmake-data" "/usr/share/doc/$pkgname"
+    rmdir "$docdir"
+    ln -s "cmake-data" "$docdir"
 fi
 
 #DEBHELPER#

debian/cmake.postinst

@@ -3,13 +3,15 @@
 set -e
 
 pkgname=`basename "$0" .postinst`
+docdir="/usr/share/doc/$pkgname"
 
 # Manually create /usr/share/doc/$pkgname symlink on upgrades (see #404850)
 if [ "$1" = "configure" ] && [ -n "$2" ] && \
+   [ ! -L "$docdir" ] &&  [ -d "$docdir" ] && \
      dpkg --compare-versions "$2" lt "2.8.3-3";
 then
-    rmdir "/usr/share/doc/$pkgname"
-    ln -s "cmake-data" "/usr/share/doc/$pkgname"
+    rmdir "$docdir"
+    ln -s "cmake-data" "$docdir"
 fi
 
 #DEBHELPER#