[Pkg-drupal-commits] r1987 - in /branches/drupal6/debian: changelog drupal6.postinst drupal6.postrm

[luigi at users.alioth.debian.org]

Author: luigi
Date: Thu Jan  8 20:02:27 2009
New Revision: 1987

URL: http://svn.debian.org/wsvn/pkg-drupal/?sc=1&rev=1987
Log:
Changed apache configuration link name to drupal6.conf, to avoid collision with drupal5 (Closes: #509769)

Modified:
    branches/drupal6/debian/changelog
    branches/drupal6/debian/drupal6.postinst
    branches/drupal6/debian/drupal6.postrm

Modified: branches/drupal6/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/debian/changelog?rev=1987&op=diff
==============================================================================
--- branches/drupal6/debian/changelog (original)
+++ branches/drupal6/debian/changelog Thu Jan  8 20:02:27 2009
@@ -7,6 +7,10 @@
 
   * debian/control
     - Added dependency on ${misc:Depends} to make lintian happy
+
+  * debian/drupal6.{postinst,postrm}
+    - Changed apache configuration link name to drupal6.conf, to avoid
+      collision with drupal5 (Closes: #509769)
 
  -- Luigi Gangitano <luigi at debian.org>  Thu, 08 Jan 2009 20:49:51 +0100
 

Modified: branches/drupal6/debian/drupal6.postinst
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/debian/drupal6.postinst?rev=1987&op=diff
==============================================================================
--- branches/drupal6/debian/drupal6.postinst (original)
+++ branches/drupal6/debian/drupal6.postinst Thu Jan  8 20:02:27 2009
@@ -41,8 +41,8 @@
 	    if [ ! -d /etc/$webserver/conf.d/ ]; then
 			install -d -m755 /etc/$webserver/conf.d/
 	    fi
-	    if [ ! -e /etc/$webserver/conf.d/drupal.conf ]; then
-			ln -s ${includefile} /etc/$webserver/conf.d/drupal.conf
+	    if [ ! -e /etc/$webserver/conf.d/drupal6.conf ]; then
+			ln -s ${includefile} /etc/$webserver/conf.d/drupal6.conf
 			restart="$i $restart"
 	    fi
       

Modified: branches/drupal6/debian/drupal6.postrm
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/debian/drupal6.postrm?rev=1987&op=diff
==============================================================================
--- branches/drupal6/debian/drupal6.postrm (original)
+++ branches/drupal6/debian/drupal6.postrm Thu Jan  8 20:02:27 2009
@@ -49,8 +49,8 @@
     purge|remove)
 
 	# Un-configure webservers
-	if [ -L /etc/$webserver/conf.d/drupal.conf ]; then
-		rm -f /etc/$webserver/conf.d/drupal.conf || true
+	if [ -L /etc/$webserver/conf.d/drupal6.conf ]; then
+		rm -f /etc/$webserver/conf.d/drupal6.conf || true
 		restart="$i $restart"
 	fi