diff -Nru 389-ds-base-1.2.10.4/debian/changelog 389-ds-base-1.2.10.4/debian/changelog
--- 389-ds-base-1.2.10.4/debian/changelog	2012-03-20 16:13:37.000000000 +0000
+++ 389-ds-base-1.2.10.4/debian/changelog	2012-06-15 13:06:57.000000000 +0100
@@ -1,3 +1,12 @@
+389-ds-base (1.2.10.4-0ubuntu4) quantal; urgency=low
+
+  * Switch to db5.1:
+   - control: switch dependancies from libdb4.8[-dev] to libdb[-dev]
+   - Correct comparisons for >v4.4 for DB_ENV_SET_TAS_SPINS.
+   - Correct comparisons for >v4.4 for DB_LOCK_STAT.
+
+ -- Andy Whitcroft <apw@ubuntu.com>  Fri, 15 Jun 2012 11:56:28 +0100
+
 389-ds-base (1.2.10.4-0ubuntu3) precise; urgency=low
 
   * postinst, init: Drop the error handler, and make it non-fatal if
diff -Nru 389-ds-base-1.2.10.4/debian/control 389-ds-base-1.2.10.4/debian/control
--- 389-ds-base-1.2.10.4/debian/control	2012-03-20 16:12:41.000000000 +0000
+++ 389-ds-base-1.2.10.4/debian/control	2012-06-15 12:59:15.000000000 +0100
@@ -13,7 +13,7 @@
  libldap2-dev (>= 2.4.28),
  libicu-dev,
  libsnmp-dev,
- libdb4.8-dev,
+ libdb-dev,
  zlib1g-dev,
  libbz2-dev,
  libssl-dev,
@@ -51,7 +51,7 @@
  libnss3-1d,
  libsvrcore0,
  libsnmp15,
- libdb4.8,
+ libdb,
 Breaks: libdirsrv0
 Replaces: libdirsrv0
 Description: 389 Directory Server libraries -- runtime
@@ -88,7 +88,7 @@
  libnss3-1d,
  libsvrcore0,
  libsnmp15,
- libdb4.8,
+ libdb,
 Breaks: libdirsrv-dev
 Replaces: libdirsrv-dev
 Description: 389 Directory Server libraries -- development files
@@ -109,7 +109,7 @@
  libnss3-1d,
  libsvrcore0,
  libsnmp15,
- libdb4.8,
+ libdb,
  adduser,
  libmozilla-ldap-perl,
  libsasl2-modules-gssapi-mit,
diff -Nru 389-ds-base-1.2.10.4/debian/patches/series 389-ds-base-1.2.10.4/debian/patches/series
--- 389-ds-base-1.2.10.4/debian/patches/series	2012-03-15 08:48:38.000000000 +0000
+++ 389-ds-base-1.2.10.4/debian/patches/series	2012-06-15 12:42:23.000000000 +0100
@@ -1,2 +1,3 @@
 default_user
 format-security.diff
+transition_db48_db51.patch
diff -Nru 389-ds-base-1.2.10.4/debian/patches/transition_db48_db51.patch 389-ds-base-1.2.10.4/debian/patches/transition_db48_db51.patch
--- 389-ds-base-1.2.10.4/debian/patches/transition_db48_db51.patch	1970-01-01 01:00:00.000000000 +0100
+++ 389-ds-base-1.2.10.4/debian/patches/transition_db48_db51.patch	2012-06-15 13:06:28.000000000 +0100
@@ -0,0 +1,46 @@
+Description: transition db4.8 to db5.1
+ Transition from db4.8 to db5.1:
+ .
+ Correct comparisons for >v4.4 for DB_ENV_SET_TAS_SPINS.
+ Correct comparisons for >v4.4 for DB_LOCK_STAT.
+Author: Andy Whitcroft <apw@ubuntu.com>
+Last-Update: 2012-06-15
+Index: 389-ds-base-1.2.10.4/ldap/servers/slapd/back-ldbm/dblayer.c
+===================================================================
+--- 389-ds-base-1.2.10.4.orig/ldap/servers/slapd/back-ldbm/dblayer.c	2012-03-13 19:14:59.000000000 +0000
++++ 389-ds-base-1.2.10.4/ldap/servers/slapd/back-ldbm/dblayer.c	2012-06-15 13:01:18.549268908 +0100
+@@ -136,7 +136,7 @@
+ #define LOG_FLUSH(env, lsn) (env)->log_flush((env), (lsn))
+ #define LOCK_DETECT(env, flags, atype, aborted) \
+     (env)->lock_detect((env), (flags), (atype), (aborted))
+-#if DB_VERSION_MINOR >= 4 /* i.e. 4.4 or later */
++#if 1000*DB_VERSION_MAJOR + 100*DB_VERSION_MINOR >= 4400 /* i.e 4.4 or later */
+ #define DB_ENV_SET_TAS_SPINS(env, tas_spins) \
+     (env)->mutex_set_tas_spins((env), (tas_spins))
+ #else /* < 4.4 */
+Index: 389-ds-base-1.2.10.4/ldap/servers/plugins/replication/cl5_api.c
+===================================================================
+--- 389-ds-base-1.2.10.4.orig/ldap/servers/plugins/replication/cl5_api.c	2012-03-13 19:14:59.000000000 +0000
++++ 389-ds-base-1.2.10.4/ldap/servers/plugins/replication/cl5_api.c	2012-06-15 12:53:39.494992574 +0100
+@@ -121,7 +121,7 @@
+ #define TXN_ABORT(txn) (txn)->abort(txn)
+ #define MEMP_STAT(env, gsp, fsp, flags, malloc) \
+ 	(env)->memp_stat((env), (gsp), (fsp), (flags))
+-#if DB_VERSION_MINOR >= 4 /* i.e. 4.4 or later */
++#if 1000*DB_VERSION_MAJOR + 100*DB_VERSION_MINOR >= 4400 /* i.e. 4.4 or later */
+ #define DB_ENV_SET_TAS_SPINS(env, tas_spins) \
+     (env)->mutex_set_tas_spins((env), (tas_spins))
+ #else /* < 4.4 */
+Index: 389-ds-base-1.2.10.4/ldap/servers/slapd/back-ldbm/perfctrs.c
+===================================================================
+--- 389-ds-base-1.2.10.4.orig/ldap/servers/slapd/back-ldbm/perfctrs.c	2012-03-13 19:14:59.000000000 +0000
++++ 389-ds-base-1.2.10.4/ldap/servers/slapd/back-ldbm/perfctrs.c	2012-06-15 13:06:04.998689333 +0100
+@@ -53,7 +53,7 @@
+ #define LOG_STAT(env, spp, flags, malloc) (env)->log_stat((env), (spp), (flags))
+ #define LOCK_STAT(env, statp, flags, malloc) \
+ 	(env)->lock_stat((env), (statp), (flags))
+-#if DB_VERSION_MINOR >= 4 /* i.e. 4.4 or later */
++#if 1000*DB_VERSION_MAJOR + 100*DB_VERSION_MINOR >= 4400
+ #define GET_N_LOCK_WAITS(lockstat)   lockstat->st_lock_wait
+ #else
+ #define GET_N_LOCK_WAITS(lockstat)   lockstat->st_nconflicts