[jruby] 01/02: Merge branch 'jruby-openssl'

[Miguel Landaeta]

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

nomadium pushed a commit to branch master
in repository jruby.

commit a261356583efc85b41421fe05fa4fc626395231f
Merge: 0d11771 d7cd8d6
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Tue Jul 28 23:38:07 2015 -0300

    Merge branch 'jruby-openssl'

 debian/changelog                                   |  5 ++-
 debian/control                                     |  3 +-
 .../0005-Disable-openssl-usage-in-tests.patch      | 46 ----------------------
 debian/patches/series                              |  1 -
 debian/rules                                       | 13 +++++-
 5 files changed, 18 insertions(+), 50 deletions(-)

diff --cc debian/changelog
index 34b4aa9,5604d08..41f1d36
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,11 +1,19 @@@
- jruby (1.7.21-2) UNRELEASED; urgency=medium
 -jruby (1.7.20.1-3) UNRELEASED; urgency=medium
++jruby (1.7.21-2) UNRELEASED; urgency=high
  
 -  * Add missing dependencies for jruby binary package. (Closes: #771694).
 +  * Fix FTBFS due to Maven 3.3.x changes.
+   * Provide full cryptographic support:
 -    - Add Recommends on jruby. (Closes: #743746).
++    - Add Recommends on jruby-openssl. (Closes: #743746).
+     - Add Build-Depends on jruby-openssl for unit tests during build-time.
  
 - -- Miguel Landaeta <nomadium at debian.org>  Sun, 28 Jun 2015 16:58:37 -0300
 + -- Miguel Landaeta <nomadium at debian.org>  Tue, 14 Jul 2015 20:20:23 -0300
 +
 +jruby (1.7.21-1) unstable; urgency=medium
 +
 +  * New upstream release.
 +  * Add missing dependencies for jruby binary package. (Closes: #771694).
 +  * Add Provides: ruby-interpreter for jruby binary package.
 +
 + -- Miguel Landaeta <nomadium at debian.org>  Wed, 08 Jul 2015 20:59:46 -0300
  
  jruby (1.7.20.1-2) unstable; urgency=medium
  
diff --cc debian/control
index c081d18,c94a954..db5e1cb
--- a/debian/control
+++ b/debian/control
@@@ -86,8 -87,7 +87,8 @@@ Depends: default-jre | java6-runtime
           nailgun (>= 0.9.1~),
           libyecht-java (>= 1.0~),
           ${misc:Depends}
- Recommends: ri
+ Recommends: ri, jruby-openssl
 +Provides: ruby-interpreter
  Description: 100% pure-Java implementation of Ruby
   JRuby is a high performance, stable, fully threaded Java implementation
   of the Ruby programming language.

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