[Pkg-drupal-commits] r2170 - in /branches/drupal7/debian: changelog control cron.d cron.sh drupal7.postrm

[luigi at users.alioth.debian.org]

Author: luigi
Date: Sat Mar  5 16:51:11 2011
New Revision: 2170

URL: http://svn.debian.org/wsvn/pkg-drupal/?sc=1&rev=2170
Log:
Integrate changes from Kinga Marjai

Modified:
    branches/drupal7/debian/changelog
    branches/drupal7/debian/control
    branches/drupal7/debian/cron.d
    branches/drupal7/debian/cron.sh
    branches/drupal7/debian/drupal7.postrm

Modified: branches/drupal7/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal7/debian/changelog?rev=2170&op=diff
==============================================================================
--- branches/drupal7/debian/changelog (original)
+++ branches/drupal7/debian/changelog Sat Mar  5 16:51:11 2011
@@ -1,6 +1,22 @@
 drupal7 (7.0-1) UNRELEASED; urgency=low
 
   * New upstream release
+
+  [ Kinga Marjai ]
+  * debian/control
+    - Removed dependency on exim4, now depends on default-mda
+    - Bumped Standard-Version to 3.9.0, no change needed
+
+  * debian/drupal6.postrm
+    - Made postrm check for restart.sh in case dependencies were not properly
+      installed (thanks to Bhavani Shankar.R, from Ubuntu)
+
+  * debian/cron.sh
+    - Added --fail option to curl to work around missing base_url in
+      configuration files
+
+  * debian/cron.d
+    - Fixed conditional to avoid warnings on removed package
 
  -- Luigi Gangitano <luigi at debian.org>  Sat, 05 Mar 2011 17:43:23 +0100
 

Modified: branches/drupal7/debian/control
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal7/debian/control?rev=2170&op=diff
==============================================================================
--- branches/drupal7/debian/control (original)
+++ branches/drupal7/debian/control Sat Mar  5 16:51:11 2011
@@ -4,13 +4,13 @@
 Maintainer: Luigi Gangitano <luigi at debian.org>
 Build-Depends: debhelper (>= 7), dpatch
 Homepage: http://www.drupal.org/
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
 Xs-Vcs-Svn: svn://alioth.debian.org/svn/pkg-drupal/branches/drupal7
 Xs-Vcs-Browser: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal7
 
 Package: drupal7
 Architecture: all
-Depends: ${misc:Depends}, apache2 | httpd, php5, php5-mysql | php5-pgsql, php5-gd, exim4 | mail-transport-agent, wwwconfig-common (>= 0.0.37), mysql-client | virtual-mysql-client | postgresql-client, dbconfig-common, curl
+Depends: ${misc:Depends}, apache2 | httpd, php5, php5-mysql | php5-pgsql, php5-gd, default-mta | mail-transport-agent, wwwconfig-common (>= 0.0.37), mysql-client | virtual-mysql-client | postgresql-client, dbconfig-common, curl
 Recommends: mysql-server | postgresql
 Description: a fully-featured content management framework
  Drupal is a dynamic web site platform which allows an individual or

Modified: branches/drupal7/debian/cron.d
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal7/debian/cron.d?rev=2170&op=diff
==============================================================================
--- branches/drupal7/debian/cron.d (original)
+++ branches/drupal7/debian/cron.d Sat Mar  5 16:51:11 2011
@@ -1,1 +1,1 @@
-0 * * * *    www-data          [ -x /usr/share/drupal7/scripts/cron.sh ] && /usr/share/drupal7/scripts/cron.sh
+0 * * * *    www-data          if test -x /usr/share/drupal7/scripts/cron.sh ; then /usr/share/drupal7/scripts/cron.sh ; fi

Modified: branches/drupal7/debian/cron.sh
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal7/debian/cron.sh?rev=2170&op=diff
==============================================================================
--- branches/drupal7/debian/cron.sh (original)
+++ branches/drupal7/debian/cron.sh Sat Mar  5 16:51:11 2011
@@ -14,6 +14,6 @@
 			BASE_URL='http://localhost/drupal7'
 		fi
 
-		curl --silent --compressed --location $BASE_URL/cron.php
+		curl --fail --silent --compressed --location $BASE_URL/cron.php
 	fi
 done

Modified: branches/drupal7/debian/drupal7.postrm
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal7/debian/drupal7.postrm?rev=2170&op=diff
==============================================================================
--- branches/drupal7/debian/drupal7.postrm (original)
+++ branches/drupal7/debian/drupal7.postrm Sat Mar  5 16:51:11 2011
@@ -55,11 +55,13 @@
 	fi
       
 	servers="apache2"
-	. /usr/share/wwwconfig-common/restart.sh
-
+	# may not exist if package was manually installed
+	if [ -r /usr/share/wwwconfig-common/restart.sh ]; then
+		. /usr/share/wwwconfig-common/restart.sh
+	fi
 
 	# Remove configuration files (conf.php, $SITE.php)
-    rm -f /etc/drupal/sites/default/settings.php
+	rm -f /etc/drupal/sites/default/settings.php
 
 	if [ "$1" = "purge" ]; then
 		rm -f ${dbconfigfile}