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

[Timo Aaltonen]

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

New commits:
commit 50a06842bf545b6fa1ffaddece56cd4120423875
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Mon Oct 3 20:35:32 2016 +0300

    releasing package tomcatjss version 7.1.4-4

diff --git a/debian/changelog b/debian/changelog
index 1ed4b89..f61c8be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-tomcatjss (7.1.4-4) UNRELEASED; urgency=medium
+tomcatjss (7.1.4-4) unstable; urgency=medium
 
   * control: Add breaks for pki-server versions which use tomcat7.
 
- -- Timo Aaltonen <tjaalton at debian.org>  Mon, 03 Oct 2016 20:34:24 +0300
+ -- Timo Aaltonen <tjaalton at debian.org>  Mon, 03 Oct 2016 20:35:27 +0300
 
 tomcatjss (7.1.4-3) unstable; urgency=medium
 

commit 56fcb16439d2a3f38bfd663c47a2e703b98dbe7a
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Mon Oct 3 20:34:25 2016 +0300

    control: Add breaks for pki-server versions which use tomcat7.

diff --git a/debian/changelog b/debian/changelog
index c7b3367..1ed4b89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tomcatjss (7.1.4-4) UNRELEASED; urgency=medium
+
+  * control: Add breaks for pki-server versions which use tomcat7.
+
+ -- Timo Aaltonen <tjaalton at debian.org>  Mon, 03 Oct 2016 20:34:24 +0300
+
 tomcatjss (7.1.4-3) unstable; urgency=medium
 
   * Upload to unstable.
diff --git a/debian/control b/debian/control
index 1bd65d9..281e5f1 100644
--- a/debian/control
+++ b/debian/control
@@ -22,6 +22,7 @@ Architecture: all
 Depends: libtomcat8-java, ${java:Depends}, ${misc:Depends},
  libjss-java (>= 4.3.1-5)
 Conflicts: libtcnative-1
+Breaks: pki-server (<< 10.3.5-2)
 Description: JSSE implementation using JSS for Tomcat
  A Java Secure Socket Extension (JSSE) implementation
  using Java Security Services (JSS) for Tomcat 8.