[Pkg-openssl-changes] r645 - openssl/trunk/debian

[Kurt Roeckx]

Author: kroeckx
Date: 2014-01-06 17:58:39 +0000 (Mon, 06 Jan 2014)
New Revision: 645

Modified:
   openssl/trunk/debian/changelog
   openssl/trunk/debian/control
Log:
Drop openssh Breaks


Modified: openssl/trunk/debian/changelog
===================================================================
--- openssl/trunk/debian/changelog	2014-01-06 17:57:20 UTC (rev 644)
+++ openssl/trunk/debian/changelog	2014-01-06 17:58:39 UTC (rev 645)
@@ -4,6 +4,7 @@
     - Fix for TLS record tampering bug CVE-2013-4353
     - Drop the snapshot patch
   * update watch file to check for upstream signature and add upstream pgp key.
+  * Drop conflicts against openssh since we now on a released version again.
 
  -- Kurt Roeckx <kurt at roeckx.be>  Mon, 06 Jan 2014 18:50:54 +0100
 

Modified: openssl/trunk/debian/control
===================================================================
--- openssl/trunk/debian/control	2014-01-06 17:57:20 UTC (rev 644)
+++ openssl/trunk/debian/control	2014-01-06 17:58:39 UTC (rev 645)
@@ -34,7 +34,6 @@
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: openssh-client (<< 1:6.4p1-1.1), openssh-server (<< 1:6.4p1-1.1)
 Description: Secure Sockets Layer toolkit - shared libraries
  This package is part of the OpenSSL project's implementation of the SSL
  and TLS cryptographic protocols for secure communication over the