[jenkins] 01/03: Fixed the compatibility with libjbcrypt-java >= 0.4

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository jenkins.

commit c8d171ff9b3aeb8c67b3779ca2723279bf356fc2
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jul 15 11:52:36 2015 +0200

    Fixed the compatibility with libjbcrypt-java >= 0.4
---
 debian/changelog      | 7 +++++++
 debian/control        | 2 +-
 debian/patches/series | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e52a005..c5aff68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+jenkins (1.565.3-5) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Fixed the compatibility with libjbcrypt-java >= 0.4
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 15 Jul 2015 11:52:02 +0200
+
 jenkins (1.565.3-4) experimental; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 10af03d..c2c591b 100644
--- a/debian/control
+++ b/debian/control
@@ -53,7 +53,7 @@ Build-Depends-Indep:
  libcommons-logging-java,
  libguice-java (>= 4.0~beta5~),
  libjaxen-java,
- libjbcrypt-java (>= 0.3-4~),
+ libjbcrypt-java (>= 0.4),
  libjellydoc-java,
  libjenkins-commons-jelly-java,
  libjenkins-commons-jexl-java (>= 1.1-jenkins-20111212),
diff --git a/debian/patches/series b/debian/patches/series
index fb76c72..288af78 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,7 +13,7 @@ dependency-upgrades/0012-jnr-posix-upgrade.patch
 build/0013-use-stock-jmdns.patch
 ubuntu/0014-ubuntu-font.patch
 build/0015-use-stock-asm.patch
-build/0016-use-debian-jbcrypt.patch
+#build/0016-use-debian-jbcrypt.patch
 build/0017-ignore-plugin-pom.xml.patch
 build/0019-io-compat.pach.patch
 0020-Drop-use-of-gitsite-extension.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jenkins.git