[Pkg-drupal-commits] r2172 - in /branches/drupal7/debian: changelog dirs drupal7.dirs drupal7.install drupal7.links drupal7.postinst drupal7.postrm links
luigi at users.alioth.debian.org
luigi at users.alioth.debian.org
Sat Mar 5 17:41:33 UTC 2011
Author: luigi
Date: Sat Mar 5 17:41:27 2011
New Revision: 2172
URL: http://svn.debian.org/wsvn/pkg-drupal/?sc=1&rev=2172
Log:
Removed automatic link from apache2 configuration file
Added:
branches/drupal7/debian/drupal7.dirs
- copied, changed from r2168, branches/drupal7/debian/dirs
branches/drupal7/debian/drupal7.links
- copied, changed from r2168, branches/drupal7/debian/links
Removed:
branches/drupal7/debian/dirs
branches/drupal7/debian/links
Modified:
branches/drupal7/debian/changelog
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=2172&op=diff
==============================================================================
--- branches/drupal7/debian/changelog (original)
+++ branches/drupal7/debian/changelog Sat Mar 5 17:41:27 2011
@@ -4,6 +4,9 @@
* debian/etc/settings.php
- Updated default configuration file
+
+ * debian/drupal.{dirs,links,install,postinst,postrm}
+ - Removed automatic link from apache2 configuration file
[ Kinga Marjai ]
* debian/control
Copied: branches/drupal7/debian/drupal7.dirs (from r2168, branches/drupal7/debian/dirs)
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal7/debian/drupal7.dirs?rev=2172&op=diff
==============================================================================
--- branches/drupal7/debian/dirs (original)
+++ branches/drupal7/debian/drupal7.dirs Sat Mar 5 17:41:27 2011
@@ -3,3 +3,4 @@
var/lib/drupal7/backups
usr/share/doc/drupal7
usr/share/lintian/overrides
+usr/bin
Modified: branches/drupal7/debian/drupal7.install
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal7/debian/drupal7.install?rev=2172&op=diff
==============================================================================
--- branches/drupal7/debian/drupal7.install (original)
+++ branches/drupal7/debian/drupal7.install Sat Mar 5 17:41:27 2011
@@ -4,7 +4,8 @@
modules usr/share/drupal7
themes usr/share/drupal7
robots.txt usr/share/drupal7
-profiles etc/drupal/7
+profiles usr/share/drupal7
+scripts/drupal.sh usr/bin
debian/etc/apache.conf etc/drupal/7
debian/etc/settings.php etc/drupal/7/sites/default
debian/cron.sh usr/share/drupal7/scripts
Copied: branches/drupal7/debian/drupal7.links (from r2168, branches/drupal7/debian/links)
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal7/debian/drupal7.links?rev=2172&op=diff
==============================================================================
--- branches/drupal7/debian/links (original)
+++ branches/drupal7/debian/drupal7.links Sat Mar 5 17:41:27 2011
@@ -1,4 +1,3 @@
etc/drupal/7/htaccess usr/share/drupal7/.htaccess
-etc/drupal/7/sites usr/share/drupal7/sites
-etc/drupal/7/profiles usr/share/drupal7/profiles
+etc/drupal/7/sites usr/share/drupal7/sites
var/lib/drupal7/files etc/drupal/7/sites/default/files
Modified: branches/drupal7/debian/drupal7.postinst
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal7/debian/drupal7.postinst?rev=2172&op=diff
==============================================================================
--- branches/drupal7/debian/drupal7.postinst (original)
+++ branches/drupal7/debian/drupal7.postinst Sat Mar 5 17:41:27 2011
@@ -14,7 +14,7 @@
dbc_go drupal7 $@
if [ "$DPKG_DEBUG" = "developer" ]; then
- set -x
+ set -x
fi
package_name="drupal7"
@@ -32,37 +32,20 @@
OLDVERSION="$2"
case "$1" in
- configure)
-
-
- webserver=`echo $webserver|sed -e 's/, */ /g'`
-
- webserver="apache2"
-
- if [ ! -d /etc/$webserver/conf.d/ ]; then
- install -d -m755 /etc/$webserver/conf.d/
- fi
- if [ ! -e /etc/$webserver/conf.d/drupal7.conf ]; then
- ln -s ${includefile} /etc/$webserver/conf.d/drupal7.conf
- restart="$i $restart"
- fi
-
- servers="apache2"
- . /usr/share/wwwconfig-common/restart.sh
+ configure)
# Permissions
dpkg-statoverride --list $filesdir || dpkg-statoverride --add --force --update www-data www-data 0750 $filesdir
- ;;
+ ;;
- abort-upgrade|abort-remove|abort-deconfigure)
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
esac
# dh_installdeb will replace this with shell code automatically
Modified: branches/drupal7/debian/drupal7.postrm
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal7/debian/drupal7.postrm?rev=2172&op=diff
==============================================================================
--- branches/drupal7/debian/drupal7.postrm (original)
+++ branches/drupal7/debian/drupal7.postrm Sat Mar 5 17:41:27 2011
@@ -43,46 +43,26 @@
dbconfigfile="${configdir}/sites/default/dbconfig.php"
cronfile="/etc/cron.d/${package_name}"
-webserver="apache2"
+case "$1" in
+ purge|remove)
-case "$1" in
- purge|remove)
+ if [ "$1" = "purge" ]; then
+ rm -f ${dbconfigfile}
+ if which ucf >/dev/null 2>&1; then
+ ucf --purge ${dbconfigfile}
+ fi
+
+ db_purge || true
+ fi
+ ;;
- # Un-configure webservers
- if [ -L /etc/$webserver/conf.d/drupal7.conf ]; then
- rm -f /etc/$webserver/conf.d/drupal7.conf || true
- restart="$i $restart"
- fi
-
- servers="apache2"
- # may not exist if package was manually installed
- if [ -r /usr/share/wwwconfig-common/restart.sh ]; then
- . /usr/share/wwwconfig-common/restart.sh
- fi
+ upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+ ;;
- # Remove configuration files (conf.php, $SITE.php)
- rm -f /etc/drupal/sites/default/settings.php
-
- if [ "$1" = "purge" ]; then
- rm -f ${dbconfigfile}
- if which ucf >/dev/null 2>&1; then
- ucf --purge ${dbconfigfile}
- fi
-
- db_purge || true
-
- fi
-
- ;;
-
- upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-
- ;;
-
- *)
- echo "postrm called with unknown argument \`$1'" >&2
- exit 1
- ;;
+ *)
+ echo "postrm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
esac
# dh_installdeb will replace this with shell code automatically
More information about the Pkg-drupal-commits
mailing list