[Pkg-drupal-commits] r2219 - in /branches/drupal7/debian: changelog drupal7.config drupal7.install drupal7.postinst drupal7.postrm etc/apache.conf etc/apache2.conf

[luigi at users.alioth.debian.org]

Author: luigi
Date: Wed Jul 13 14:28:13 2011
New Revision: 2219

URL: http://svn.debian.org/wsvn/pkg-drupal/?sc=1&rev=2219
Log:
Renamed apache.conf to apache2.conf (Closes: #632925)

Added:
    branches/drupal7/debian/etc/apache2.conf
      - copied unchanged from r2216, branches/drupal7/debian/etc/apache.conf
Removed:
    branches/drupal7/debian/etc/apache.conf
Modified:
    branches/drupal7/debian/changelog
    branches/drupal7/debian/drupal7.config
    branches/drupal7/debian/drupal7.install
    branches/drupal7/debian/drupal7.postinst
    branches/drupal7/debian/drupal7.postrm

Modified: branches/drupal7/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal7/debian/changelog?rev=2219&op=diff
==============================================================================
--- branches/drupal7/debian/changelog (original)
+++ branches/drupal7/debian/changelog Wed Jul 13 14:28:13 2011
@@ -5,6 +5,9 @@
 
   * debian/control
     - Bumped Standard-Version to 3.9.2.0, no change needed
+
+  * debian/drupal7.{config,install,postinst,postrm}
+    - Renamed apache.conf to apache2.conf (Closes: #632925)
 
  -- Luigi Gangitano <luigi at debian.org>  Wed, 13 Jul 2011 16:15:35 +0200
 

Modified: branches/drupal7/debian/drupal7.config
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal7/debian/drupal7.config?rev=2219&op=diff
==============================================================================
--- branches/drupal7/debian/drupal7.config (original)
+++ branches/drupal7/debian/drupal7.config Wed Jul 13 14:28:13 2011
@@ -33,7 +33,7 @@
 upgradesdir="${docdir}/upgrades"
 configdir="/etc/drupal/7"
 configfile="${configdir}/conf.php"
-includefile="${configdir}/apache.conf"
+includefile="${configdir}/apache2.conf"
 ################################################
 # End installation directories definition block #
 ################################################

Modified: branches/drupal7/debian/drupal7.install
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal7/debian/drupal7.install?rev=2219&op=diff
==============================================================================
--- branches/drupal7/debian/drupal7.install (original)
+++ branches/drupal7/debian/drupal7.install Wed Jul 13 14:28:13 2011
@@ -5,6 +5,6 @@
 themes			usr/share/drupal7
 robots.txt		usr/share/drupal7
 profiles		usr/share/drupal7
-debian/etc/apache.conf	etc/drupal/7
+debian/etc/apache2.conf	etc/drupal/7
 debian/etc/settings.php	etc/drupal/7/sites/default
 debian/cron.sh		usr/share/drupal7/scripts

Modified: branches/drupal7/debian/drupal7.postinst
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal7/debian/drupal7.postinst?rev=2219&op=diff
==============================================================================
--- branches/drupal7/debian/drupal7.postinst (original)
+++ branches/drupal7/debian/drupal7.postinst Wed Jul 13 14:28:13 2011
@@ -27,7 +27,7 @@
 upgradesdir="${docdir}/upgrades"
 configdir="/etc/drupal/7"
 default_configfile="${configdir}/sites/default/settings.php"
-includefile="${configdir}/apache.conf"
+includefile="${configdir}/apache2.conf"
 cronfile="/etc/cron.d/${package_name}"
 
 OLDVERSION="$2"

Modified: branches/drupal7/debian/drupal7.postrm
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal7/debian/drupal7.postrm?rev=2219&op=diff
==============================================================================
--- branches/drupal7/debian/drupal7.postrm (original)
+++ branches/drupal7/debian/drupal7.postrm Wed Jul 13 14:28:13 2011
@@ -39,7 +39,7 @@
 upgradesdir="${docdir}upgrades/"
 configdir="/etc/drupal/7/"
 configfile="${configdir}conf.php"
-includefile="${configdir}apache.conf"
+includefile="${configdir}apache2.conf"
 dbconfigfile="${configdir}/sites/default/dbconfig.php"
 cronfile="/etc/cron.d/${package_name}"