--- jruby1.1-1.1.4.orig/debian/compat +++ jruby1.1-1.1.4/debian/compat @@ -0,0 +1 @@ +6 --- jruby1.1-1.1.4.orig/debian/changelog +++ jruby1.1-1.1.4/debian/changelog @@ -0,0 +1,32 @@ +jruby1.1 (1.1.4-1ubuntu1) jaunty; urgency=low + + * debian/control: + + Add default-jdk as preference to the pure virtual build dependency on + java6-sdk. + + Add default-jre as preference to the pure virtual runtime dependency on + java6-runtime. + + -- Michael Bienia Mon, 10 Nov 2008 22:39:13 +0100 + +jruby1.1 (1.1.4-1) unstable; urgency=low + + * New upstream version. + * Use ant's clean-all target in debian/rules. + * Change a couple of shebang lines to use "/usr/bin/env jruby1.1" + instead of "/usr/bin/jruby1.1" (Closes: #498637). + + -- Sebastien Delafond Mon, 20 Oct 2008 15:57:50 -0700 + +jruby1.1 (1.1.3-2) unstable; urgency=low + + * ant is need to run the clean target of debian/rules, so it is actually + a Build-Depends. + * Depends: on a JRE, not a JDK. + + -- Sebastien Delafond Mon, 18 Aug 2008 18:59:23 -0700 + +jruby1.1 (1.1.3-1) unstable; urgency=low + + * New upstream release (Closes: #449607, #474988). + + -- Sebastien Delafond Tue, 12 Aug 2008 17:12:27 -0700 --- jruby1.1-1.1.4.orig/debian/watch +++ jruby1.1-1.1.4/debian/watch @@ -0,0 +1,9 @@ +# Rename this file to "watch" and then you can run the "uscan" command +# to check for upstream updates and more. +# See uscan(1) for format + +# Compulsory line, this is a version 2 file +version=3 + +opts="uversionmangle=s/RC/~rc/"\ + http://dist.codehaus.org/jruby/jruby-src-1.0(.*)\.tar\.gz --- jruby1.1-1.1.4.orig/debian/jirb1.1.1 +++ jruby1.1-1.1.4/debian/jirb1.1.1 @@ -0,0 +1,506 @@ +.TH JIRB1.1 "1" "April 2007" +.SH NAME +jirb1.1 \- interactive JRuby +.SH SYNOPSIS +.B jirb +[\fIoptions\fR] +.SH DESCRIPTION +.PP +irb stands for `interactive JRuby'. irb is a tool to execute interactively +JRuby expressions read from stdin. +Use of jirb is easy if you know JRuby. Executing jirb, prompts are +displayed as follows. Then, enter expression of ruby. A input is +executed when it is syntacticaly completed. + +.nf +\& $ jirb1.1 +\& irb(main):001:0> 1+2 +\& 3 +\& irb(main):002:0> class Foo +\& irb(main):003:1> def foo +\& irb(main):004:2> print 1 +\& irb(main):005:2> end +\& irb(main):006:1> end +\& nil +\& irb(main):007:0> +.fi + +And, Readline extesion module can be used with irb. Using Readline +is the standard default action if Readline is installed. +.SH OPTIONS + +.PP + +.TP +.fi +.B +\-f +suppress read ~/.irbrc +.TP +.fi +.B +\-m +bc mode (fraction or matrix are available) +.TP +.fi +.B +\-d +set $DEBUG to true (same as `ruby \-d') +.TP +.fi +.B +\-r load\-module +same as `ruby \-r' +.TP +.fi +.B +\-\-inspect +uses `inspect' for output (the default except bc mode) +.TP +.fi +.B +\-\-noinspect +doesn't uses inspect for output +.TP +.fi +.B +\-\-readline +uses Readline extension module +.TP +.fi +.B +\-\-noreadline +doesn't use Readline extension module +.TP +.fi +.B +\-\-prompt prompt\-mode +.TP +.fi +.B +\-\-prompt\-mode prompt\-mode +switches prompt mode. Pre\-defined prompt modes are +`default', `simple', `xmp' and `inf\-ruby' +.TP +.fi +.B +\-\-inf\-ruby\-mode +uses prompt appreciate for inf\-ruby\-mode on emacs. +Suppresses \-\-readline. +.TP +.fi +.B +\-\-simple\-prompt +simple prompt mode +.TP +.fi +.B +\-\-noprompt +no prompt +.TP +.fi +.B +\-\-tracer +display trace for each execution of commands. +.TP +.fi +.B +\-\-back\-trace\-limit n +displayes backtrace top n and tail n. The default +value is 16. +.TP +.fi +.B +\-\-irb_debug n +sets internal debug level to n (It shouldn't be used) +.TP +.fi +.B +\-v, \-\-version +prints the version of irb +.SH CONFIGURATIONS + +.PP +jirb reads `~/.irbrc' when it is invoked. If `~/.irbrb' doesn't exist +jirb try to read in the order `.irbrc', `irb.rc', `_irbrc' then `$irbrc'. +The following is altanative to the command line option. To use them +type as follows in a jirb session. + +.nf +\& IRB.conf[:IRB_NAME]="irb" +\& IRB.conf[:MATH_MODE]=false +\& IRB.conf[:USE_TRACER]=false +\& IRB.conf[:USE_LOADER]=false +\& IRB.conf[:IGNORE_SIGINT]=true +\& IRB.conf[:IGNORE_EOF]=false +\& IRB.conf[:INSPECT_MODE]=nil +\& IRB.conf[:IRB_RC] = nil +\& IRB.conf[:BACK_TRACE_LIMIT]=16 +\& IRB.conf[:USE_LOADER] = false +\& IRB.conf[:USE_READLINE] = nil +\& IRB.conf[:USE_TRACER] = false +\& IRB.conf[:IGNORE_SIGINT] = true +\& IRB.conf[:IGNORE_EOF] = false +\& IRB.conf[:PROMPT_MODE] = :DEFALUT +\& IRB.conf[:PROMPT] = {...} +\& IRB.conf[:DEBUG_LEVEL]=0 +\& IRB.conf[:VERBOSE]=true +.fi +.SH Customizing prompt + +.PP +To costomize the prompt you set a variable + +.nf +\& IRB.conf[:PROMPT] +.fi + +For example, describe as follows in `.irbrc'. + +.nf +\& IRB.conf[:PROMPT][:MY_PROMPT] = { # name of prompt mode +\& :PROMPT_I => nil, # normal prompt +\& :PROMPT_S => nil, # prompt for continuated strings +\& :PROMPT_C => nil, # prompt for continuated statement +\& :RETURN => " ==>%s\\n" # format to return value +\& } +.fi + +Then, invoke irb with the above prompt mode by + +.nf +\& $ jirb1.1 \-\-prompt my\-prompt +.fi + +Or add the following in `.irbrc'. + +.nf +\& IRB.conf[:PROMPT_MODE] = :MY_PROMPT +.fi + +Constants PROMPT_I, PROMPT_S and PROMPT_C specifies the format. +In the prompt specification, some special strings are available. + +.nf +\& %N command name which is running +\& %m to_s of main object (self) +\& %M inspect of main object (self) +\& %l type of string(", ', /, ]), `]' is inner %w[...] +\& %NNi indent level. NN is degits and means as same as printf("%NNd"). +\& It can be ommited +\& %NNn line number. +\& %% % +.fi +For instance, the default prompt mode is defined as follows: +IRB.conf[:PROMPT_MODE][:DEFAULT] = { +.TP +.fi +.B +PROMPT_I => "%N(%m):%03n:%i> ", +.TP +.fi +.B +PROMPT_S => "%N(%m):%03n:%i%l ", +.TP +.fi +.B +PROMPT_C => "%N(%m):%03n:%i* ", +.TP +.fi +.B +RETURN => "%s\\n"} +RETURN is used to printf. +.SH Configurating subirb + +.PP +The command line option or IRB.conf specify the default behavior of +(sub)irb. On the other hand, each conf of in the next sction `6. Command' +is used to individually configurate (sub)irb. +If proc is set to IRB.conf[:IRB_RC], its subirb will be invoked after +execution of that proc under giving the context of irb as its +aregument. By this mechanism each subirb can be configurated. +.SH Command + +.PP +For irb commands, both simple name and `irb_'\-prefixed name are prepared. +.TP +.fi +.B +exit, quit, irb_exit +Quits (sub)irb. +if you've done cb (see below), exit from the binding mode. + +.TP +.fi +.B +conf, irb_context +Displays current configuration. Modifing the configuration is +achieved by sending message to `conf'. +.TP +.fi +.B +conf.back_trace_limit +Sets display lines of backtrace as top n and tail n. +The default value is 16. +.TP +.fi +.B +conf.debug_level = N +Sets debug level of irb. +.TP +.fi +.B +conf.ignore_eof = true/false +Whether ^D (control\-d) will be ignored or not. +If false is set, ^D means quit. +.TP +.fi +.B +conf.ignore_sigint= true/false +Whether ^C (control\-c) will be ignored or not. +If false is set, ^D means quit. If true, +.nf +\& during input: cancel inputing then return to top level. +\& during execute: abondon current execution. +.fi +.TP +.fi +.B +conf.inf_ruby_mode = true/false +Whether inf\-ruby\-mode or not. The default value is false. +.TP +.fi +.B +conf.inspect_mode = true/false/nil +Specifies inspect mode. +true: display inspect +false: display to_s +nil: inspect mode in non math mode, +.nf +\& non inspect mode in math mode. +.fi +.TP +.fi +.B +conf.irb_level +The level of cb. +.TP +.fi +.B +conf.math_mode +Whether bc mode or not. +.TP +.fi +.B +conf.use_loader = true/false +Whether irb's own file reader method is used when load/require or not. +This mode is globaly affected (irb wide). +.TP +.fi +.B +conf.prompt_c +prompt for a continuating statement (e.g, immediately after of `if') +.TP +.fi +.B +conf.prompt_i +standard prompt +.TP +.fi +.B +conf.prompt_s +prompt for a continuating string +.TP +.fi +.B +conf.rc +Whether ~/.irbrc is read or not. +.TP +.fi +.B +conf.use_prompt = true/false +Prompting or not. +.TP +.fi +.B +conf.use_readline = true/false/nil +Whether readline is used or not. +true: uses +false: doen't use +nil: intends to use readline except for inf\-reuby\-mode (default) +.TP +.fi +.B +conf.verbose=T/F +Whether verbose messages are display or not. +.TP +.fi +.B +cb, irb_change_binding [obj] +Enter new binding which has a distinct scope of local variables. +If obj is given, obj will be self. +.TP +.fi +.B +irb [obj] +Invoke subirb. If obj is given, obj will be self. +.TP +.fi +.B +jobs, irb_jobs +List of subirb +.TP +.fi +.B +fg n, irb_fg n +Switch into specified subirb. The following is candidates of n: +.nf +\& irb number +\& thhread +\& irb object +\& self(obj which is specified of irb obj) +.fi +.TP +.fi +.B +kill n, irb_kill n +Kill subirb. The means of n is as same as the case of irb_fg. +.SH System variable + +.PP + +.TP +.fi +.B +_ +The latest value of evaluation (it is local) +.SH Session Example + +.PP +.nf +\& $ jirb1.1 +\& irb(main):001:0> irb # invoke subirb +\& irb#1(main):001:0> jobs # list of subirbs +\& #0\->irb on main (# : stop) +\& #1\->irb#1 on main (# : running) +\& nil +\& irb#1(main):002:0> fg 0 # switch job +\& nil +\& irb(main):002:0> class Foo;end +\& nil +\& irb(main):003:0> irb Foo # invoke subirb which has the +.fi +.nf +\& # context of Foo +.fi +.nf +\& irb#2(Foo):001:0> def foo # define Foo#foo +\& irb#2(Foo):002:1> print 1 +\& irb#2(Foo):003:1> end +\& nil +\& irb#2(Foo):004:0> fg 0 # switch job +\& nil +\& irb(main):004:0> jobs # list of job +\& #0\->irb on main (# : running) +\& #1\->irb#1 on main (# : stop) +\& #2\->irb#2 on Foo (# : stop) +\& nil +\& irb(main):005:0> Foo.instance_methods # Foo#foo is defined asurely +\& ["foo"] +\& irb(main):006:0> fg 2 # switch job +\& nil +\& irb#2(Foo):005:0> def bar # define Foo#bar +\& irb#2(Foo):006:1> print "bar" +\& irb#2(Foo):007:1> end +\& nil +\& irb#2(Foo):010:0> Foo.instance_methods +\& ["bar", "foo"] +\& irb#2(Foo):011:0> fg 0 +\& nil +\& irb(main):007:0> f = Foo.new +\& # +\& irb(main):008:0> irb f # invoke subirb which has the +.fi +.nf +\& # context of f (instance of Foo) +.fi +.nf +\& irb#3(#):001:0> jobs +\& #0\->irb on main (# : stop) +\& #1\->irb#1 on main (# : stop) +\& #2\->irb#2 on Foo (# : stop) +\& #3\->irb#3 on # (# : running) +\& nil +\& irb#3(#):002:0> foo # evaluate f.foo +\& 1nil +\& irb#3(#):003:0> bar # evaluate f.bar +\& barnil +\& irb#3(#):004:0> kill 1, 2, 3# kill job +\& nil +\& irb(main):009:0> jobs +\& #0\->irb on main (# : running) +\& nil +\& irb(main):010:0> exit # exit +.fi +.SH Restrictions + +.PP +Because irb evaluates the inputs immediately after the imput is +syntactically completed, irb gives slight different result than +directly use ruby. Known difference is pointed out here. +.SH Declaration of the local variable + +.PP +The following causes an error in ruby: + +.nf +\& eval "foo = 0" +\& foo +\& \-\- +\& \-:2: undefined local variable or method `foo' for # (NameError) +\& \-\-\- +\& NameError +.fi + +Though, the above will successfully done by irb. + +.nf +\& >> eval "foo = 0" +.fi +.nf +\& => 0 +\& >> foo +\& => 0 +.fi + +Ruby evaluates a code after reading entire of code and determination +of the scope of local variables. On the other hand, irb do +immediately. More precisely, irb evaluate at first + +.nf +\& evel "foo = 0" +.fi + +then foo is defined on this timing. It is because of this +incompatibility. +If you'd like to detect those differences, begin...end can be used: + +.nf +\& >> begin +\& ?> eval "foo = 0" +\& >> foo +\& >> end +\& NameError: undefined local variable or method `foo' for # +\& (irb):3 +\& (irb_local_binding):1:in `eval' +.fi +.SH Here\-document + +.PP +Implementation of Here\-document is incomplete. +.SH Symbol + +.PP +Irb can not always recognize a symbol as to be Symbol. Concretely, an +expression have completed, however Irb regard it as continuation line. + --- jruby1.1-1.1.4.orig/debian/links +++ jruby1.1-1.1.4/debian/links @@ -0,0 +1,8 @@ +usr/lib/jruby1.1/bin/jirb usr/bin/jirb1.1 +usr/lib/jruby1.1/bin/jruby usr/bin/jruby1.1 +usr/lib/jruby1.1/bin/jruby.rb usr/bin/jruby.rb1.1 +usr/lib/jruby1.1/bin/jrubyc usr/bin/jrubyc1.1 +usr/lib/jruby1.1/bin/jrubycli usr/bin/jrubycli1.1 +usr/lib/jruby1.1/bin/jrubysrv usr/bin/jrubysrv1.1 +usr/lib/jruby1.1/bin/testrb usr/bin/testrb1.1 +usr/lib/jruby1.1/lib/jruby.jar usr/share/java/jruby1.1.jar --- jruby1.1-1.1.4.orig/debian/jruby1.1.lintian-overrides +++ jruby1.1-1.1.4/debian/jruby1.1.lintian-overrides @@ -0,0 +1,3 @@ +# we really do not need to depend (or even suggest or recommend) ruby +# just for this script +jruby1.1 binary: ruby-script-but-no-ruby-dep ./usr/lib/jruby1.1/bin/jruby.rb --- jruby1.1-1.1.4.orig/debian/README.Debian +++ jruby1.1-1.1.4/debian/README.Debian @@ -0,0 +1,7 @@ +This is the Debian package for jruby1.09, a 100% pure-Java +implementation of ruby. + +Original packaging efforts courtesy of a hacker who'd rather remain +anonymous; "keep the filth alive". + +-- Sebastien Delafond Wed, 16 May 2007 18:38:29 -0700 --- jruby1.1-1.1.4.orig/debian/source.lintian-overrides +++ jruby1.1-1.1.4/debian/source.lintian-overrides @@ -0,0 +1,3 @@ +# java and ant are needed to clean +jruby1.1 source: build-depends-without-arch-dep java6-sdk +jruby1.1 source: build-depends-without-arch-dep ant --- jruby1.1-1.1.4.orig/debian/copyright +++ jruby1.1-1.1.4/debian/copyright @@ -0,0 +1,369 @@ +This package was debianized by Sebastien Delafond on +Thu, 8 Mar 2007 19:22:35 -0800. + +It was downloaded from: + + http://dist.codehaus.org/jruby/ + +License: + + JRuby is released under a tri CPL/GPL/LGPL license. You can use it, + redistribute it and/or modify it under the terms of the: + + Common Public License + GNU General Public License + GNU Lesser General Public License + + Some additional libraries distributed with JRuby are not covered by + JRuby's licence: + + BSF and ant are released under the Apache Software License, Version + 1.1: + + /* + * ================================================================ + * The Apache Software License, Version 1.1 + * ================================================================ + * + * Copyright (C) 2000-2002 The Apache Software Foundation. All + * rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. The end-user documentation included with the redistribution, if + * any, must include the following acknowledgment: "This product + * includes software developed by the Apache Software Foundation + * (http://www.apache.org/)." Alternately, this acknowledgment may + * appear in the software itself, if and wherever such third-party + * acknowledgments normally appear. + * + * 4. The names "Ant" and "Apache Software Foundation" must not be + * used to endorse or promote products derived from this software + * without prior written permission. For written permission, please + * contact apache@apache.org. + * + * 5. Products derived from this software may not be called "Apache", + * nor may "Apache" appear in their name, without prior written + * permission of the Apache Software Foundation. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION + * OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * . + * + */ + + Bouncycastle is released under this license: + + /* + * Copyright (c) 2000 - 2006 The Legion Of The Bouncy Castle + * (http://www.bouncycastle.org) + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + + Jyvaml and rbyaml are released under this license: + + /* Copyright (c) 2006 Ola Bini + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +On Debian systems, the complete text of the GNU General Public License +can be found in `/usr/share/common-licenses/GPL', and the complete text of +the GNU Lesser General Public License can be found in +`/usr/share/common-licenses/LGPL'. + +The complete text of the Common Public License is as follow: + +Common Public License - v 1.0 + +THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON +PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF +THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + +1. DEFINITIONS + +"Contribution" means: + + a) in the case of the initial Contributor, the initial code and + documentation distributed under this Agreement, and + + b) in the case of each subsequent Contributor: + + i) changes to the Program, and + + ii) additions to the Program; + + where such changes and/or additions to the Program originate + from and are distributed by that particular Contributor. A + Contribution 'originates' from a Contributor if it was added to the + Program by such Contributor itself or anyone acting on such + Contributor's behalf. Contributions do not include additions to the + Program which: (i) are separate modules of software distributed in + conjunction with the Program under their own license agreement, + and (ii) are not derivative works of the Program. + +"Contributor" means any person or entity that distributes the Program. + +"Licensed Patents " mean patent claims licensable by a Contributor +which are necessarily infringed by the use or sale of its Contribution +alone or when combined with the Program. + +"Program" means the Contributions distributed in accordance with this Agreement. + +"Recipient" means anyone who receives the Program under this +Agreement, including all Contributors. + +2. GRANT OF RIGHTS + + a) Subject to the terms of this Agreement, each Contributor +hereby grants Recipient a non-exclusive, worldwide, royalty-free +copyright license to reproduce, prepare derivative works of, publicly +display, publicly perform, distribute and sublicense the Contribution +of such Contributor, if any, and such derivative works, in source code +and object code form. + + b) Subject to the terms of this Agreement, each Contributor +hereby grants Recipient a non-exclusive, worldwide, royalty-free +patent license under Licensed Patents to make, use, sell, offer to +sell, import and otherwise transfer the Contribution of such +Contributor, if any, in source code and object code form. This patent +license shall apply to the combination of the Contribution and the +Program if, at the time the Contribution is added by the Contributor, +such addition of the Contribution causes such combination to be +covered by the Licensed Patents. The patent license shall not apply to +any other combinations which include the Contribution. No hardware per +se is licensed hereunder. + + c) Recipient understands that although each Contributor grants +the licenses to its Contributions set forth herein, no assurances are +provided by any Contributor that the Program does not infringe the +patent or other intellectual property rights of any other entity. Each +Contributor disclaims any liability to Recipient for claims brought by +any other entity based on infringement of intellectual property rights +or otherwise. As a condition to exercising the rights and licenses +granted hereunder, each Recipient hereby assumes sole responsibility +to secure any other intellectual property rights needed, if any. For +example, if a third party patent license is required to allow +Recipient to distribute the Program, it is Recipient's responsibility +to acquire that license before distributing the Program. + + d) Each Contributor represents that to its knowledge it has +sufficient copyright rights in its Contribution, if any, to grant the +copyright license set forth in this Agreement. + +3. REQUIREMENTS + +A Contributor may choose to distribute the Program in object code form +under its own license agreement, provided that: + + a) it complies with the terms and conditions of this Agreement; + and + + b) its license agreement: + + i) effectively disclaims on behalf of all Contributors all +warranties and conditions, express and implied, including warranties +or conditions of title and non-infringement, and implied warranties or +conditions of merchantability and fitness for a particular purpose; + + ii) effectively excludes on behalf of all Contributors all +liability for damages, including direct, indirect, special, incidental +and consequential damages, such as lost profits; + + iii) states that any provisions which differ from this Agreement +are offered by that Contributor alone and not by any other party; and + + iv) states that source code for the Program is available from +such Contributor, and informs licensees how to obtain it in a +reasonable manner on or through a medium customarily used for software +exchange. + +When the Program is made available in source code form: + + a) it must be made available under this Agreement; and + + b) a copy of this Agreement must be included with each copy of +the Program. + +Contributors may not remove or alter any copyright notices contained +within the Program. + +Each Contributor must identify itself as the originator of its +Contribution, if any, in a manner that reasonably allows subsequent +Recipients to identify the originator of the Contribution. + +4. COMMERCIAL DISTRIBUTION + +Commercial distributors of software may accept certain +responsibilities with respect to end users, business partners and the +like. While this license is intended to facilitate the commercial use +of the Program, the Contributor who includes the Program in a +commercial product offering should do so in a manner which does not +create potential liability for other Contributors. Therefore, if a +Contributor includes the Program in a commercial product offering, +such Contributor ("Commercial Contributor") hereby agrees to defend +and indemnify every other Contributor ("Indemnified Contributor") +against any losses, damages and costs (collectively "Losses") arising +from claims, lawsuits and other legal actions brought by a third party +against the Indemnified Contributor to the extent caused by the acts +or omissions of such Commercial Contributor in connection with its +distribution of the Program in a commercial product offering. The +obligations in this section do not apply to any claims or Losses +relating to any actual or alleged intellectual property +infringement. In order to qualify, an Indemnified Contributor must: a) +promptly notify the Commercial Contributor in writing of such claim, +and b) allow the Commercial Contributor to control, and cooperate with +the Commercial Contributor in, the defense and any related settlement +negotiations. The Indemnified Contributor may participate in any such +claim at its own expense. + +For example, a Contributor might include the Program in a commercial +product offering, Product X. That Contributor is then a Commercial +Contributor. If that Commercial Contributor then makes performance +claims, or offers warranties related to Product X, those performance +claims and warranties are such Commercial Contributor's responsibility +alone. Under this section, the Commercial Contributor would have to +defend claims against the other Contributors related to those +performance claims and warranties, and if a court requires any other +Contributor to pay any damages as a result, the Commercial Contributor +must pay those damages. + +5. NO WARRANTY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS +PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY +WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY +OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely +responsible for determining the appropriateness of using and +distributing the Program and assumes all risks associated with its +exercise of rights under this Agreement, including but not limited to +the risks and costs of program errors, compliance with applicable +laws, damage to or loss of data, programs or equipment, and +unavailability or interruption of operations. + +6. DISCLAIMER OF LIABILITY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR +ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING +WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR +DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED +HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. GENERAL + +If any provision of this Agreement is invalid or unenforceable under +applicable law, it shall not affect the validity or enforceability of +the remainder of the terms of this Agreement, and without further +action by the parties hereto, such provision shall be reformed to the +minimum extent necessary to make such provision valid and enforceable. + +If Recipient institutes patent litigation against a Contributor with +respect to a patent applicable to software (including a cross-claim or +counterclaim in a lawsuit), then any patent licenses granted by that +Contributor to such Recipient under this Agreement shall terminate as +of the date such litigation is filed. In addition, if Recipient +institutes patent litigation against any entity (including a +cross-claim or counterclaim in a lawsuit) alleging that the Program +itself (excluding combinations of the Program with other software or +hardware) infringes such Recipient's patent(s), then such Recipient's +rights granted under Section 2(b) shall terminate as of the date such +litigation is filed. + +All Recipient's rights under this Agreement shall terminate if it +fails to comply with any of the material terms or conditions of this +Agreement and does not cure such failure in a reasonable period of +time after becoming aware of such noncompliance. If all Recipient's +rights under this Agreement terminate, Recipient agrees to cease use +and distribution of the Program as soon as reasonably +practicable. However, Recipient's obligations under this Agreement and +any licenses granted by Recipient relating to the Program shall +continue and survive. + +Everyone is permitted to copy and distribute copies of this Agreement, +but in order to avoid inconsistency the Agreement is copyrighted and +may only be modified in the following manner. The Agreement Steward +reserves the right to publish new versions (including revisions) of +this Agreement from time to time. No one other than the Agreement +Steward has the right to modify this Agreement. IBM is the initial +Agreement Steward. IBM may assign the responsibility to serve as the +Agreement Steward to a suitable separate entity. Each new version of +the Agreement will be given a distinguishing version number. The +Program (including Contributions) may always be distributed subject to +the version of the Agreement under which it was received. In addition, +after a new version of the Agreement is published, Contributor may +elect to distribute the Program (including its Contributions) under +the new version. Except as expressly stated in Sections 2(a) and 2(b) +above, Recipient receives no rights or licenses to the intellectual +property of any Contributor under this Agreement, whether expressly, +by implication, estoppel or otherwise. All rights in the Program not +expressly granted under this Agreement are reserved. + +This Agreement is governed by the laws of the State of New York and +the intellectual property laws of the United States of America. No +party to this Agreement will bring a legal action under this Agreement +more than one year after the cause of action arose. Each party waives +its rights to a jury trial in any resulting litigation. + --- jruby1.1-1.1.4.orig/debian/rules +++ jruby1.1-1.1.4/debian/rules @@ -0,0 +1,106 @@ +#!/usr/bin/make -f + +include /usr/share/dpatch/dpatch.make + +SOURCE_NAME := $(shell dpkg-parsechangelog 2> /dev/null | awk '/^Source:/{print $$2}') +JRUBY_VERSION := $(shell pwd | perl -pe 's/.+-//') +JRUBY_MAJOR_VERSION := $(shell pwd | perl -pe 's/.+-(\d\.\d)/$$1/') + +DEST_DIR := $(CURDIR)/debian/$(SOURCE_NAME) + +JRUBY_LIB_DIR := $(DEST_DIR)/usr/lib/$(SOURCE_NAME) +JRUBY_DOC_DIR := $(DEST_DIR)/usr/share/doc/$(SOURCE_NAME) + +BUILD_TAR := jruby-bin-$(JRUBY_VERSION).tar.gz +BUILD_ZIP := jruby-bin-$(JRUBY_VERSION).zip +ANT := /usr/bin/ant + +JRUBY_MANPAGE := debian/jruby$(JRUBY_MAJOR_VERSION).1 +JIRB_MANPAGE := debian/jirb$(JRUBY_MAJOR_VERSION).1 + +clean: unpatch + dh_testdir + dh_testroot + + # Add here commands to clean up after the build process. + $(ANT) clean-all + if [ -d dist ] ; then $(ANT) dist-clean ; fi + rm -f $(BUILD_TAR) $(BUILD_ZIP) + rm -fr share + + rm -f build-stamp + dh_clean + +build: patch build-stamp + +build-stamp: + dh_testdir + + # Add here commands to compile the package. + $(ANT) compile +# docbook-to-man $(JRUBY_DOCBOOK_MANPAGE) > $(JRUBY_MANPAGE) +# docbook-to-man $(JIRB_DOCBOOK_MANPAGE) > $(JIRB_MANPAGE) + + touch build-stamp + +install: build + dh_testdir + dh_testroot + dh_installdirs + + # Add here commands to install the package into debian/jruby$(JRUBY_MAJOR_VERSION) + $(ANT) dist-bin + + tar -zxf $(BUILD_TAR) --strip 1 -C $(JRUBY_LIB_DIR) + # Remove all of the bat files + find $(JRUBY_LIB_DIR) -name '*.bat' | xargs rm -f + # Remove all of the svn directories + find $(JRUBY_LIB_DIR) -name '.svn' | xargs rm -rf + # remove extra docs + rm -fr $(JRUBY_LIB_DIR)/{docs,COPYING*} + +# Build architecture-independent files here. +binary-indep: install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs docs/ COPYING* README + rm -fr $(JRUBY_LIB_DIR)/{docs,COPYING*} + find $(JRUBY_DOC_DIR) -regex '.*/\(COPYING\|LICEN[CS]E\).*' | xargs rm -fr + dh_installexamples + # Remove all empty directories (twice, to get rid of directories + # containing only empty directories) + find $(DEST_DIR) -follow -type d -empty | xargs rm -rf + find $(DEST_DIR) -follow -type d -empty | xargs rm -rf +# dh_install +# dh_installmenu +# dh_installdebconf +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_installinit +# dh_installcron +# dh_installinfo + dh_installman + dh_link +# dh_strip + dh_compress + dh_fixperms +# dh_perl +# dh_python +# dh_makeshlibs + dh_lintian + dh_installdeb +# dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +# Build architecture-dependent files here. +binary-arch: + # We have nothing to do by default. + +binary: binary-indep binary-arch + +.PHONY: build clean binary-indep binary-arch binary install patch unpatch --- jruby1.1-1.1.4.orig/debian/control +++ jruby1.1-1.1.4/debian/control @@ -0,0 +1,14 @@ +Source: jruby1.1 +Section: interpreters +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Sebastien Delafond +Build-Depends: debhelper (>= 6.0.7~), dpatch, default-jdk | java6-sdk, ant +Standards-Version: 3.8.0 + +Package: jruby1.1 +Architecture: all +Depends: default-jre | java6-runtime +Provides: jruby +Description: 100% pure-Java implementation of Ruby + JRuby is an 100% pure-Java implementation of the Ruby programming language. --- jruby1.1-1.1.4.orig/debian/jruby1.1.1 +++ jruby1.1-1.1.4/debian/jruby1.1.1 @@ -0,0 +1,230 @@ +.Dd Apr 2, 2007 +.Dt JRUBY(1) "" "" +.\".Dt JRUBY 1 +.Os UNIX +.Sh NAME +.Nm jruby +.Nd Interpreted object-oriented scripting language +.Sh SYNOPSIS +.Nm +.Op Fl \-copyright +.Op Fl \-version +.Op Fl Sacdlnpswvy +.Op Fl 0 Ns Op Ar octal +.Op Fl C Ar directory +.Op Fl F Ar pattern +.Op Fl I Ar directory +.Op Fl K Ar c +.Op Fl T Ns Op Ar level +.Op Fl e Ar command +.Op Fl i Ns Op Ar extension +.Op Fl r Ar library +.Op Fl x Ns Op Ar directory +.Op Fl \- +.Op Ar program_file +.Op Ar argument ... +.Sh DESCRIPTION +Jruby is a 100% pure-Java implementation of Ruby, an interpreted +scripting language for quick and easy object-oriented programming. It +has many features to process text files and to do system management +tasks (as in Perl). It is simple, straight-forward, and extensible. +.Sh OPTIONS +Ruby interpreter accepts following command-line options (switches). +They are quite similar to those of +.Xr perl 1 . +.Bl -tag -width "1234567890123" -compact +.Pp +.It Fl \-copyright +Prints the copyright notice. +.Pp +.It Fl \-version +Prints the version of Ruby interpreter. +.Pp +.It Fl 0 Ns Op Ar octal +(The digit +.Dq zero . ) +Specifies the input record separator +.Pf ( Li "$/" ) +as an octal number. If no digit is given, the null character is taken +as the separator. Other switches may follow the digits. +.Fl 00 +turns Ruby into paragraph mode. +.Fl 0777 +makes Ruby read whole file at once as a single string since there is +no legal character with that value. +.Pp +.It Fl C Ar directory +Causes Ruby to switch to the directory. +.Pp +.It Fl F Ar pattern +Specifies input field separator +.Pf ( Li "$;" ) . +.Pp +.It Fl I Ar directory +Used to tell Ruby where to load the library scripts. Directory path +will be added to the load-path variable +.Pf ( Li "$:" ) . +.Pp +.It Fl K Ar kcode +Specifies KANJI (Japanese) encoding. +.Pp +.It Fl S +Makes Ruby use the +.Ev PATH +environment variable to search for script, unless if its name begins +with a slash. This is used to emulate +.Li #! +on machines that don't support it, in the following manner: +.Bd -literal -offset indent +#! /usr/local/bin/ruby +# This line makes the next one a comment in Ruby \e + exec /usr/local/bin/ruby \-S $0 $* +.Ed +.Pp +.It Fl T Ns Op Ar level +Turns on taint checks at the specified level (default 1). +.Pp +.It Fl a +Turns on auto-split mode when used with +.Fl n +or +.Fl p . +In auto-split mode, Ruby executes +.Dl $F = $_.split +at beginning of each loop. +.Pp +.It Fl c +Causes Ruby to check the syntax of the script and exit without +executing. If there are no syntax errors, Ruby will print +.Dq Syntax OK +to the standard output. +.Pp +.It Fl d +.It Fl \-debug +Turns on debug mode. +.Li "$DEBUG" +will be set to true. +.Pp +.It Fl e Ar command +Specifies script from command-line while telling Ruby not to search +the rest of arguments for a script file name. +.Pp +.It Fl h +.It Fl \-help +Prints a summary of the options. +.Pp +.It Fl i Ar extension +Specifies in-place-edit mode. The extension, if specified, is added +to old file name to make a backup copy. For example: +.Bd -literal -offset indent +% echo matz > /tmp/junk +% cat /tmp/junk +matz +% ruby \-p \-i.bak \-e '$_.upcase!' /tmp/junk +% cat /tmp/junk +MATZ +% cat /tmp/junk.bak +matz +.Ed +.Pp +.It Fl l +(The lowercase letter +.Dq ell . ) +Enables automatic line-ending processing, which means to firstly set +.Li "$\e" +to the value of +.Li "$/" , +and secondly chops every line read using +.Li chop! . +.Pp +.It Fl n +Causes Ruby to assume the following loop around your script, which +makes it iterate over file name arguments somewhat like +.Nm sed +.Fl n +or +.Nm awk . +.Bd -literal -offset indent +while gets + ... +end +.Ed +.Pp +.It Fl p +Acts mostly same as \-n switch, but print the value of variable +.Li "$_" +at the each end of the loop. For example: +.Bd -literal -offset indent +% echo matz | ruby \-p \-e '$_.tr! "a-z", "A-Z"' +MATZ +.Ed +.Pp +.It Fl r Ar library +Causes Ruby to load the library using require. It is useful when using +.Fl n +or +.Fl p . +.Pp +.It Fl s +Enables some switch parsing for switches after script name but before +any file name arguments (or before a +.Fl \- ) . +Any switches found there are removed from +.Li ARGV +and set the corresponding variable in the script. For example: +.Bd -literal -offset indent +#! /usr/local/bin/ruby \-s +# prints "true" if invoked with `\-xyz' switch. +print "true\en" if $xyz +.Ed +.Pp +On some systems +.Li "$0" +does not always contain the full pathname, so you need the +.Fl S +switch to tell Ruby to search for the script if necessary. To handle +embedded spaces or such. A better construct than +.Li "$*" +would be +.Li ${1+"$@"} , +but it does not work if the script is being interpreted by +.Xr csh 1 . +.Pp +.It Fl v +.It Fl \-verbose +Enables verbose mode. Ruby will print its version at the beginning, +and set the variable +.Li "$VERBOSE" +to true. Some methods print extra messages if this variable is true. +If this switch is given, and no other switches are present, Ruby quits +after printing its version. +.Pp +.It Fl w +Enables verbose mode without printing version message at the +beginning. It sets the +.Li "$VERBOSE" +variable to true. +.Pp +.It Fl x Ns Op Ar directory +Tells Ruby that the script is embedded in a message. Leading garbage +will be discarded until the first that starts with +.Dq #! +and contains the string, +.Dq ruby . +Any meaningful switches on that line will applied. The end of script +must be specified with either +.Li EOF , +.Li "^D" ( Li "control-D" ) , +.Li "^Z" ( Li "control-Z" ) , +or reserved word +.Li __END__ . +If the directory name is specified, Ruby will switch to that directory +before executing script. +.Pp +.It Fl y +.It Fl \-yydebug +Turns on compiler debug mode. Ruby will print a bunch of internal +state messages during compiling scripts. You don't have to specify +this switch, unless you are going to debug the Ruby interpreter. +.El +.Pp --- jruby1.1-1.1.4.orig/debian/dirs +++ jruby1.1-1.1.4/debian/dirs @@ -0,0 +1,2 @@ +usr/lib/jruby1.1 +usr/bin --- jruby1.1-1.1.4.orig/debian/manpages +++ jruby1.1-1.1.4/debian/manpages @@ -0,0 +1,2 @@ +debian/jruby1.1.1 +debian/jirb1.1.1 --- jruby1.1-1.1.4.orig/debian/patches/05-ant-no-gems-no-zip.dpatch +++ jruby1.1-1.1.4/debian/patches/05-ant-no-gems-no-zip.dpatch @@ -0,0 +1,40 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 05-ant-no-gems.dpatch by Sebastien Delafond +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No gems. + +@DPATCH@ +diff -urNad jruby-1.1.3~/build.xml jruby-1.1.3/build.xml +--- jruby-1.1.3~/build.xml 2008-07-20 11:31:50.000000000 -0700 ++++ jruby-1.1.3/build.xml 2008-08-13 12:43:15.000000000 -0700 +@@ -955,9 +955,9 @@ + + + +- ++ + + + +@@ -969,7 +969,7 @@ + + + +- ++ + + + --- jruby1.1-1.1.4.orig/debian/patches/00list +++ jruby1.1-1.1.4/debian/patches/00list @@ -0,0 +1,6 @@ +01-shebangs.dpatch +#02-drb-client-hang.dpatch +03-override-jruby-home.dpatch +#04-gcj-build-compatibility.dpatch +05-ant-no-gems-no-zip.dpatch +06_add_jruby.bnd.template.dpatch --- jruby1.1-1.1.4.orig/debian/patches/06_add_jruby.bnd.template.dpatch +++ jruby1.1-1.1.4/debian/patches/06_add_jruby.bnd.template.dpatch @@ -0,0 +1,17 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 06_add_jruby.bnd.template.dpatch by Sebastien Delafond +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: jruby.bnd.template is missing from the source tarball. + +@DPATCH@ +diff -urNad jruby-1.1.4~/jruby.bnd.template jruby-1.1.4/jruby.bnd.template +--- jruby-1.1.4~/jruby.bnd.template 1969-12-31 16:00:00.000000000 -0800 ++++ jruby-1.1.4/jruby.bnd.template 2008-10-20 16:08:32.000000000 -0700 +@@ -0,0 +1,6 @@ ++Export-Package: org.jruby.*;version="@JRUBY_VERSION@" ++Import-Package: !org.jruby.*, *;resolution:=optional ++Bundle-Version: @JRUBY_VERSION@ ++Bundle-Description: JRuby @JRUBY_VERSION@ OSGi bundle ++Bundle-Name: JRuby @JRUBY_VERSION@ ++Bundle-SymbolicName: org.jruby.jruby --- jruby1.1-1.1.4.orig/debian/patches/01-shebangs.dpatch +++ jruby1.1-1.1.4/debian/patches/01-shebangs.dpatch @@ -0,0 +1,307 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01-remove-shebang.dpatch by Sebastien Delafond +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Remove extraneous shebang lines, and correct necessary jruby ones. + +@DPATCH@ +diff -urNad jruby-1.1.3~/bin/gem jruby-1.1.3/bin/gem +--- jruby-1.1.3~/bin/gem 2008-08-12 20:24:06.000000000 -0700 ++++ jruby-1.1.3/bin/gem 2008-08-12 20:24:40.000000000 -0700 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env jruby ++#! /usr/bin/env jruby1.1 + #-- + # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others. + # All rights reserved. +diff -urNad jruby-1.1.3~/bin/gem_mirror jruby-1.1.3/bin/gem_mirror +--- jruby-1.1.3~/bin/gem_mirror 2008-08-12 20:24:06.000000000 -0700 ++++ jruby-1.1.3/bin/gem_mirror 2008-08-12 20:24:40.000000000 -0700 +@@ -1,3 +1,3 @@ +-#!/usr/bin/env jruby ++#! /usr/bin/env jruby1.1 + + abort "`gem_mirror` has been deprecated. Use `gem mirror` instead." +diff -urNad jruby-1.1.3~/bin/gem_server jruby-1.1.3/bin/gem_server +--- jruby-1.1.3~/bin/gem_server 2008-08-12 20:24:06.000000000 -0700 ++++ jruby-1.1.3/bin/gem_server 2008-08-12 20:24:40.000000000 -0700 +@@ -1,3 +1,3 @@ +-#!/usr/bin/env jruby ++#! /usr/bin/env jruby1.1 + + abort "`gem_server` has been deprecated. Use `gem server` instead." +diff -urNad jruby-1.1.3~/bin/gemlock jruby-1.1.3/bin/gemlock +--- jruby-1.1.3~/bin/gemlock 2008-08-12 20:24:06.000000000 -0700 ++++ jruby-1.1.3/bin/gemlock 2008-08-12 20:24:40.000000000 -0700 +@@ -1,3 +1,3 @@ +-#!/usr/bin/env jruby ++#! /usr/bin/env jruby1.1 + + abort "`gemlock` has been deprecated. Use `gem lock` instead." +diff -urNad jruby-1.1.3~/bin/gemri jruby-1.1.3/bin/gemri +--- jruby-1.1.3~/bin/gemri 2008-08-12 20:24:06.000000000 -0700 ++++ jruby-1.1.3/bin/gemri 2008-08-12 20:24:40.000000000 -0700 +@@ -1,3 +1,3 @@ +-#!/usr/bin/env jruby ++#! /usr/bin/env jruby1.1 + + abort "`gemri` has been deprecated. Use `ri` instead." +diff -urNad jruby-1.1.3~/bin/gemwhich jruby-1.1.3/bin/gemwhich +--- jruby-1.1.3~/bin/gemwhich 2008-08-12 20:24:06.000000000 -0700 ++++ jruby-1.1.3/bin/gemwhich 2008-08-12 20:24:40.000000000 -0700 +@@ -1,3 +1,3 @@ +-#!/usr/bin/env jruby ++#! /usr/bin/env jruby1.1 + + abort "`gemwhich` has been deprecated. Use `gem which` instead." +diff -urNad jruby-1.1.3~/bin/generate_yaml_index.rb jruby-1.1.3/bin/generate_yaml_index.rb +--- jruby-1.1.3~/bin/generate_yaml_index.rb 2008-08-12 20:24:06.000000000 -0700 ++++ jruby-1.1.3/bin/generate_yaml_index.rb 2008-08-12 20:24:40.000000000 -0700 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env jruby ++#! /usr/bin/env jruby1.1 + + # Generate the yaml/yaml.Z index files for a gem server directory. + # +diff -urNad jruby-1.1.3~/bin/index_gem_repository.rb jruby-1.1.3/bin/index_gem_repository.rb +--- jruby-1.1.3~/bin/index_gem_repository.rb 2008-08-12 20:24:06.000000000 -0700 ++++ jruby-1.1.3/bin/index_gem_repository.rb 2008-08-12 20:24:40.000000000 -0700 +@@ -1,3 +1,3 @@ +-#!/usr/bin/env jruby ++#! /usr/bin/env jruby1.1 + + abort "`index_gem_repository.rb` has been deprecated. Use `gem generate_index` instead." +diff -urNad jruby-1.1.3~/bin/jgem jruby-1.1.3/bin/jgem +--- jruby-1.1.3~/bin/jgem 2008-08-12 20:24:06.000000000 -0700 ++++ jruby-1.1.3/bin/jgem 2008-08-12 20:24:40.000000000 -0700 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env jruby ++#! /usr/bin/env jruby1.1 + #-- + # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others. + # All rights reserved. +diff -urNad jruby-1.1.3~/bin/jirb jruby-1.1.3/bin/jirb +--- jruby-1.1.3~/bin/jirb 2008-08-12 20:24:06.000000000 -0700 ++++ jruby-1.1.3/bin/jirb 2008-08-12 20:24:40.000000000 -0700 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env jruby ++#! /usr/bin/env jruby1.1 + # + # irb.rb - intaractive ruby + # $Release Version: 0.7.3 $ +diff -urNad jruby-1.1.3~/bin/jirb_swing jruby-1.1.3/bin/jirb_swing +--- jruby-1.1.3~/bin/jirb_swing 2008-08-12 20:24:06.000000000 -0700 ++++ jruby-1.1.3/bin/jirb_swing 2008-08-12 20:24:40.000000000 -0700 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env jruby ++#! /usr/bin/env jruby1.1 + # + # IRB in swing + # +diff -urNad jruby-1.1.3~/bin/jrubyc jruby-1.1.3/bin/jrubyc +--- jruby-1.1.3~/bin/jrubyc 2008-08-12 20:24:06.000000000 -0700 ++++ jruby-1.1.3/bin/jrubyc 2008-08-12 20:24:40.000000000 -0700 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env jruby ++#! /usr/bin/env jruby1.1 + + require 'jruby/jrubyc' + +diff -urNad jruby-1.1.3~/bin/rake jruby-1.1.3/bin/rake +--- jruby-1.1.3~/bin/rake 2008-08-12 20:24:06.000000000 -0700 ++++ jruby-1.1.3/bin/rake 2008-08-12 20:24:40.000000000 -0700 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env jruby ++#! /usr/bin/env jruby1.1 + # + # This file was generated by RubyGems. + # +diff -urNad jruby-1.1.3~/bin/rdoc jruby-1.1.3/bin/rdoc +--- jruby-1.1.3~/bin/rdoc 2008-08-12 20:24:06.000000000 -0700 ++++ jruby-1.1.3/bin/rdoc 2008-08-12 20:24:40.000000000 -0700 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env jruby ++#! /usr/bin/env jruby1.1 + # + # RDoc: Documentation tool for source code + # (see lib/rdoc/rdoc.rb for more information) +diff -urNad jruby-1.1.3~/bin/ri jruby-1.1.3/bin/ri +--- jruby-1.1.3~/bin/ri 2008-08-12 20:24:06.000000000 -0700 ++++ jruby-1.1.3/bin/ri 2008-08-12 20:24:40.000000000 -0700 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env jruby ++#! /usr/bin/env jruby1.1 + # usage: + # + # ri name... +diff -urNad jruby-1.1.3~/bin/spec jruby-1.1.3/bin/spec +--- jruby-1.1.3~/bin/spec 2008-08-12 20:24:06.000000000 -0700 ++++ jruby-1.1.3/bin/spec 2008-08-12 20:24:40.000000000 -0700 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env jruby ++#! /usr/bin/env jruby1.1 + # + # This file was generated by RubyGems. + # +diff -urNad jruby-1.1.3~/bin/spec_translator jruby-1.1.3/bin/spec_translator +--- jruby-1.1.3~/bin/spec_translator 2008-08-12 20:24:06.000000000 -0700 ++++ jruby-1.1.3/bin/spec_translator 2008-08-12 20:24:40.000000000 -0700 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env jruby ++#! /usr/bin/env jruby1.1 + # + # This file was generated by RubyGems. + # +diff -urNad jruby-1.1.3~/bin/testrb jruby-1.1.3/bin/testrb +--- jruby-1.1.3~/bin/testrb 2008-08-12 20:24:06.000000000 -0700 ++++ jruby-1.1.3/bin/testrb 2008-08-12 20:24:40.000000000 -0700 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env jruby ++#! /usr/bin/env jruby1.1 + require 'test/unit' + (r = Test::Unit::AutoRunner.new(true)).process_args(ARGV) or + abort r.options.banner + " tests..." +diff -urNad jruby-1.1.3~/bin/update_rubygems jruby-1.1.3/bin/update_rubygems +--- jruby-1.1.3~/bin/update_rubygems 2008-08-12 20:24:06.000000000 -0700 ++++ jruby-1.1.3/bin/update_rubygems 2008-08-12 20:24:40.000000000 -0700 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env jruby ++#! /usr/bin/env jruby1.1 + #-- + # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others. + # All rights reserved. +diff -urNad jruby-1.1.3~/lib/ruby/1.8/abbrev.rb jruby-1.1.3/lib/ruby/1.8/abbrev.rb +--- jruby-1.1.3~/lib/ruby/1.8/abbrev.rb 2008-08-12 20:24:06.000000000 -0700 ++++ jruby-1.1.3/lib/ruby/1.8/abbrev.rb 2008-08-12 20:24:40.000000000 -0700 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env ruby + =begin + # + # Copyright (c) 2001,2003 Akinori MUSHA +diff -urNad jruby-1.1.3~/lib/ruby/1.8/generator.rb jruby-1.1.3/lib/ruby/1.8/generator.rb +--- jruby-1.1.3~/lib/ruby/1.8/generator.rb 2008-08-12 20:24:06.000000000 -0700 ++++ jruby-1.1.3/lib/ruby/1.8/generator.rb 2008-08-12 20:24:40.000000000 -0700 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env ruby + #-- + # $Idaemons: /home/cvs/rb/generator.rb,v 1.8 2001/10/03 08:54:32 knu Exp $ + # $RoughId: generator.rb,v 1.10 2003/10/14 19:36:58 knu Exp $ +diff -urNad jruby-1.1.3~/lib/ruby/1.8/irb/cmd/subirb.rb jruby-1.1.3/lib/ruby/1.8/irb/cmd/subirb.rb +--- jruby-1.1.3~/lib/ruby/1.8/irb/cmd/subirb.rb 2008-08-12 20:24:06.000000000 -0700 ++++ jruby-1.1.3/lib/ruby/1.8/irb/cmd/subirb.rb 2008-08-12 20:24:40.000000000 -0700 +@@ -1,4 +1,3 @@ +-#!/usr/local/bin/ruby + # + # multi.rb - + # $Release Version: 0.9.5$ +diff -urNad jruby-1.1.3~/lib/ruby/1.8/irb/ext/save-history.rb jruby-1.1.3/lib/ruby/1.8/irb/ext/save-history.rb +--- jruby-1.1.3~/lib/ruby/1.8/irb/ext/save-history.rb 2008-08-12 20:24:06.000000000 -0700 ++++ jruby-1.1.3/lib/ruby/1.8/irb/ext/save-history.rb 2008-08-12 20:24:40.000000000 -0700 +@@ -1,4 +1,3 @@ +-#!/usr/local/bin/ruby + # + # save-history.rb - + # $Release Version: 0.9.5$ +diff -urNad jruby-1.1.3~/lib/ruby/1.8/matrix.rb jruby-1.1.3/lib/ruby/1.8/matrix.rb +--- jruby-1.1.3~/lib/ruby/1.8/matrix.rb 2008-08-12 20:24:06.000000000 -0700 ++++ jruby-1.1.3/lib/ruby/1.8/matrix.rb 2008-08-12 20:24:40.000000000 -0700 +@@ -1,4 +1,3 @@ +-#!/usr/local/bin/ruby + #-- + # matrix.rb - + # $Release Version: 1.0$ +diff -urNad jruby-1.1.3~/lib/ruby/1.8/rdoc/markup/sample/rdoc2latex.rb jruby-1.1.3/lib/ruby/1.8/rdoc/markup/sample/rdoc2latex.rb +--- jruby-1.1.3~/lib/ruby/1.8/rdoc/markup/sample/rdoc2latex.rb 2008-08-12 20:24:06.000000000 -0700 ++++ jruby-1.1.3/lib/ruby/1.8/rdoc/markup/sample/rdoc2latex.rb 2008-08-12 20:24:40.000000000 -0700 +@@ -1,4 +1,3 @@ +-#!/usr/local/bin/ruby + # Illustration of a script to convert an RDoc-style file to a LaTeX + # document + +diff -urNad jruby-1.1.3~/lib/ruby/1.8/rdoc/parsers/parse_rb.rb jruby-1.1.3/lib/ruby/1.8/rdoc/parsers/parse_rb.rb +--- jruby-1.1.3~/lib/ruby/1.8/rdoc/parsers/parse_rb.rb 2008-08-12 20:24:06.000000000 -0700 ++++ jruby-1.1.3/lib/ruby/1.8/rdoc/parsers/parse_rb.rb 2008-08-12 20:24:40.000000000 -0700 +@@ -1,4 +1,3 @@ +-#!/usr/local/bin/ruby + + # Parse a Ruby source file, building a set of objects + # representing the modules, classes, methods, +diff -urNad jruby-1.1.3~/lib/ruby/1.8/set.rb jruby-1.1.3/lib/ruby/1.8/set.rb +--- jruby-1.1.3~/lib/ruby/1.8/set.rb 2008-08-12 20:24:06.000000000 -0700 ++++ jruby-1.1.3/lib/ruby/1.8/set.rb 2008-08-12 20:24:40.000000000 -0700 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env ruby + #-- + # set.rb - defines the Set class + #++ +diff -urNad jruby-1.1.3~/lib/ruby/1.8/tsort.rb jruby-1.1.3/lib/ruby/1.8/tsort.rb +--- jruby-1.1.3~/lib/ruby/1.8/tsort.rb 2008-08-12 20:24:06.000000000 -0700 ++++ jruby-1.1.3/lib/ruby/1.8/tsort.rb 2008-08-12 20:24:40.000000000 -0700 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env ruby + #-- + # tsort.rb - provides a module for topological sorting and strongly connected components. + #++ +diff -urNad jruby-1.1.3~/lib/ruby/1.8/wsdl/soap/wsdl2ruby.rb jruby-1.1.3/lib/ruby/1.8/wsdl/soap/wsdl2ruby.rb +--- jruby-1.1.3~/lib/ruby/1.8/wsdl/soap/wsdl2ruby.rb 2008-08-12 20:24:06.000000000 -0700 ++++ jruby-1.1.3/lib/ruby/1.8/wsdl/soap/wsdl2ruby.rb 2008-08-12 20:24:40.000000000 -0700 +@@ -159,7 +159,6 @@ + end + + def shbang +- "#!/usr/bin/env ruby" + end + + def create_name(name) +diff -urNad jruby-1.1.3~/lib/ruby/site_ruby/1.8/rbconfig/datadir.rb jruby-1.1.3/lib/ruby/site_ruby/1.8/rbconfig/datadir.rb +--- jruby-1.1.3~/lib/ruby/site_ruby/1.8/rbconfig/datadir.rb 2008-07-20 11:32:34.000000000 -0700 ++++ jruby-1.1.3/lib/ruby/site_ruby/1.8/rbconfig/datadir.rb 2008-08-12 20:25:09.000000000 -0700 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env ruby + #-- + # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others. + # All rights reserved. +diff -urNad jruby-1.1.3~/lib/ruby/site_ruby/1.8/rubygems/digest/digest_adapter.rb jruby-1.1.3/lib/ruby/site_ruby/1.8/rubygems/digest/digest_adapter.rb +--- jruby-1.1.3~/lib/ruby/site_ruby/1.8/rubygems/digest/digest_adapter.rb 2008-07-20 11:32:35.000000000 -0700 ++++ jruby-1.1.3/lib/ruby/site_ruby/1.8/rubygems/digest/digest_adapter.rb 2008-08-12 20:25:09.000000000 -0700 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env ruby + #-- + # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others. + # All rights reserved. +diff -urNad jruby-1.1.3~/lib/ruby/site_ruby/1.8/rubygems/digest/md5.rb jruby-1.1.3/lib/ruby/site_ruby/1.8/rubygems/digest/md5.rb +--- jruby-1.1.3~/lib/ruby/site_ruby/1.8/rubygems/digest/md5.rb 2008-07-20 11:32:35.000000000 -0700 ++++ jruby-1.1.3/lib/ruby/site_ruby/1.8/rubygems/digest/md5.rb 2008-08-12 20:25:09.000000000 -0700 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env ruby + #-- + # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others. + # All rights reserved. +diff -urNad jruby-1.1.3~/lib/ruby/site_ruby/1.8/rubygems/digest/sha1.rb jruby-1.1.3/lib/ruby/site_ruby/1.8/rubygems/digest/sha1.rb +--- jruby-1.1.3~/lib/ruby/site_ruby/1.8/rubygems/digest/sha1.rb 2008-07-20 11:32:36.000000000 -0700 ++++ jruby-1.1.3/lib/ruby/site_ruby/1.8/rubygems/digest/sha1.rb 2008-08-12 20:25:09.000000000 -0700 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env ruby + #-- + # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others. + # All rights reserved. +diff -urNad jruby-1.1.3~/lib/ruby/site_ruby/1.8/rubygems/digest/sha2.rb jruby-1.1.3/lib/ruby/site_ruby/1.8/rubygems/digest/sha2.rb +--- jruby-1.1.3~/lib/ruby/site_ruby/1.8/rubygems/digest/sha2.rb 2008-07-20 11:32:34.000000000 -0700 ++++ jruby-1.1.3/lib/ruby/site_ruby/1.8/rubygems/digest/sha2.rb 2008-08-12 20:25:09.000000000 -0700 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env ruby + #-- + # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others. + # All rights reserved. +diff -urNad jruby-1.1.3~/lib/ruby/site_ruby/1.8/rubygems/installer.rb jruby-1.1.3/lib/ruby/site_ruby/1.8/rubygems/installer.rb +--- jruby-1.1.3~/lib/ruby/site_ruby/1.8/rubygems/installer.rb 2008-08-12 20:24:06.000000000 -0700 ++++ jruby-1.1.3/lib/ruby/site_ruby/1.8/rubygems/installer.rb 2008-08-12 20:25:09.000000000 -0700 +@@ -317,7 +317,7 @@ + if @env_shebang then + # JRuby: Cannot use Gem::ConfigMap[:ruby_install_name] here, + # because it gets expanded into jruby.bat on Windows. +- "#!/usr/bin/env jruby" ++ "#! /usr/bin/env jruby1.1" + else + path = File.join @gem_dir, @spec.bindir, bin_file_name + --- jruby1.1-1.1.4.orig/debian/patches/04-gcj-build-compatibility.dpatch +++ jruby1.1-1.1.4/debian/patches/04-gcj-build-compatibility.dpatch @@ -0,0 +1,43 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 04-gcj-build-compatibility.dpatch by Sebastien Delafond +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad jruby-1.1.0~/src/org/jruby/RubyZlib.java jruby-1.0.2/src/org/jruby/RubyZlib.java +--- jruby-1.1.0~/src/org/jruby/RubyZlib.java 2007-11-01 08:32:20.000000000 -0700 ++++ jruby-1.1.0/src/org/jruby/RubyZlib.java 2007-11-06 13:17:51.000000000 -0800 +@@ -663,7 +663,7 @@ + return orig_name == null ? getRuntime().getNil() : getRuntime().newString(orig_name); + } + +- public Object to_io() { ++ public IRubyObject to_io() { + return realIo; + } + +diff -urNad jruby-1.1.0~/src/org/jruby/compiler/impl/StandardASMCompiler.java jruby-1.0.2/src/org/jruby/compiler/impl/StandardASMCompiler.java +--- jruby-1.1.0~/src/org/jruby/compiler/impl/StandardASMCompiler.java 2007-11-06 13:17:06.000000000 -0800 ++++ jruby-1.1.0/src/org/jruby/compiler/impl/StandardASMCompiler.java 2007-11-06 13:17:14.000000000 -0800 +@@ -289,7 +289,7 @@ + cv.visitField(ACC_STATIC | ACC_PRIVATE | ACC_FINAL, "$isClassLoaded", cg.ci(Boolean.TYPE), null, Boolean.FALSE); + cv.visitField(ACC_STATIC | ACC_PRIVATE | ACC_FINAL, "$class", cg.ci(Class.class), null, null); + +- SkinnyMethodAdapter mv = new SkinnyMethodAdapter(cv.visitMethod(ACC_PUBLIC, "", cg.sig(Void.TYPE), null, null)); ++ SkinnyMethodAdapter mv = new SkinnyMethodAdapter(cv.visitMethod(ACC_PUBLIC | ACC_STATIC, "", cg.sig(Void.TYPE), null, null)); + mv.start(); + + // This is a little hacky...since clinit recurses, set a boolean so we don't continue trying to load class +diff -urNad jruby-1.1.0~/src/org/jruby/libraries/ThreadLibrary.java jruby-1.0.2/src/org/jruby/libraries/ThreadLibrary.java +--- jruby-1.1.0~/src/org/jruby/libraries/ThreadLibrary.java 2007-11-01 08:32:20.000000000 -0700 ++++ jruby-1.1.0/src/org/jruby/libraries/ThreadLibrary.java 2007-11-06 13:19:07.000000000 -0800 +@@ -249,7 +249,7 @@ + return RubyNumeric.int2fix(getRuntime(), entries.size()); + } + +- public int num_waiting() { return 0; } ++ public IRubyObject num_waiting() { return getRuntime().newFixnum(0); } + + public synchronized IRubyObject pop(IRubyObject[] args) { + boolean should_block = true; --- jruby1.1-1.1.4.orig/debian/patches/03-override-jruby-home.dpatch +++ jruby1.1-1.1.4/debian/patches/03-override-jruby-home.dpatch @@ -0,0 +1,85 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03-override-jruby-home.dpatch by Sebastien Delafond +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: jruby_home is at a specific location on Debian. + +@DPATCH@ +diff -urNad jruby-1.1.3~/bin/jruby jruby-1.1.3/bin/jruby +--- jruby-1.1.3~/bin/jruby 2008-08-12 18:47:43.000000000 -0700 ++++ jruby-1.1.3/bin/jruby 2008-08-12 19:28:18.000000000 -0700 +@@ -35,10 +35,10 @@ + done + + JRUBY_HOME_1=`dirname "$PRG"` # the ./bin dir +-JRUBY_HOME=`dirname "$JRUBY_HOME_1"` # the . dir ++JRUBY_HOME=/usr/lib/jruby1.1/ + # When . == bin and . is in path, need to make home be .. (JRUBY-2699) + #if [ $JRUBY_HOME = '.' ] ; then +-# JRUBY_HOME='..' ++# JRUBY_HOME=/usr/lib/jruby1.1/ + #fi + + if [ -z "$JRUBY_OPTS" ] ; then +@@ -193,7 +193,7 @@ + JAVA_OPTS="$JAVA_OPTS $JAVA_MEM $JAVA_STACK" + + if $cygwin; then +- JRUBY_HOME=`cygpath --mixed "$JRUBY_HOME"` ++ JRUBY_HOME=/usr/lib/jruby1.1/ + JRUBY_SHELL=`cygpath --mixed "$JRUBY_SHELL"` + + if [[ ( "${1:0:1}" = "/" ) && ( ( -f "$1" ) || ( -d "$1" )) ]]; then +diff -urNad jruby-1.1.3~/bin/jruby-ng jruby-1.1.3/bin/jruby-ng +--- jruby-1.1.3~/bin/jruby-ng 2008-07-20 11:32:34.000000000 -0700 ++++ jruby-1.1.3/bin/jruby-ng 2008-08-12 19:28:18.000000000 -0700 +@@ -30,14 +30,14 @@ + JRUBY_HOME_1=`dirname "$PRG"` # the ./bin dir + JRUBY_HOME_1=`dirname "$JRUBY_HOME_1"` # the . dir + if [ -d "${JRUBY_HOME_1}/lib" ] ; then +- JRUBY_HOME="${JRUBY_HOME_1}" ++ JRUBY_HOME=/usr/lib/jruby1.1/ + fi + + # ----- Execute The Requested Command ----------------------------------------- + + if $cygwin; then + JAVA_HOME=`cygpath --mixed "$JAVA_HOME"` +- JRUBY_HOME=`cygpath --mixed "$JRUBY_HOME"` ++ JRUBY_HOME=/usr/lib/jruby1.1/ + fi + + exec $JRUBY_HOME/tool/nailgun/ng org.jruby.util.NailMain $JRUBY_OPTS "$@" +diff -urNad jruby-1.1.3~/bin/jruby-ng-server jruby-1.1.3/bin/jruby-ng-server +--- jruby-1.1.3~/bin/jruby-ng-server 2008-07-20 11:32:34.000000000 -0700 ++++ jruby-1.1.3/bin/jruby-ng-server 2008-08-12 19:28:18.000000000 -0700 +@@ -38,7 +38,7 @@ + JRUBY_HOME_1=`dirname "$PRG"` # the ./bin dir + JRUBY_HOME_1=`dirname "$JRUBY_HOME_1"` # the . dir + if [ -d "${JRUBY_HOME_1}/lib" ] ; then +- JRUBY_HOME="${JRUBY_HOME_1}" ++ JRUBY_HOME=/usr/lib/jruby1.1/ + fi + + if [ -z "$JRUBY_OPTS" ] ; then +@@ -127,7 +127,7 @@ + + if $cygwin; then + JAVA_HOME=`cygpath --mixed "$JAVA_HOME"` +- JRUBY_HOME=`cygpath --mixed "$JRUBY_HOME"` ++ JRUBY_HOME=/usr/lib/jruby1.1/ + JRUBY_SHELL=`cygpath --mixed "$JRUBY_SHELL"` + fi + +diff -urNad jruby-1.1.3~/bin/jruby.rb jruby-1.1.3/bin/jruby.rb +--- jruby-1.1.3~/bin/jruby.rb 2008-08-12 18:47:43.000000000 -0700 ++++ jruby-1.1.3/bin/jruby.rb 2008-08-12 19:28:47.000000000 -0700 +@@ -64,7 +64,7 @@ + end + + bin_dir = File.dirname($0) +-jruby_home = File.dirname(bin_dir) ++jruby_home = '/usr/lib/jruby1.1' + + jruby_opts = ENV['JRUBY_OPTS'] + if jruby_opts.nil? --- jruby1.1-1.1.4.orig/debian/patches/02-drb-client-hang.dpatch +++ jruby1.1-1.1.4/debian/patches/02-drb-client-hang.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02-drb-client-hang.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fixes #572 + +@DPATCH@ +diff -urNad jruby-ut0.9-0.9.8/lib/ruby/1.8/drb/drb.rb /tmp/dpep.g2oRMf/jruby-ut0.9-0.9.8/lib/ruby/1.8/drb/drb.rb +--- jruby-ut0.9-0.9.8/lib/ruby/1.8/drb/drb.rb 2007-03-05 15:44:08.000000000 -0800 ++++ /tmp/dpep.g2oRMf/jruby-ut0.9-0.9.8/lib/ruby/1.8/drb/drb.rb 2007-03-22 16:39:19.000000000 -0700 +@@ -951,7 +951,7 @@ + # Check to see if this connection is alive. + def alive? + return false unless @socket +- if IO.select([@socket], nil, nil, 0) ++ if IO.select([@socket], nil, nil, 0.05) + close + return false + end