diff -u drupal5-5.3/debian/patches/00list drupal5-5.3/debian/patches/00list
--- drupal5-5.3/debian/patches/00list
+++ drupal5-5.3/debian/patches/00list
@@ -1 +1,2 @@
+02_htaccess
 10_cronjob
diff -u drupal5-5.3/debian/control drupal5-5.3/debian/control
--- drupal5-5.3/debian/control
+++ drupal5-5.3/debian/control
@@ -1,7 +1,8 @@
 Source: drupal5
 Section: web
 Priority: extra
-Maintainer: Luigi Gangitano <luigi@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Luigi Gangitano <luigi@debian.org>
 Build-Depends: debhelper (>= 4), dpatch
 Standards-Version: 3.7.2
 Xs-Vcs-Svn: svn://alioth.debian.org/svn/pkg-drupal/branches/drupal-5.0
@@ -9,7 +10,7 @@
 
 Package: drupal5
 Architecture: all
-Depends: ${debconf-depends}, httpd | apache2, 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: ${debconf-depends}, httpd | apache2, php5, php5-mysql | php5-pgsql, php5-gd, postfix | 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 drupal5-5.3/debian/changelog drupal5-5.3/debian/changelog
--- drupal5-5.3/debian/changelog
+++ drupal5-5.3/debian/changelog
@@ -1,3 +1,14 @@
+drupal5 (5.3-1ubuntu1) hardy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    + debian/patches/02_htaccess:
+      - Add RewriteBase /drupal5
+     + debian/control:
+       - Replace exim4 with postfix in Depends.
+       - Modify Maintainer value to match DebianMaintainerField spec.
+
+ -- Stephan Hermann <sh@sourcecode.de>  Thu, 15 Nov 2007 08:54:10 +0100
+	
 drupal5 (5.3-1) unstable; urgency=high
 
   [ Luigi Gangitano ]
@@ -23,6 +34,13 @@
 
  -- Luigi Gangitano <luigi@debian.org>  Thu, 23 Aug 2007 15:44:15 +0200
 
+drupal5 (5.2-2ubuntu2) gutsy; urgency=low
+
+  * debian/patches/02_htaccess:
+    - Add RewriteBase /drupal5
+
+ -- Ante Karamatic <ivoks@ubuntu.com>  Sun, 30 Sep 2007 21:29:42 +0200
+
 drupal5 (5.2-2) unstable; urgency=low
 
   * debian/README.Debian
@@ -33,6 +51,16 @@
 
  -- Luigi Gangitano <luigi@debian.org>  Fri, 27 Jul 2007 02:12:20 +0200
 
+drupal5 (5.2-1ubuntu1) gutsy; urgency=low
+
+  *  Merge from debian unstable, remaining changes:
+     + debian/control:
+       - Replace exim4 with postfix in Depends.
+       - Replace postgresql-server with postgresql-8.2 in Recommends.
+       - Modify Maintainer value to match DebianMaintainerField spec.
+
+ -- Michael Bienia <geser@ubuntu.com>  Fri, 27 Jul 2007 20:14:39 +0200
+
 drupal5 (5.2-1) unstable; urgency=high
 
   [ Luigi Gangitano ]
@@ -61,6 +89,20 @@
 
  -- Luigi Gangitano <luigi@debian.org>  Wed, 29 Jun 2007 21:39:33 +0200
 
+drupal5 (5.1-2ubuntu1) gutsy; urgency=low
+
+  * debian/control:
+    - Replace apache with apache2, postgresql-client-8.1 with 
+      postgresql-client-8.2 and exim4 with postfix in Depends
+    - Replace postgresql-server-8.1 | postgresl-server with postgresql-8.2 in
+      Recommends
+    - Remove all php4 dependencies.
+    - Rename Build-Depends-Indep to Build-Depends (both debhelper and dpatch
+      are needed for the clean target)
+    - Modify Maintainer value to match DebianMaintainerField spec.
+
+ -- Michael Bienia <geser@ubuntu.com>  Fri, 29 Jun 2007 12:31:10 +0200
+
 drupal5 (5.1-2) unstable; urgency=low
 
   [ Luigi Gangitano ]
only in patch2:
unchanged:
--- drupal5-5.3.orig/debian/patches/02_htaccess.dpatch
+++ drupal5-5.3/debian/patches/02_htaccess.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_htaccess.dpatch by  <ivoks@titanium.localdomain>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad drupal5-5.2~/.htaccess drupal5-5.2/.htaccess
+--- drupal5-5.2~/.htaccess	2007-05-21 03:34:59.000000000 +0200
++++ drupal5-5.2/.htaccess	2007-09-30 21:29:13.000000000 +0200
+@@ -84,7 +84,7 @@
+ 
+   # Modify the RewriteBase if you are using Drupal in a subdirectory and
+   # the rewrite rules are not working properly.
+-  #RewriteBase /drupal
++  RewriteBase /drupal5
+ 
+   # Rewrite old-style URLs of the form 'node.php?id=x'.
+   #RewriteCond %{REQUEST_FILENAME} !-f