[Pkg-cli-libs-commits] [SCM] ironruby branch, master, updated. debian/0.9.0+dfsg-1-45-gb5bd681

C.J. Adams-Collier cjac at colliertech.org
Sat Aug 8 20:19:19 UTC 2009


The following commit has been merged in the master branch:
commit 18c34f5b9d1c0b44fdc2aa9b9ec9ad163ff31ed1
Author: C.J. Adams-Collier <cjac at colliertech.org>
Date:   Sat Aug 8 13:27:58 2009 -0700

    * updated paths to scripts in copyright
    * updated paths to scripts in ironruby.install
    * updated uri in debian/watch

diff --git a/debian/copyright b/debian/copyright
index a8f9d30..a421cf5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -188,14 +188,14 @@ THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
 
 -------------------------------------------------------------------------------
 
-debian/scripts/ruby/igem
-debian/scripts/ruby/irake
-debian/scripts/ruby/irails
-debian/scripts/ruby/iri
-debian/scripts/ruby/iirb
-debian/scripts/ruby/irack
-debian/scripts/ruby/irdoc
-debian/scripts/ruby/ir
+Merlin/Main/Languages/Ruby/Scripts/bin/igem
+Merlin/Main/Languages/Ruby/Scripts/bin/iirb
+Merlin/Main/Languages/Ruby/Scripts/bin/ir
+Merlin/Main/Languages/Ruby/Scripts/bin/irackup
+Merlin/Main/Languages/Ruby/Scripts/bin/irails
+Merlin/Main/Languages/Ruby/Scripts/bin/irake
+Merlin/Main/Languages/Ruby/Scripts/bin/irdoc
+Merlin/Main/Languages/Ruby/Scripts/bin/iri
 
 Copyright (c) 2003 Dave Thomas
 Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich, and others.
diff --git a/debian/ironruby.install b/debian/ironruby.install
index 44341ab..1d7344c 100644
--- a/debian/ironruby.install
+++ b/debian/ironruby.install
@@ -2,5 +2,13 @@ Merlin/Main/Bin/Debug/*.dll* /usr/lib/ironruby
 Merlin/Main/Languages/Ruby/Libs /usr/lib/ironruby
 Merlin/Main/Bin/Debug/ir.exe* /usr/lib/ironruby
 debian/ir.exe.config /usr/lib/ironruby
-debian/scripts/ironruby/* /usr/bin
+Merlin/Main/Languages/Ruby/Scripts/bin/igem /usr/bin
+Merlin/Main/Languages/Ruby/Scripts/bin/iirb /usr/bin
+Merlin/Main/Languages/Ruby/Scripts/bin/ir /usr/bin
+Merlin/Main/Languages/Ruby/Scripts/bin/irackup /usr/bin
+Merlin/Main/Languages/Ruby/Scripts/bin/irails /usr/bin
+Merlin/Main/Languages/Ruby/Scripts/bin/irake /usr/bin
+Merlin/Main/Languages/Ruby/Scripts/bin/irdoc /usr/bin
+Merlin/Main/Languages/Ruby/Scripts/bin/iri /usr/bin
+
 
diff --git a/debian/scripts/ironruby/igem b/debian/scripts/ironruby/igem
deleted file mode 100644
index 9d1a0f5..0000000
--- a/debian/scripts/ironruby/igem
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env ir
-
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See http://www.ruby-lang.org/en/LICENSE.txt for permissions.
-#++
-
-require 'rubygems'
-require 'rubygems/gem_runner'
-require 'rubygems/exceptions'
-
-required_version = Gem::Requirement.new "> 1.8.3"
-
-unless required_version.satisfied_by? Gem.ruby_version then
-  abort "Expected Ruby Version #{required_version}, was #{Gem.ruby_version}"
-end
-
-# We need to preserve the original ARGV to use for passing gem options
-# to source gems.  If there is a -- in the line, strip all options after
-# it...its for the source building process.
-args = !ARGV.include?("--") ? ARGV.clone : ARGV[0...ARGV.index("--")]
-
-begin
-  Gem::GemRunner.new.run args
-rescue Gem::SystemExitException => e
-  exit e.exit_code
-end
\ No newline at end of file
diff --git a/debian/scripts/ironruby/iirb b/debian/scripts/ironruby/iirb
deleted file mode 100644
index 57644eb..0000000
--- a/debian/scripts/ironruby/iirb
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env ir
-#
-#   irb.rb - intaractive ruby
-#   	$Release Version: 0.9.5 $
-#   	$Revision: 11708 $
-#   	$Date: 2007-02-13 08:01:19 +0900 (Tue, 13 Feb 2007) $
-#   	by Keiju ISHITSUKA(keiju at ruby-lang.org)
-#
-
-require "irb"
-
-if __FILE__ == $0
-  IRB.start(__FILE__)
-else
-  # check -e option
-  if /^-e$/ =~ $0
-    IRB.start(__FILE__)
-  else
-    IRB.setup(__FILE__)
-  end
-end
diff --git a/debian/scripts/ironruby/ir b/debian/scripts/ironruby/ir
deleted file mode 100644
index 25a39c9..0000000
--- a/debian/scripts/ironruby/ir
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/mono /usr/lib/ironruby/ir.exe "$@"
diff --git a/debian/scripts/ironruby/irackup b/debian/scripts/ironruby/irackup
deleted file mode 100644
index c84b6c0..0000000
--- a/debian/scripts/ironruby/irackup
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env ir
-#
-# This file was generated by RubyGems.
-#
-# The application 'rack' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'rubygems'
-
-version = ">= 0"
-
-if ARGV.first =~ /^_(.*)_$/ and Gem::Version.correct? $1 then
-  version = $1
-  ARGV.shift
-end
-
-gem 'rack', version
-load 'rackup'
diff --git a/debian/scripts/ironruby/irails b/debian/scripts/ironruby/irails
deleted file mode 100644
index 72e3492..0000000
--- a/debian/scripts/ironruby/irails
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env ir
-#
-# This file was generated by RubyGems.
-#
-# The application 'rails' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'rubygems'
-
-version = ">= 0"
-
-if ARGV.first =~ /^_(.*)_$/ and Gem::Version.correct? $1 then
-  version = $1
-  ARGV.shift
-end
-
-gem 'rails', version
-load 'rails'
diff --git a/debian/scripts/ironruby/irake b/debian/scripts/ironruby/irake
deleted file mode 100644
index d202f4b..0000000
--- a/debian/scripts/ironruby/irake
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env ir
-#
-# This file was generated by RubyGems.
-#
-# The application 'rake' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-# work-around Method#to_proc
-# http://ironruby.codeplex.com/WorkItem/View.aspx?WorkItemId=727
-require 'hacks'
-
-require 'rubygems'
-
-version = ">= 0"
-
-if ARGV.first =~ /^_(.*)_$/ and Gem::Version.correct? $1 then
-  version = $1
-  ARGV.shift
-end
-
-gem 'rake', version
-load 'rake'
diff --git a/debian/scripts/ironruby/irdoc b/debian/scripts/ironruby/irdoc
deleted file mode 100644
index 3d5be91..0000000
--- a/debian/scripts/ironruby/irdoc
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/usr/bin/env ir
-#  RDoc: Documentation tool for source code
-#        (see lib/rdoc/rdoc.rb for more information)
-#
-#  Copyright (c) 2003 Dave Thomas
-#  Released under the same terms as Ruby
-#
-#  $Revision: 11708 $
-
-## Transitional Hack ####
-#
-#  RDoc was initially distributed independently, and installed
-#  itself into <prefix>/lib/ruby/site_ruby/<ver>/rdoc...
-#
-#  Now that RDoc is part of the distribution, it's installed into
-#  <prefix>/lib/ruby/<ver>, which unfortunately appears later in the
-#  search path. This means that if you have previously installed RDoc,
-#  and then install from ruby-lang, you'll pick up the old one by
-#  default. This hack checks for the condition, and readjusts the
-#  search path if necessary.
-
-def adjust_for_existing_rdoc(path)
-  
-  $stderr.puts %{
-  It seems as if you have a previously-installed RDoc in
-  the directory #{path}.
-
-  Because this is now out-of-date, you might want to consider
-  removing the directories:
-
-    #{File.join(path, "rdoc")}
-
-  and
-
-    #{File.join(path, "markup")}
-
-  }
-
-  # Move all the site_ruby directories to the end
-  p $:
-  $:.replace($:.partition {|path| /site_ruby/ !~ path}.flatten)
-  p $:
-end
-
-$:.each do |path|
-  if /site_ruby/ =~ path 
-    rdoc_path = File.join(path, 'rdoc', 'rdoc.rb')
-    if File.exists?(rdoc_path)
-      adjust_for_existing_rdoc(path)
-      break
-    end
-  end
-end
-
-## End of Transitional Hack ##
-
-
-require 'rdoc/rdoc'
-
-begin
-  r = RDoc::RDoc.new
-  r.document(ARGV)
-rescue RDoc::RDocError => e
-  $stderr.puts e.message
-  exit(1)
-end
diff --git a/debian/scripts/ironruby/iri b/debian/scripts/ironruby/iri
deleted file mode 100644
index f6d3580..0000000
--- a/debian/scripts/ironruby/iri
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/env ir
-# usage:
-#
-#   ri  name...
-#
-# where name can be 
-#
-#   Class | Class::method | Class#method | Class.method | method
-#
-# All names may be abbreviated to their minimum unbiguous form. If a name
-# _is_ ambiguous, all valid options will be listed.
-#
-# The form '.' method matches either class or instance methods, while 
-# #method matches only instance and ::method matches only class methods.
-#
-#
-# == Installing Documentation
-#
-# 'ri' uses a database of documentation built by the RDoc utility.
-# 
-# So, how do you install this documentation on your system?
-# It depends on how you installed Ruby.
-#
-# <em>If you installed Ruby from source files</em> (that is, if it some point
-# you typed 'make' during the process :), you can install the RDoc
-# documentation yourself. Just go back to the place where you have 
-# your Ruby source and type
-#
-#    make install-doc
-#
-# You'll probably need to do this as a superuser, as the documentation
-# is installed in the Ruby target tree (normally somewhere under 
-# <tt>/usr/local</tt>.
-#
-# <em>If you installed Ruby from a binary distribution</em> (perhaps
-# using a one-click installer, or using some other packaging system),
-# then the team that produced the package probably forgot to package
-# the documentation as well. Contact them, and see if they can add
-# it to the next release.
-#
-
-
-require 'rdoc/ri/ri_driver'
-
-######################################################################
-
-ri = RiDriver.new
-ri.process_args
diff --git a/debian/watch b/debian/watch
index cae89db..d0542f9 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
 version=3
 http://dlrci.colliertech.org/source/ironruby-([\d\.]+)\.tar\.gz debian uupdate
+http://githubredir.debian.net/github/mletterle/ironruby/(\d{8}\+git\.[\da-f]{8})\.tar\.gz

-- 
ironruby



More information about the Pkg-cli-libs-commits mailing list