diff -u drupal6-6.17/debian/drupal6.postrm drupal6-6.17/debian/drupal6.postrm
--- drupal6-6.17/debian/drupal6.postrm
+++ drupal6-6.17/debian/drupal6.postrm
@@ -55,7 +55,10 @@
 	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)
diff -u drupal6-6.17/debian/control drupal6-6.17/debian/control
--- drupal6-6.17/debian/control
+++ drupal6-6.17/debian/control
@@ -1,7 +1,8 @@
 Source: drupal6
 Section: web
 Priority: extra
-Maintainer: Luigi Gangitano <luigi@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Luigi Gangitano <luigi@debian.org>
 Build-Depends: debhelper (>= 7), dpatch
 Homepage: http://www.drupal.org/
 Standards-Version: 3.8.4
@@ -10,7 +11,7 @@
 
 Package: drupal6
 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
diff -u drupal6-6.17/debian/changelog drupal6-6.17/debian/changelog
--- drupal6-6.17/debian/changelog
+++ drupal6-6.17/debian/changelog
@@ -1,3 +1,12 @@
+drupal6 (6.17-1ubuntu1) maverick; urgency=low
+
+  * Merge from debian unstable.  Remaining changes:
+    - Changing exim4 to default-mta (LP: #582255)
+    - made postrm check for restart.sh in case dependencies
+      were not properly installed. (LP: #583576)
+
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Tue, 15 Jun 2010 19:27:58 +0530
+
 drupal6 (6.17-1) unstable; urgency=low
 
   * New upstream release
@@ -11,6 +20,14 @@
 
  -- Luigi Gangitano <luigi@debian.org>  Sun, 06 Jun 2010 22:31:57 +0200
 
+drupal6 (6.16-1ubuntu1) maverick; urgency=low
+
+  * Changing exim4 to default-mta (LP: #582255)
+  * made postrm check for restart.sh in case dependencies
+    were not properly installed. (LP: #583576)
+
+ -- Clint Byrum <clint.byrum@canonical.com>  Tue, 18 May 2010 13:32:55 -0700
+
 drupal6 (6.16-1) unstable; urgency=high
 
   [ Luigi Gangitano ]