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

[fabbe at users.alioth.debian.org]

Author: fabbe
Date: Mon Apr 16 20:12:33 2007
New Revision: 193

URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/?sc=1&rev=193
Log:
Conflict with (upcoming) Heimdal GSSAPI package.

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=193&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/changelog (original)
+++ cyrus-sasl-2.1/trunk/debian/changelog Mon Apr 16 20:12:33 2007
@@ -6,9 +6,10 @@
   * debian/rules: allow turning off SQL, LDAP and GSSAPI at build time,
     to ease bootstrapping new architectures (Closes: #404268).
   * debian/control: lower priority of libsasl2 to optional (Closes: #416561).
-  * debian/control: remove transitional packages.
-
- -- Fabian Fagerholm <fabbe at debian.org>  Sun, 15 Apr 2007 22:32:22 +0300
+  * debian/control: remove transitional packages, conflict with Heimdal
+    GSSAPI package.
+
+ -- Fabian Fagerholm <fabbe at debian.org>  Mon, 16 Apr 2007 23:01:05 +0300
 
 cyrus-sasl2 (2.1.22.dfsg1-8) unstable; urgency=high
 

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=193&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/control (original)
+++ cyrus-sasl-2.1/trunk/debian/control Mon Apr 16 20:12:33 2007
@@ -103,8 +103,7 @@
 Priority: optional
 Architecture: any
 Depends: libsasl2-modules (= ${Source-Version}), ${shlibs:Depends}
-Replaces: libsasl2-modules-gssapi-heimdal, libsasl2-gssapi-mit (<< 2.1.22)
-Conflicts: libsasl2-gssapi-mit (<< 2.1.22)
+Conflicts: libsasl2-modules-gssapi-heimdal
 Description: Pluggable Authentication Modules for SASL (GSSAPI)
  This is the Cyrus SASL API implementation, version 2.1. See package
  libsasl2-2 and RFC 2222 for more information.