[jruby] 05/06: Remove references to truffle module

[Miguel Landaeta]

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

nomadium pushed a commit to branch experimental
in repository jruby.

commit 0ca8255f063b43b876c24f047e2a740abd6e79e7
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Sat Mar 11 12:32:01 2017 +0000

    Remove references to truffle module
---
 debian/changelog               | 1 +
 debian/jruby.lintian-overrides | 3 ---
 debian/rules                   | 4 +---
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cce6caa..3dde155 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ jruby (9.1.8.0-1~exp1) UNRELEASED; urgency=medium
     Drop patch 0003-Disable-truffle-module.patch since is no longer needed.
   * Add dependency on libunsafe-fences-java.
   * Update versioned dependency on libjnr-posix-java to (>= 3.0.36~).
+  * Remove references to truffle module since it has been removed.
 
  -- Miguel Landaeta <nomadium at debian.org>  Sat, 11 Mar 2017 12:17:07 +0000
 
diff --git a/debian/jruby.lintian-overrides b/debian/jruby.lintian-overrides
index 6359328..0672c75 100644
--- a/debian/jruby.lintian-overrides
+++ b/debian/jruby.lintian-overrides
@@ -6,6 +6,3 @@ jruby binary: codeless-jar usr/share/maven-repo/org/jruby/jruby-stdlib/*/jruby-s
 # this is a codeless jar, but its purpose is to be a dummy artifact that
 # depends on jruby-core and jruby-stdlib artifacts
 jruby binary: codeless-jar usr/share/maven-repo/org/jruby/jruby/*/jruby-*.jar
-
-# jruby+truffle is not built, so there should not be a problem with that script
-#jruby binary: script-not-executable usr/share/jruby/lib/ruby/truffle/jruby+truffle/bin/jruby+truffle
diff --git a/debian/rules b/debian/rules
index d4f8dee..f19db89 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ include /usr/share/dpkg/default.mk
 
 override_dh_auto_clean:
 	dh_auto_clean
-	@rm -f ./lib/jruby.jar ./lib/jruby-truffle.jar
+	@rm -f ./lib/jruby.jar
 	@rm -f ./bin/jruby ./core/src/main/java/org/jruby/runtime/Constants.java
 	# restore POM files to a pre-patched state if there are backups
 	-test -d ./bak && ( cd ./bak \
@@ -52,11 +52,9 @@ override_dh_prep:
 		&& cp ./bin/jruby ../../bin                                            \
 		&& chmod 0755 ./bin/*                                                  \
 		&& mkdir -p ./lib/jni/                                                 \
-		&& find ./lib/ruby/truffle -name LICENSE -delete                       \
 	        && cp -a /usr/lib/ruby/2.3.0/psych* ./lib/ruby/stdlib/                 \
 	        && cp -a ../../tmp/java/psych/psych.jar ./lib/ruby/stdlib/             \
 	        && sed 's/1\.[0-9]\{1,2\}/1.x/' -i ./lib/ruby/stdlib/psych/versions.rb \
-		&& sed '1d' -i ./lib/ruby/truffle/jruby+truffle/bin/jruby+truffle      \
 		&& rm -r ./tool/nailgun/*                                              )
 
 override_dh_auto_install:

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