diff -u cyrus-sasl2-heimdal-2.1.23.dfsg1/debian/control cyrus-sasl2-heimdal-2.1.23.dfsg1/debian/control
--- cyrus-sasl2-heimdal-2.1.23.dfsg1/debian/control
+++ cyrus-sasl2-heimdal-2.1.23.dfsg1/debian/control
@@ -1,8 +1,7 @@
 Source: cyrus-sasl2-heimdal
 Section: libs
 Priority: extra
-Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
-XSBC-Original-Maintainer: Debian Cyrus SASL Team <pkg-cyrus-sasl2-debian-devel@lists.alioth.debian.org>
+Maintainer: Debian Cyrus SASL Team <pkg-cyrus-sasl2-debian-devel@lists.alioth.debian.org>
 Uploaders: Fabian Fagerholm <fabbe@debian.org>, Roberto C. Sanchez <roberto@connexer.com>
 Standards-Version: 3.8.3
 Build-Depends: debhelper (>= 5.0.0), dpatch, autotools-dev, automake1.9, autoconf, libtool, libdb4.7-dev, libpam0g-dev (>= 0.76-22), libssl-dev (>= 0.9.7e-3), libmysqlclient-dev | libmysqlclient15-dev (>= 5.0.20), libopie-dev (>= 2.32-10), heimdal-dev, libsqlite0-dev (>= 2.8.16), libldap2-dev (>= 2.1.30-8), chrpath, groff-base
diff -u cyrus-sasl2-heimdal-2.1.23.dfsg1/debian/changelog cyrus-sasl2-heimdal-2.1.23.dfsg1/debian/changelog
--- cyrus-sasl2-heimdal-2.1.23.dfsg1/debian/changelog
+++ cyrus-sasl2-heimdal-2.1.23.dfsg1/debian/changelog
@@ -1,9 +1,8 @@
-cyrus-sasl2-heimdal (2.1.23.dfsg1-2ubuntu1) lucid; urgency=low
+cyrus-sasl2-heimdal (2.1.23.dfsg1-3) unstable; urgency=low

-  * Merge from debian testing, remaining changes:
-    - debian/control: Depend on exact binary version of sasl2
+  * Sync with main package

- -- Chuck Short <zulcss@ubuntu.com>  Fri, 06 Nov 2009 02:39:12 +0000
+ -- Roberto C. Sanchez <roberto@connexer.com>  Sat, 07 Nov 2009 10:12:06 -0500

 cyrus-sasl2-heimdal (2.1.23.dfsg1-2) unstable; urgency=high

@@ -18,27 +17,6 @@

  -- Roberto C. Sanchez <roberto@connexer.com>  Wed, 07 Oct 2009 22:16:51 -0400

-cyrus-sasl2-heimdal (2.1.23.dfsg1-1ubuntu3) karmic; urgency=low
-
-  * No-change rebuild to re-sync version with cyrus-sasl2 (LP: #394164).
-
- -- Kees Cook <kees@ubuntu.com>  Sun, 04 Oct 2009 11:03:08 -0700
-
-cyrus-sasl2-heimdal (2.1.23.dfsg1-1ubuntu2) karmic; urgency=low
-
-  * Revert Ubuntu version exactness: breaks package installability when
-    cyrus-sasl2 gets updated (LP: #394164).
-
- -- Kees Cook <kees@ubuntu.com>  Wed, 01 Jul 2009 10:30:39 -0700
-
-cyrus-sasl2-heimdal (2.1.23.dfsg1-1ubuntu1) karmic; urgency=low
-
-  * Merge from debian unstable (LP: #385238), remaining changes:
-    - debian/control: Depend on exact binary version of sasl2
-  * Now we match sasl2's binary version again
-
- -- Michael Terry <michael.terry@canonical.com>  Tue, 09 Jun 2009 11:06:14 -0400
-
 cyrus-sasl2-heimdal (2.1.23.dfsg1-1) unstable; urgency=high

   * New upstream release
@@ -68,21 +46,6 @@

  -- Fabian Fagerholm <fabbe@debian.org>  Sat, 09 May 2009 23:09:57 +0300

-cyrus-sasl2-heimdal (2.1.22.dfsg1-23ubuntu3) jaunty; urgency=low
-
-  * Go back to = ${binary:Version} depends, skip ubuntu2 to match
-    cyrus-sasl, and rebuild to fix installability
-
- -- Scott Kitterman <scott@kitterman.com>  Fri, 03 Apr 2009 10:53:27 -0400
-
-cyrus-sasl2-heimdal (2.1.22.dfsg1-23ubuntu1) jaunty; urgency=low
-
-  * Merge from Debian unstable, remaining Ubuntu changes:
-    - Adjust dependencies for binary packages provided by cyrus-sasl2,
-      Ubuntu has 2.1.22.dfsg1-23ubuntu2 now.
-
- -- Luca Falavigna <dktrkranz@ubuntu.com>  Fri, 28 Nov 2008 19:41:24 +0100
-
 cyrus-sasl2-heimdal (2.1.22.dfsg1-23) unstable; urgency=high

   * Make binary packages binNMU safe (Closes: #496837)
@@ -91,32 +54,6 @@

  -- Roberto C. Sanchez <roberto@connexer.com>  Mon, 01 Sep 2008 11:32:31 -0400

-cyrus-sasl2-heimdal (2.1.22.dfsg1-22ubuntu4) intrepid; urgency=low
-
-  * Adjust the dependencies again.
-
- -- Chuck Short <zulcss@ubuntu.com>  Fri, 10 Oct 2008 15:18:34 -0400
-
-cyrus-sasl2-heimdal (2.1.22.dfsg1-22ubuntu3) intrepid; urgency=low
-
-  * no change upload.
-
- -- Chuck Short <zulcss@ubuntu.com>  Fri, 10 Oct 2008 13:00:49 -0400
-
-cyrus-sasl2-heimdal (2.1.22.dfsg1-22ubuntu2) intrepid; urgency=low
-
-  * Adjust dependencies for binary packages provided by cyrus-sasl2, in
-    Ubuntu we have 2.1.22.dfsg1-21ubuntu1 now (LP: #261983).
-
- -- Luca Falavigna <dktrkranz@ubuntu.com>  Fri, 19 Sep 2008 14:58:06 +0200
-
-cyrus-sasl2-heimdal (2.1.22.dfsg1-22ubuntu1) intrepid; urgency=low
-
-  * Merge from Debian unstable, remaining Ubuntu changes:
-    - Change libdb build dep from libdb-dev to libdb4.6-dev.
-
- -- Luca Falavigna <dktrkranz@ubuntu.com>  Wed, 13 Aug 2008 08:02:50 +0000
-
 cyrus-sasl2-heimdal (2.1.22.dfsg1-22) unstable; urgency=low

   [ Fabian Fagerholm ]
@@ -125,14 +62,6 @@

  -- Fabian Fagerholm <fabbe@debian.org>  Sat, 02 Aug 2008 16:08:58 +0300

-cyrus-sasl2-heimdal (2.1.22.dfsg1-21ubuntu1) intrepid; urgency=low
-
-  * Merge from debian unstable, remaining changes (LP: #237464):
-    - Modify Maintainer value to match DebianMaintainerField spec.
-    - Change libdb build dep from libdb-dev to libdb4.6-dev
-
- -- Nathan Handler <nathan.handler@gmail.com>  Tue, 17 Jun 2008 09:17:55 -0500
-
 cyrus-sasl2-heimdal (2.1.22.dfsg1-21) unstable; urgency=high

   [ Fabian Fagerholm ]
@@ -166,21 +95,6 @@

  -- Fabian Fagerholm <fabbe@debian.org>  Tue, 18 Mar 2008 20:25:24 +0200

-cyrus-sasl2-heimdal (2.1.22.dfsg1-18ubuntu2) hardy; urgency=low
-
-  * No change upload to match cyrus-sasl2 version.
-
- -- Barry deFreese <bddebian@comcast.net>  Wed, 09 Apr 2008 21:51:22 -0400
-
-cyrus-sasl2-heimdal (2.1.22.dfsg1-18ubuntu1) hardy; urgency=low
-
-  * Merge from debian unstable, remaining changes:
-    - debian/control:
-      - Modify Maintainer value to match DebianMaintainerField spec.
-      - Change libdb build dep from libdb-dev to libdb4.6-dev
-
- -- Scott Kitterman <scott@kitterman.com>  Tue, 18 Mar 2008 10:09:03 -0400
-
 cyrus-sasl2-heimdal (2.1.22.dfsg1-18) unstable; urgency=low

   [ Fabian Fagerholm ]
@@ -200,43 +114,6 @@

  -- Fabian Fagerholm <fabbe@debian.org>  Mon, 07 Jan 2008 19:12:13 +0200

-cyrus-sasl2-heimdal (2.1.22.dfsg1-16ubuntu5) hardy; urgency=low
-
-  * No change upload to keep version number in sync with cyrus-sasl2
-
- -- Scott Kitterman <scott@kitterman.com>  Mon, 25 Feb 2008 19:18:49 -0500
-
-cyrus-sasl2-heimdal (2.1.22.dfsg1-16ubuntu4) hardy; urgency=low
-
-  * Move from libdb4.2 to libdb4.6
-    - Change build-dep in debian/control
-    - Add 0017_db4.6.dpatch (borrowed from cyrus-sasl2)
-
- -- Scott Kitterman <scott@kitterman.com>  Thu, 31 Jan 2008 10:03:01 -0500
-
-cyrus-sasl2-heimdal (2.1.22.dfsg1-16ubuntu3) hardy; urgency=low
-
-  * No change upload to bring the cyrus-sasl2-heimdal version back in sync
-    with cyrus-sasl2.
-
- -- Michael Bienia <geser@ubuntu.com>  Sat, 26 Jan 2008 01:05:28 +0100
-
-cyrus-sasl2-heimdal (2.1.22.dfsg1-16ubuntu2) hardy; urgency=low
-
-  * No change rebuild to fix unmet dependencies:
-    + cyrus-sasl2-heimdal-dbg (LP: #145529).
-    + libsasl2-modules-gssapi-heimdal (LP: #157035).
-    As cyrus-sasl2-heimdal uses ${binary:Version} and ${source:Version) to
-    specify dependencies on packages build by cyrus-sasl2, both cyrus-sasl2
-    and cyrus-sasl2-heimdal need to have the same version (which is the case
-    in Debian).
-    This upload brings both package versions into sync again for Ubuntu (and
-    skips -16ubuntu1 therefore).
-  * debian/control:
-    + Modify Maintainer value to match DebianMaintainerField spec.
-
- -- Michael Bienia <geser@ubuntu.com>  Sat, 05 Jan 2008 22:34:28 +0100
-
 cyrus-sasl2-heimdal (2.1.22.dfsg1-16) unstable; urgency=low

   * debian/control: versioned depends update automatically (Closes: #446965)
@@ -639,7 +516,7 @@
     Closes: #276637.

  -- Andreas Barth <aba@debian.org>  Fri, 15 Oct 2004 20:26:41 +0200
-
+
 cyrus-sasl2 (2.1.19-1.3) unstable; urgency=high

   * NMU
@@ -1034 +910,0 @@
-