[Pkg-freeipa-devel] dogtag-pki: Changes to 'master'

[Timo Aaltonen]

 debian/changelog       |    4 ++++
 debian/control         |    4 ++--
 debian/patches/series  |    2 +-
 debian/pki-tools.links |    6 +++---
 4 files changed, 10 insertions(+), 6 deletions(-)

New commits:
commit dab96113447a21c38685dd0161591ff22731e6a9
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Thu Mar 9 09:57:51 2017 +0200

    pki-tools.links: Fix the convenience links DRMTool -> KRATool. (Closes: #857209)

diff --git a/debian/changelog b/debian/changelog
index 2a0799b..588122d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ dogtag-pki (10.3.5+12-4) UNRELEASED; urgency=medium
     message a bit.
   * Depend libresteasy-java << 3.1.0, because the new on doesn't work
     even after fixing the build.
+  * pki-tools.links: Fix the convenience links DRMTool -> KRATool.
+    (Closes: #857209)
 
  -- Timo Aaltonen <tjaalton at debian.org>  Thu, 16 Feb 2017 16:43:49 +0200
 
diff --git a/debian/pki-tools.links b/debian/pki-tools.links
index 048d0d2..0a1126a 100644
--- a/debian/pki-tools.links
+++ b/debian/pki-tools.links
@@ -1,3 +1,3 @@
-usr/bin/DRMTool	usr/bin/KRATool
-usr/share/man/man1/DRMTool.1.gz usr/share/man/man1/KRATool.1.gz
-usr/share/pki/java-tools/DRMTool.cfg usr/share/pki/java-tools/KRATool.cfg
+usr/bin/KRATool	usr/bin/DRMTool
+usr/share/man/man1/KRATool.1.gz usr/share/man/man1/DRMTool.1.gz
+usr/share/pki/java-tools/KRATool.cfg usr/share/pki/java-tools/DRMTool.cfg

commit 2378d68da68f79719e884bd72766e7b2ddc6fcfc
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Thu Mar 9 09:22:50 2017 +0200

    Depend libresteasy-java << 3.1.0, because the new on doesn't work even after fixing the build.

diff --git a/debian/changelog b/debian/changelog
index ca14886..2a0799b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ dogtag-pki (10.3.5+12-4) UNRELEASED; urgency=medium
     just use 'exit 1' on every non-zero return value. (LP: #1664453)
   * pki-server.postinst: Clarify pki-tomcatd initial start failure
     message a bit.
+  * Depend libresteasy-java << 3.1.0, because the new on doesn't work
+    even after fixing the build.
 
  -- Timo Aaltonen <tjaalton at debian.org>  Thu, 16 Feb 2017 16:43:49 +0200
 
diff --git a/debian/control b/debian/control
index c37ea43..3653932 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Build-Depends:
  libnspr4-dev,
  libnss3-dev,
  libnuxwdog-java,
- libresteasy-java (>= 3.1.0-2),
+ libresteasy-java (<< 3.1.0),
  libservlet3.1-java,
  libsvrcore-dev,
  libtomcat8-java,
@@ -106,7 +106,7 @@ Depends:
  libjettison-java,
  libjss-java (>= 4.3.1-7),
  libldap-java,
- libresteasy-java,
+ libresteasy-java (<< 3.1.0),
  libservlet3.1-java,
  libxalan2-java,
  libxerces2-java,
diff --git a/debian/patches/series b/debian/patches/series
index 940bea5..6cc98ec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,4 +12,4 @@ fix-cli-migrate.diff
 use-bash.diff
 fix-cve-2016-1240.diff
 create-target-wants.diff
-use-resteasy-legacy.diff
+#use-resteasy-legacy.diff