Merge branch 'upstream' into debian/sid

1 files changed, 17 insertions, 2 deletions

diff --git a/bin/sisu3 b/bin/sisu3
index ca5be5e7..359a8744 100644
--- a/bin/sisu3
+++ b/bin/sisu3
@@ -1,8 +1,20 @@
 #!/usr/bin/env ruby
-# coding: utf-8
+# encoding: utf-8
 #SiSU: copyright (C) 1997 - 2011 Ralph Amissah; License GPL, see appended program information
 #raise "Please, use Ruby1.8 (1.8.4 or later), current Ruby #{RUBY_VERSION}" if RUBY_VERSION < '1.8.4' or RUBY_VERSION > '1.9'
-raise "Please, use Ruby1.8.4 or later, current Ruby #{RUBY_VERSION}" if RUBY_VERSION < '1.8.4'
+def check_sisu_stable_ruby_version?
+  rbv_sisu_stable='1.8.7'
+  if RUBY_VERSION < rbv_sisu_stable
+    raise "Please, use Ruby#{rbv_sisu_stable} or later, current Ruby #{RUBY_VERSION}"
+  end
+end
+def check_sisu_dev_ruby_version?
+  rbv_sisu_dev='1.9.2'
+  if RUBY_VERSION < rbv_sisu_dev
+    raise "Please, use Ruby#{rbv_sisu_dev} or later, current Ruby #{RUBY_VERSION}"
+  end
+end
+check_sisu_stable_ruby_version?
 $VERBOSE=nil
 $KCODE='u' if RUBY_VERSION < '1.9'
 argv=$*
@@ -10,10 +22,13 @@ SiSU_version_dir=case argv.inspect
 when /--v2/
   'v2'
 when /--v3/
+  check_sisu_dev_ruby_version?
   'v3'
 when /--dev/
+  check_sisu_dev_ruby_version?
   'v3'
 else
+  check_sisu_dev_ruby_version?
   'v3'
 end
 SiSU_lib="sisu/#{SiSU_version_dir}"