[Pkg-freeipa-devel] tomcatjss: Changes to 'debian-unstable'

[Timo Aaltonen]

 debian/changelog |    2 ++
 debian/control   |    1 +
 2 files changed, 3 insertions(+)

New commits:
commit 6e57c082aa5127a0d2da951c4c942ad14e178598
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Mon Mar 19 17:23:04 2012 +0200

    Conflict with libtcnative-1
    
    ..which depends on openssl and breaks the NSS security model this
    package uses (see RHBZ #441974).

diff --git a/debian/changelog b/debian/changelog
index 8c1d445..1b1db63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 tomcatjss (6.0.1-1) UNRELEASED; urgency=low
 
   * Initial release (Closes: #644371)
+  * Conflict with libtcnative-1, which depends on openssl and breaks
+    the NSS security model this package uses (see RHBZ #441974).
 
  -- Timo Aaltonen <tjaalton at ubuntu.com>  Tue, 04 Oct 2011 12:23:17 +0300
diff --git a/debian/control b/debian/control
index b178a67..abc633d 100644
--- a/debian/control
+++ b/debian/control
@@ -19,6 +19,7 @@ Package: libtomcatjss-java
 Section: java
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libtomcat6-java
+Conflicts: libtcnative-1
 Description: JSSE implementation using JSS for Tomcat
  A Java Secure Socket Extension (JSSE) implementation
  using Java Security Services (JSS) for Tomcat 6.