Merge commit 'debian/2.8.3-5'
This commit is contained in:
commit
d113753ebb
7
debian/changelog
vendored
7
debian/changelog
vendored
@ -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
|
-- 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
|
cmake (2.8.3-4) unstable; urgency=low
|
||||||
|
|
||||||
* Release to unstable.
|
* Release to unstable.
|
||||||
|
6
debian/cmake-curses-gui.postinst
vendored
6
debian/cmake-curses-gui.postinst
vendored
@ -3,13 +3,15 @@
|
|||||||
set -e
|
set -e
|
||||||
|
|
||||||
pkgname=`basename "$0" .postinst`
|
pkgname=`basename "$0" .postinst`
|
||||||
|
docdir="/usr/share/doc/$pkgname"
|
||||||
|
|
||||||
# Manually create /usr/share/doc/$pkgname symlink on upgrades (see #404850)
|
# Manually create /usr/share/doc/$pkgname symlink on upgrades (see #404850)
|
||||||
if [ "$1" = "configure" ] && [ -n "$2" ] && \
|
if [ "$1" = "configure" ] && [ -n "$2" ] && \
|
||||||
|
[ ! -L "$docdir" ] && [ -d "$docdir" ] && \
|
||||||
dpkg --compare-versions "$2" lt "2.8.3-3";
|
dpkg --compare-versions "$2" lt "2.8.3-3";
|
||||||
then
|
then
|
||||||
rmdir "/usr/share/doc/$pkgname"
|
rmdir "$docdir"
|
||||||
ln -s "cmake-data" "/usr/share/doc/$pkgname"
|
ln -s "cmake-data" "$docdir"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#DEBHELPER#
|
#DEBHELPER#
|
||||||
|
6
debian/cmake-dbg.postinst
vendored
6
debian/cmake-dbg.postinst
vendored
@ -3,13 +3,15 @@
|
|||||||
set -e
|
set -e
|
||||||
|
|
||||||
pkgname=`basename "$0" .postinst`
|
pkgname=`basename "$0" .postinst`
|
||||||
|
docdir="/usr/share/doc/$pkgname"
|
||||||
|
|
||||||
# Manually create /usr/share/doc/$pkgname symlink on upgrades (see #404850)
|
# Manually create /usr/share/doc/$pkgname symlink on upgrades (see #404850)
|
||||||
if [ "$1" = "configure" ] && [ -n "$2" ] && \
|
if [ "$1" = "configure" ] && [ -n "$2" ] && \
|
||||||
|
[ ! -L "$docdir" ] && [ -d "$docdir" ] && \
|
||||||
dpkg --compare-versions "$2" lt "2.8.3-3";
|
dpkg --compare-versions "$2" lt "2.8.3-3";
|
||||||
then
|
then
|
||||||
rmdir "/usr/share/doc/$pkgname"
|
rmdir "$docdir"
|
||||||
ln -s "cmake-data" "/usr/share/doc/$pkgname"
|
ln -s "cmake-data" "$docdir"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#DEBHELPER#
|
#DEBHELPER#
|
||||||
|
6
debian/cmake-doc.postinst
vendored
6
debian/cmake-doc.postinst
vendored
@ -3,13 +3,15 @@
|
|||||||
set -e
|
set -e
|
||||||
|
|
||||||
pkgname=`basename "$0" .postinst`
|
pkgname=`basename "$0" .postinst`
|
||||||
|
docdir="/usr/share/doc/$pkgname"
|
||||||
|
|
||||||
# Manually create /usr/share/doc/$pkgname symlink on upgrades (see #404850)
|
# Manually create /usr/share/doc/$pkgname symlink on upgrades (see #404850)
|
||||||
if [ "$1" = "configure" ] && [ -n "$2" ] && \
|
if [ "$1" = "configure" ] && [ -n "$2" ] && \
|
||||||
|
[ ! -L "$docdir" ] && [ -d "$docdir" ] && \
|
||||||
dpkg --compare-versions "$2" lt "2.8.3-3";
|
dpkg --compare-versions "$2" lt "2.8.3-3";
|
||||||
then
|
then
|
||||||
rmdir "/usr/share/doc/$pkgname"
|
rmdir "$docdir"
|
||||||
ln -s "cmake-data" "/usr/share/doc/$pkgname"
|
ln -s "cmake-data" "$docdir"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#DEBHELPER#
|
#DEBHELPER#
|
||||||
|
6
debian/cmake-qt-gui.postinst
vendored
6
debian/cmake-qt-gui.postinst
vendored
@ -3,13 +3,15 @@
|
|||||||
set -e
|
set -e
|
||||||
|
|
||||||
pkgname=`basename "$0" .postinst`
|
pkgname=`basename "$0" .postinst`
|
||||||
|
docdir="/usr/share/doc/$pkgname"
|
||||||
|
|
||||||
# Manually create /usr/share/doc/$pkgname symlink on upgrades (see #404850)
|
# Manually create /usr/share/doc/$pkgname symlink on upgrades (see #404850)
|
||||||
if [ "$1" = "configure" ] && [ -n "$2" ] && \
|
if [ "$1" = "configure" ] && [ -n "$2" ] && \
|
||||||
|
[ ! -L "$docdir" ] && [ -d "$docdir" ] && \
|
||||||
dpkg --compare-versions "$2" lt "2.8.3-3";
|
dpkg --compare-versions "$2" lt "2.8.3-3";
|
||||||
then
|
then
|
||||||
rmdir "/usr/share/doc/$pkgname"
|
rmdir "$docdir"
|
||||||
ln -s "cmake-data" "/usr/share/doc/$pkgname"
|
ln -s "cmake-data" "$docdir"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#DEBHELPER#
|
#DEBHELPER#
|
||||||
|
6
debian/cmake.postinst
vendored
6
debian/cmake.postinst
vendored
@ -3,13 +3,15 @@
|
|||||||
set -e
|
set -e
|
||||||
|
|
||||||
pkgname=`basename "$0" .postinst`
|
pkgname=`basename "$0" .postinst`
|
||||||
|
docdir="/usr/share/doc/$pkgname"
|
||||||
|
|
||||||
# Manually create /usr/share/doc/$pkgname symlink on upgrades (see #404850)
|
# Manually create /usr/share/doc/$pkgname symlink on upgrades (see #404850)
|
||||||
if [ "$1" = "configure" ] && [ -n "$2" ] && \
|
if [ "$1" = "configure" ] && [ -n "$2" ] && \
|
||||||
|
[ ! -L "$docdir" ] && [ -d "$docdir" ] && \
|
||||||
dpkg --compare-versions "$2" lt "2.8.3-3";
|
dpkg --compare-versions "$2" lt "2.8.3-3";
|
||||||
then
|
then
|
||||||
rmdir "/usr/share/doc/$pkgname"
|
rmdir "$docdir"
|
||||||
ln -s "cmake-data" "/usr/share/doc/$pkgname"
|
ln -s "cmake-data" "$docdir"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#DEBHELPER#
|
#DEBHELPER#
|
||||||
|
Loading…
x
Reference in New Issue
Block a user