[Pkg-freeipa-devel] tomcatjss: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog |   10 ++++++++++
 debian/control   |    9 ++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

New commits:
commit 227e17e3339571580037dc50f94b6ac3401ebea5
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Mon Mar 19 17:28:22 2012 +0200

    change the maintainer address

diff --git a/debian/control b/debian/control
index abc633d..e2ea5a9 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,7 @@
 Source: tomcatjss
 Priority: extra
-Maintainer: Debian FreeIPA Team <pkg-freeipa-devel at lists.alioth.debian.org>
+Maintainer: Ubuntu FreeIPA <freeipa at lists.launchpad.net>
+XSBC-Original-Maintainer: Debian FreeIPA Team <pkg-freeipa-devel at lists.alioth.debian.org>
 Uploaders: Timo Aaltonen <tjaalton at ubuntu.com>
 Build-Depends: debhelper (>= 8.0.0),
  ant,

commit 03e678e7def7023471cc404e40653a0ef9285fe3
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Mon Mar 19 17:24:24 2012 +0200

    Merge from debian git.

diff --git a/debian/changelog b/debian/changelog
index 3104745..8147898 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tomcatjss (6.0.1-1~ubuntu3) precise; urgency=low
+
+  * Merge from debian git.
+    - 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>  Mon, 19 Mar 2012 17:23:28 +0200
+
 tomcatjss (6.0.1-1~ubuntu2) precise; urgency=low
 
   * Merge from debian git.

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.

commit abb7792c43e670afaf09d2e99e70cb5e5c670f09
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Sun Mar 18 10:20:43 2012 +0200

    update the maintainer address and repo location

diff --git a/debian/control b/debian/control
index c69aa7f..b178a67 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,7 @@
 Source: tomcatjss
 Priority: extra
-Maintainer: Timo Aaltonen <tjaalton at ubuntu.com>
+Maintainer: Debian FreeIPA Team <pkg-freeipa-devel at lists.alioth.debian.org>
+Uploaders: Timo Aaltonen <tjaalton at ubuntu.com>
 Build-Depends: debhelper (>= 8.0.0),
  ant,
  default-jdk,
@@ -11,8 +12,8 @@ Build-Depends: debhelper (>= 8.0.0),
 Standards-Version: 3.9.2
 Section: libs
 Homepage: http://pki.fedoraproject.org
-Vcs-Git: git://git.debian.org/collab-maint/tomcatjss.git
-Vcs-Browser: http://git.debian.org/?p=collab-maint/tomcatjss.git;a=summary
+Vcs-Git: git://git.debian.org/pki-freeipa/tomcatjss.git
+Vcs-Browser: http://git.debian.org/?p=pki-freeipa/tomcatjss.git;a=summary
 
 Package: libtomcatjss-java
 Section: java