The (trivial) NMU diff follows. Ben.
diff -u cyrus-sasl2-2.1.23.dfsg1/debian/changelog
cyrus-sasl2-2.1.23.dfsg1/debian/changelog
--- cyrus-sasl2-2.1.23.dfsg1/debian/changelog
+++ cyrus-sasl2-2.1.23.dfsg1/debian/changelog
@@ -1,3 +1,12 @@
+cyrus-sasl2 (2.1.23.dfsg1-5.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove incorrect conflict between cyrus-sasl2-dbg and
+ cyrus-sasl2-heimdal-dbg (Closes: #590759); the conflicting file
+ is now diverted by the latter
+
+ -- Ben Hutchings <b...@decadent.org.uk> Thu, 29 Jul 2010 03:34:07 +0100
+
cyrus-sasl2 (2.1.23.dfsg1-5) unstable; urgency=low
* Finish switch to db4.8 by changing db4.7-util dependency to db4.8-util
diff -u cyrus-sasl2-2.1.23.dfsg1/debian/control
cyrus-sasl2-2.1.23.dfsg1/debian/control
--- cyrus-sasl2-2.1.23.dfsg1/debian/control
+++ cyrus-sasl2-2.1.23.dfsg1/debian/control
@@ -130,7 +130,6 @@
Architecture: any
Priority: extra
Depends: libsasl2-2 (= ${binary:Version}), ${misc:Depends}
-Conflicts: cyrus-sasl2-heimdal-dbg
Description: Cyrus SASL - debugging symbols
This is the Cyrus SASL API implementation, version 2. See package
libsasl2-2 and RFC 2222 for more information.
--- END ---
--
Ben Hutchings
Once a job is fouled up, anything done to improve it makes it worse.
signature.asc
Description: This is a digitally signed message part
