[Pkg-cyrus-sasl2-commits] r553 - in /cyrus-sasl-2.1/trunk/debian: changelog control

[roberto at users.alioth.debian.org]

Author: roberto
Date: Tue Aug  3 19:27:00 2010
New Revision: 553

URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/?sc=1&rev=553
Log:
* 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

Modified:
    cyrus-sasl-2.1/trunk/debian/changelog
    cyrus-sasl-2.1/trunk/debian/control

Modified: cyrus-sasl-2.1/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/changelog?rev=553&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/changelog (original)
+++ cyrus-sasl-2.1/trunk/debian/changelog Tue Aug  3 19:27:00 2010
@@ -1,8 +1,11 @@
-cyrus-sasl2 (2.1.23.dfsg1-6) UNRELEASED; urgency=low
-
-  * NOT RELEASED YET
-
- -- Roberto C. Sanchez <roberto at connexer.com>  Mon, 28 Dec 2009 18:49:43 -0500
+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 <ben at decadent.org.uk>  Thu, 29 Jul 2010 03:34:07 +0100
 
 cyrus-sasl2 (2.1.23.dfsg1-5) unstable; urgency=low
 

Modified: cyrus-sasl-2.1/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/control?rev=553&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/control (original)
+++ cyrus-sasl-2.1/trunk/debian/control Tue Aug  3 19:27:00 2010
@@ -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.