This is an automated email from the git hooks/post-receive script. nomadium pushed a commit to branch master in repository libspring-java.
commit 2b9ae8c402bcc77f833471d2f7ffe23f577709bf Author: Miguel Landaeta <[email protected]> Date: Sat Jun 20 22:27:46 2015 -0300 Use jruby-core Maven artifact instead jruby one --- debian/changelog | 6 ++++++ debian/control | 4 ++-- debian/maven.rules | 1 + debian/patches/0029-use-jruby-core.patch | 16 ++++++++++++++++ debian/patches/series | 1 + 5 files changed, 26 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 92ccd22..9a5b803 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libspring-java (3.2.13-2) UNRELEASED; urgency=medium + + * Use jruby-core Maven artifact instead jruby one. (Closes: #788768). + + -- Miguel Landaeta <[email protected]> Sat, 20 Jun 2015 19:20:52 -0300 + libspring-java (3.2.13-1) unstable; urgency=medium * Team upload. diff --git a/debian/control b/debian/control index 4c88cd1..9916e5b 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,7 @@ Build-Depends-Indep: maven-repo-helper (>= 1.1), ivy, spring-build-scripts, libjibx1.2-java, libjoda-time-java, libjsf-api-java, libopenjpa-java, libportlet-api-2.0-spec-java, libquartz-java, librome-java, libservlet2.5-java, libspring-build-java, gradle-propdeps-plugin, libtiles-java, libtomcat8-java, libvelocity-tools-java (>= 2.0-3), libxmlbeans-java, libxstream-java, - testng, velocity, jruby, libjoptsimple-java, libderbyclient-java, libhsqldb-java, libjetty8-java, + testng, velocity, jruby (>= 1.7.19~), libjoptsimple-java, libderbyclient-java, libhsqldb-java, libjetty8-java, libhibernate-validator-java (>= 4.2), libjackson2-databind-java, libjakarta-taglibs-standard-java, libjavassist-java, libjstl1.1-java Standards-Version: 3.9.6 @@ -68,7 +68,7 @@ Architecture: all Depends: ${misc:Depends}, libspring-aop-java (= ${source:Version}), libspring-beans-java (= ${source:Version}), libspring-core-java (= ${source:Version}), libspring-expression-java (= ${source:Version}) Recommends: libspring-instrument-java (= ${source:Version}), libtomcat8-java, libgeronimo-ejb-3.0-spec-java, libatinject-jsr330-api-java, glassfish-javaee, libjodatime-java, libasm4-java, libaopalliance-java, libcglib3-java, libgeronimo-validation-1.0-spec-java, libgeronimo-jms-1.1-spec-java -Suggests: jruby, bsh, groovy +Suggests: jruby (>= 1.7.19~), bsh, groovy Description: modular Java/J2EE application framework - Context Spring is a layered Java/J2EE application framework offering a lot of freedom to Java developers yet providing well documented and easy-to-use solutions for diff --git a/debian/maven.rules b/debian/maven.rules index 7835054..5ba82a7 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -13,5 +13,6 @@ junit junit * * * * log4j log4j * * * * org.apache.tomcat tomcat-catalina * * * * org.codehaus.groovy groovy-all +org.jruby s/jruby/jruby-core/ jar s/.*/debian/ * * org.testng testng * * * * taglibs standard * * * * diff --git a/debian/patches/0029-use-jruby-core.patch b/debian/patches/0029-use-jruby-core.patch new file mode 100644 index 0000000..12f50e9 --- /dev/null +++ b/debian/patches/0029-use-jruby-core.patch @@ -0,0 +1,16 @@ +Description: Use jruby-core maven artifact instead jruby main one +Author: Miguel Landaeta <[email protected]> +Forwarded: no +Last-Update: 2015-06-20 + +--- a/build.gradle ++++ b/build.gradle +@@ -340,7 +340,7 @@ + optional("org.aspectj:aspectjweaver:${aspectjVersion}") + optional("org.codehaus.groovy:groovy-all:1.x") + optional("org.beanshell:bsh:debian") +- optional("org.jruby:jruby:debian") { ++ optional("org.jruby:jruby-core:debian") { + exclude group: 'org.jruby.joni', module: 'joni' + exclude group: 'org.jruby.extras', module: 'jnr-netdb' + exclude group: 'org.jruby.extras', module: 'bytelist' diff --git a/debian/patches/series b/debian/patches/series index f73937e..bc36023 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -11,3 +11,4 @@ 0026-derby-compatibility.patch 0027-disable-jcache-support.patch 0028-disable-jdiff-report.patch +0029-use-jruby-core.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libspring-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
