[Pkg-cli-libs-commits] [SCM] ironruby branch, master, updated. debian/20090805+git.e6b28d27+dfsg-1-6-g21fb5d1

[C.J. Adams-Collier]

The following commit has been merged in the master branch:
commit 21fb5d17e870aa9c6faa85a36f87d035e87f5dde
Author: C.J. Adams-Collier <cjac at colliertech.org>
Date:   Mon Feb 1 13:04:31 2010 -0800

    moved irake and irdoc into the ironruby-util package
    * ironruby-util depend on rake and rdoc
    changed the irake wrapper script to use the rake from the path rather than fetching it with igem

diff --git a/debian/control b/debian/control
index b54bb14..09d32d0 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,6 @@ Package: ironruby
 Section: ruby
 Architecture: all
 Depends: ${cli:Depends}, ${misc:Depends}
-Suggests: rdoc
 Homepage: http://www.ironruby.net/
 Description: Ruby implementation targeting the .NET and Mono platforms
  IronRuby is an implementation of the Ruby programming language
@@ -29,6 +28,14 @@ Description: Ruby implementation targeting the .NET and Mono platforms
  programmers, while maintaining full compatibility with the Ruby
  language.
 
+Package: ironruby-utils
+Section: ruby
+Architecture: all
+Depends: ${cli:Depends}, ${misc:Depends}, rdoc, ironruby, rake
+Homepage: http://www.ironruby.net/
+Description: Utility tools for IronRuby
+ Utilities distributed with IronRuby
+
 Package: ironruby-dbg
 Priority: extra
 Section: debug
diff --git a/debian/irake b/debian/irake
new file mode 100755
index 0000000..e3d8fec
--- /dev/null
+++ b/debian/irake
@@ -0,0 +1,4 @@
+#!/usr/bin/env ir
+
+require 'rake'
+Rake.application.run
diff --git a/debian/ironruby-utils.install b/debian/ironruby-utils.install
new file mode 100644
index 0000000..1d5fd77
--- /dev/null
+++ b/debian/ironruby-utils.install
@@ -0,0 +1,2 @@
+debian/irails /usr/bin
+Merlin/Main/Languages/Ruby/Scripts/bin/irdoc /usr/bin
diff --git a/debian/ironruby.install b/debian/ironruby.install
index e00818d..2fe3f91 100644
--- a/debian/ironruby.install
+++ b/debian/ironruby.install
@@ -7,7 +7,5 @@ debian/ir.exe.config /usr/lib/ironruby
 Merlin/Main/Languages/Ruby/Scripts/bin/igem /usr/bin
 Merlin/Main/Languages/Ruby/Scripts/bin/iirb /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/rules b/debian/rules
index 9512b60..5922767 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,7 +45,6 @@ override_dh_clean: unpatch
 		-o -iname '*.mdb' \
 		-o -iname '*.resources' \) -delete
 	rm -f Merlin/Main/Languages/IronPython/IronPython.sln.proj
-	rm -f Merlin/Main/Languages/IronPython/Scripts/ipy*
 	rm -f Merlin/Main/Languages/Ruby/Ruby.sln.proj
 	dh_clean
 
@@ -60,6 +59,7 @@ override_dh_gencontrol:
 	dh_gencontrol -p libdlr0.9-cil
 	dh_gencontrol -p ironruby \
 	              -p ironruby-dbg \
+	              -p ironruby-utils \
 	              -- -v$(IRONRUBY_VERSION) -Vironruby:Version=$(IRONRUBY_VERSION)
 	dh_gencontrol -p ironpython \
 	              -p ironpython-dbg \
@@ -93,6 +93,8 @@ get-orig-source:
 	rm $(DEB_SOURCE_NAME)_$(VERSION).orig.tar.gz
 	# Remove gems
 	rm -rf $(TARBALL_DIR)/Merlin/External.LCA_RESTRICTED/Languages/Ruby
+	# Remove wrapper scripts
+	rm -f $(TARBALL_DIR)/Merlin/Main/Languages/IronPython/Scripts/ipy*
 	# remove binaries
 	find  $(TARBALL_DIR) \
 		\( -iname '*.exe' \

-- 
ironruby