This is an automated email from the git hooks/post-receive script. nomadium pushed a commit to branch master in repository jruby.
commit d10953e0ac2ce7f0b5cc70f5c8d8f632be1bbb86 Author: Miguel Landaeta <nomad...@debian.org> Date: Tue Aug 4 22:55:42 2015 -0300 Fix several issues with some Maven artifacts - Add missing jruby-noasm artifacts. - Add missing jruby-stdlib artifacts. - Use correct jar file for jruby-core artifact. --- debian/changelog | 9 +++++++++ debian/jruby.install | 3 ++- debian/jruby.links | 3 +-- debian/jruby.lintian-overrides | 4 ++++ debian/jruby.poms | 1 + debian/rules | 5 ++++- 6 files changed, 21 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index bdc2990..367a84c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +jruby (1.7.21-3) UNRELEASED; urgency=medium + + * Install jruby-stdlib Maven artifact. (Closes: #792906). + - Added a lintian override for codeless-jar warning. + * Install jruby-noasm Maven artifact. + * Install correct jruby-core Maven artifact. + + -- Miguel Landaeta <nomad...@debian.org> Tue, 04 Aug 2015 22:54:21 -0300 + jruby (1.7.21-2) unstable; urgency=high * Fix FTBFS due to Maven 3.3.x changes. (Closes: #792788). diff --git a/debian/jruby.install b/debian/jruby.install index cb90d0b..58967b2 100644 --- a/debian/jruby.install +++ b/debian/jruby.install @@ -8,6 +8,7 @@ target/package/bin/jrubyc usr/share/jruby/bin target/package/bin/rdoc usr/share/jruby/bin target/package/bin/ri usr/share/jruby/bin target/package/bin/testrb usr/share/jruby/bin -target/package/lib/ruby usr/share/jruby/lib +target/package/lib/jruby.jar usr/share/jruby/lib target/package/lib/jni usr/share/jruby/lib +target/package/lib/ruby usr/share/jruby/lib target/package/tool/nailgun usr/share/jruby/tool diff --git a/debian/jruby.links b/debian/jruby.links index a16141f..cdf9cfa 100644 --- a/debian/jruby.links +++ b/debian/jruby.links @@ -3,8 +3,7 @@ usr/share/jruby/bin/rdoc usr/bin/jruby-rdoc usr/share/jruby/bin/ri usr/bin/jruby-ri usr/share/jruby/bin/testrb usr/bin/jruby-testrb -usr/share/java/jruby-core.jar usr/share/java/jruby.jar -usr/share/java/jruby-core.jar usr/share/jruby/lib/jruby.jar +usr/share/jruby/lib/jruby.jar usr/share/java/jruby.jar usr/share/javascript/jquery/jquery.js usr/share/jruby/lib/ruby/2.0/rdoc/generator/template/darkfish/js/jquery.js usr/share/jruby/lib/ruby/2.0/rdoc.rb usr/share/jruby/lib/ruby/shared/rdoc.rb diff --git a/debian/jruby.lintian-overrides b/debian/jruby.lintian-overrides new file mode 100644 index 0000000..2e7a63d --- /dev/null +++ b/debian/jruby.lintian-overrides @@ -0,0 +1,4 @@ +# this is not a codeless jar, it's just a jar with ruby files +# (ruby stdlib copy used by jruby, bundled as jar) +# to-do: maybe file a bug and/or send a patch to lintian +jruby binary: codeless-jar usr/share/maven-repo/org/jruby/jruby-stdlib/*/jruby-stdlib-*.jar diff --git a/debian/jruby.poms b/debian/jruby.poms index d07085a..dd4839a 100644 --- a/debian/jruby.poms +++ b/debian/jruby.poms @@ -2,6 +2,7 @@ pom.xml --no-parent core/pom.xml lib/pom.xml maven/jruby-stdlib/pom.xml +maven/jruby-noasm/pom.xml ext/readline/pom.xml maven/jruby-dist/pom.xml test/pom.xml diff --git a/debian/rules b/debian/rules index ba67639..63e238e 100755 --- a/debian/rules +++ b/debian/rules @@ -45,7 +45,10 @@ override_dh_auto_install: mkdir -p target/package/lib/ruby/gems/shared/ cd target/package/lib/ruby/gems/shared/ && mkdir -p cache gems specifications mh_installpom -pjruby --no-parent core/pom.xml - mh_installjar -pjruby --java-lib core/pom.xml target/package/lib/jruby.jar + mh_installjar -pjruby --java-lib core/pom.xml core/target/jruby-core-$(DEB_VERSION_UPSTREAM).jar + mh_installpom -pjruby --no-parent maven/jruby-noasm/pom.xml + mh_installpom -pjruby --no-parent maven/jruby-stdlib/pom.xml + mh_installjar -pjruby maven/jruby-stdlib/pom.xml maven/jruby-stdlib/target/jruby-stdlib-$(DEB_VERSION_UPSTREAM).jar rm -rf target/package/tool/nailgun/* for platform in i386-Linux x86_64-Linux arm-Linux; do \ mkdir -p target/package/lib/jni/$$platform ; \ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jruby.git _______________________________________________ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits