[Pkg-apache-commits] r959 - in /trunk/apache2: apache2-dbg.postinst apache2.postinst changelog mpms.postinst

[sf at alioth.debian.org]

Author: sf
Date: Mon Jun  8 17:06:19 2009
New Revision: 959

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=959
Log:
Fix postinst

Modified:
    trunk/apache2/apache2-dbg.postinst
    trunk/apache2/apache2.postinst
    trunk/apache2/changelog
    trunk/apache2/mpms.postinst

Modified: trunk/apache2/apache2-dbg.postinst
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/apache2-dbg.postinst?rev=959&op=diff
==============================================================================
--- trunk/apache2/apache2-dbg.postinst (original)
+++ trunk/apache2/apache2-dbg.postinst Mon Jun  8 17:06:19 2009
@@ -6,9 +6,9 @@
 fi
 
 P=apache2-dbg
-if dpkg --compare-versions $2 lt 2.2.11-5~ ; then
+if dpkg --compare-versions "$2" lt 2.2.11-5~ ; then
 	DOCDIR=/usr/share/doc/$P
-	if [ -d $DOCDIR ] ; then
+	if [ ! -h $DOCDIR -a -d $DOCDIR ] ; then
 		rmdir $DOCDIR 2> /dev/null && ln -s apache2.2-bin $DOCDIR
 	fi
 fi

Modified: trunk/apache2/apache2.postinst
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/apache2.postinst?rev=959&op=diff
==============================================================================
--- trunk/apache2/apache2.postinst (original)
+++ trunk/apache2/apache2.postinst Mon Jun  8 17:06:19 2009
@@ -8,9 +8,9 @@
 # postinst for apache2, apache2-prefork-dev, apache2-threaded-dev
 
 P=apache2
-if dpkg --compare-versions $2 lt 2.2.11-5~ ; then
+if dpkg --compare-versions "$2" lt 2.2.11-5~ ; then
 	DOCDIR=/usr/share/doc/$P
-	if [ -d $DOCDIR ] ; then
+	if [ ! -h $DOCDIR -a -d $DOCDIR ] ; then
 		rmdir $DOCDIR 2> /dev/null && ln -s apache2.2-common $DOCDIR
 	fi
 fi

Modified: trunk/apache2/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/changelog?rev=959&op=diff
==============================================================================
--- trunk/apache2/changelog (original)
+++ trunk/apache2/changelog Mon Jun  8 17:06:19 2009
@@ -1,3 +1,9 @@
+apache2 (2.2.11-6) UNRELEASED; urgency=low
+
+  * Fix postinst scripts (closes: #532278).
+
+ -- Stefan Fritsch <sf at debian.org>  Mon, 08 Jun 2009 19:04:13 +0200
+
 apache2 (2.2.11-5) unstable; urgency=low
 
   * Move all binaries into a new package apache2.2-bin and make

Modified: trunk/apache2/mpms.postinst
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/mpms.postinst?rev=959&op=diff
==============================================================================
--- trunk/apache2/mpms.postinst (original)
+++ trunk/apache2/mpms.postinst Mon Jun  8 17:06:19 2009
@@ -36,9 +36,9 @@
         fi
 fi
 
-if dpkg --compare-versions $2 lt 2.2.11-5~ ; then
+if dpkg --compare-versions "$2" lt 2.2.11-5~ ; then
 	DOCDIR=/usr/share/doc/$P
-	if [ -d $DOCDIR ] ; then
+	if [ ! -h $DOCDIR -a -d $DOCDIR ] ; then
 		rmdir $DOCDIR 2> /dev/null && ln -s apache2.2-common $DOCDIR
 	fi
 fi