Thomas Goirand pushed to branch master at Debian Java Maintainers / jruby
Commits: 15a109b1 by Thomas Goirand at 2022-05-18T09:08:10+02:00 Add DRUBY_VERSION variable in d/rules. - - - - - 2d1b4d6f by Thomas Goirand at 2022-05-18T14:33:30+02:00 Add ruby-psych as build-depends. - - - - - 2dba7b64 by Thomas Goirand at 2022-05-18T13:42:51+00:00 Fixed d/rules. - - - - - 3 changed files: - debian/changelog - debian/control - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -40,8 +40,10 @@ jruby (9.2.14.0-1) UNRELEASED; urgency=medium * Removed applied upstream: 0018-fix-rubygem-vulnerabilities.patch. * Fixed new version in 0004-Add-missing-maven-artifacts-pom-files.patch. * Ran wrap-and-sort -bastk. + * Add DRUBY_VERSION variable in d/rules. + * Add ruby-psych and ruby-test-unit as build-depends. - -- Thomas Goirand <[email protected]> Mon, 28 Dec 2020 22:17:33 +0100 + -- Thomas Goirand <[email protected]> Wed, 18 May 2022 09:07:39 +0200 jruby (9.1.17.0-3) unstable; urgency=medium ===================================== debian/control ===================================== @@ -60,6 +60,7 @@ Build-Depends: ruby-rake-ant, ruby-scanf, ruby-cmath, + ruby-psych, Standards-Version: 4.3.0 Homepage: http://jruby.org/ Vcs-Git: https://salsa.debian.org/java-team/jruby.git ===================================== debian/rules ===================================== @@ -6,6 +6,8 @@ export LC_ALL=en_US.UTF-8 export CI=true export CCACHE_DISABLE=true +export DRUBY_VERSION=3.0.0 + %: dh $@ --buildsystem=maven @@ -33,7 +35,7 @@ override_dh_auto_configure: # restored and this will prevent twice in a row builds to work cp ./pom.xml ./bak && cp ./core/pom.xml ./bak/core && cp ./lib/pom.xml ./bak/lib cd ./lib/ruby/stdlib/ && for gem in csv fileutils; do \ - cp -a /usr/lib/ruby/2.7.0/$$gem* ./ ; \ + cp -a /usr/lib/ruby/$$DRUBY_VERSION/$$gem* ./ ; \ done cd ./lib/ruby/stdlib/ && for gem in psych json jar; do \ cp -a /usr/lib/ruby/vendor_ruby/$$gem* ./ ; \ @@ -45,8 +47,8 @@ override_dh_auto_configure: /usr/share/rubygems-integration/all/gems/rspec-*/lib/rspec* \ /usr/share/rubygems-integration/all/gems/cmath-*/lib/cmath.rb \ /usr/share/rubygems-integration/all/gems/scanf-*/lib/scanf.rb \ - /usr/lib/ruby/2.7.0/webrick* \ - /usr/lib/ruby/2.7.0/ipaddr.rb \ + /usr/share/rubygems-integration/all/gems/webrick-* \ + /usr/lib/ruby/$$DRUBY_VERSION/ipaddr.rb \ ./ mkdir lib/ruby/gems ln -s lib/ruby/stdlib lib/ruby/gems/shared View it on GitLab: https://salsa.debian.org/java-team/jruby/-/compare/aee7d3c479d303cdd7ce55d2be0963ed1cff447f...2dba7b64df6ccedc03e00668099be44b8cf43eb6 -- View it on GitLab: https://salsa.debian.org/java-team/jruby/-/compare/aee7d3c479d303cdd7ce55d2be0963ed1cff447f...2dba7b64df6ccedc03e00668099be44b8cf43eb6 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
