From 0852e51f908d9e2fc636af3fd39577ce32879bae Mon Sep 17 00:00:00 2001 From: Modestas Vainius Date: Sun, 20 Feb 2011 14:10:15 +0200 Subject: [PATCH 1/3] Open new changelog. --- debian/changelog | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index 5ea58dfdf..6a8191d18 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,8 @@ +cmake (2.8.3-5) UNRELEASED; urgency=low + + + -- Modestas Vainius Sun, 20 Feb 2011 14:09:50 +0200 + cmake (2.8.3-4) unstable; urgency=low * Release to unstable. From 6fe5af41464dbab37137adf3de6468872511a333 Mon Sep 17 00:00:00 2001 From: Modestas Vainius Date: Sun, 20 Feb 2011 14:15:51 +0200 Subject: [PATCH 2/3] Check if /usr/share/doc/$pkgname is a directory before attempting to remove it. {cmake,cmake-doc,cmake-dbg,cmake-*-gui}.postinst affected. (Closes: #614202) --- debian/changelog | 2 ++ debian/cmake-curses-gui.postinst | 6 ++++-- debian/cmake-dbg.postinst | 6 ++++-- debian/cmake-doc.postinst | 6 ++++-- debian/cmake-qt-gui.postinst | 6 ++++-- debian/cmake.postinst | 6 ++++-- 6 files changed, 22 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6a8191d18..c5f52b1e0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,7 @@ cmake (2.8.3-5) UNRELEASED; 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 Sun, 20 Feb 2011 14:09:50 +0200 diff --git a/debian/cmake-curses-gui.postinst b/debian/cmake-curses-gui.postinst index 273c66bf1..4b7240107 100644 --- a/debian/cmake-curses-gui.postinst +++ b/debian/cmake-curses-gui.postinst @@ -3,14 +3,16 @@ set -e pkgname=`basename "$0" .postinst` +docdir="/usr/share/doc/$pkgname" # Manually create a /usr/share/doc/$pkgname symlink manually 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# diff --git a/debian/cmake-dbg.postinst b/debian/cmake-dbg.postinst index 273c66bf1..4b7240107 100644 --- a/debian/cmake-dbg.postinst +++ b/debian/cmake-dbg.postinst @@ -3,14 +3,16 @@ set -e pkgname=`basename "$0" .postinst` +docdir="/usr/share/doc/$pkgname" # Manually create a /usr/share/doc/$pkgname symlink manually 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# diff --git a/debian/cmake-doc.postinst b/debian/cmake-doc.postinst index 273c66bf1..4b7240107 100644 --- a/debian/cmake-doc.postinst +++ b/debian/cmake-doc.postinst @@ -3,14 +3,16 @@ set -e pkgname=`basename "$0" .postinst` +docdir="/usr/share/doc/$pkgname" # Manually create a /usr/share/doc/$pkgname symlink manually 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# diff --git a/debian/cmake-qt-gui.postinst b/debian/cmake-qt-gui.postinst index 273c66bf1..4b7240107 100644 --- a/debian/cmake-qt-gui.postinst +++ b/debian/cmake-qt-gui.postinst @@ -3,14 +3,16 @@ set -e pkgname=`basename "$0" .postinst` +docdir="/usr/share/doc/$pkgname" # Manually create a /usr/share/doc/$pkgname symlink manually 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# diff --git a/debian/cmake.postinst b/debian/cmake.postinst index 273c66bf1..4b7240107 100644 --- a/debian/cmake.postinst +++ b/debian/cmake.postinst @@ -3,14 +3,16 @@ set -e pkgname=`basename "$0" .postinst` +docdir="/usr/share/doc/$pkgname" # Manually create a /usr/share/doc/$pkgname symlink manually 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# From 6e4c8812ccca3d17a076b799c16d510f59ba5069 Mon Sep 17 00:00:00 2001 From: Modestas Vainius Date: Sun, 20 Feb 2011 14:16:48 +0200 Subject: [PATCH 3/3] Release to unstable. --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c5f52b1e0..4f5377e3d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -cmake (2.8.3-5) UNRELEASED; urgency=low +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 Sun, 20 Feb 2011 14:09:50 +0200 + -- Modestas Vainius Sun, 20 Feb 2011 14:16:34 +0200 cmake (2.8.3-4) unstable; urgency=low