[DRE-commits] r4368 - in trunk/libruby2ruby-ruby/debian: . patches

[Tobias Grimm]

Author: tiber-guest
Date: 2009-11-22 18:17:42 +0000 (Sun, 22 Nov 2009)
New Revision: 4368

Added:
   trunk/libruby2ruby-ruby/debian/patches/10_do_not_requiere_rubygems.dpatch
Removed:
   trunk/libruby2ruby-ruby/debian/patches/10_correct-path-for-ruby-interpreter.dpatch
Modified:
   trunk/libruby2ruby-ruby/debian/changelog
   trunk/libruby2ruby-ruby/debian/control
   trunk/libruby2ruby-ruby/debian/patches/00list
Log:
Added 10_do_not_requiere_rubygems.dpatch

Modified: trunk/libruby2ruby-ruby/debian/changelog
===================================================================
--- trunk/libruby2ruby-ruby/debian/changelog	2009-11-22 18:06:12 UTC (rev 4367)
+++ trunk/libruby2ruby-ruby/debian/changelog	2009-11-22 18:17:42 UTC (rev 4368)
@@ -1,3 +1,9 @@
+libruby2ruby-ruby (1.2.4-2) UNRELEASED; urgency=low
+
+  * Added 10_do_not_requiere_rubygems.dpatch
+
+ -- Tobias Grimm <etobi at debian.org>  Sun, 22 Nov 2009 19:10:51 +0100
+
 libruby2ruby-ruby (1.2.4-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/libruby2ruby-ruby/debian/control
===================================================================
--- trunk/libruby2ruby-ruby/debian/control	2009-11-22 18:06:12 UTC (rev 4367)
+++ trunk/libruby2ruby-ruby/debian/control	2009-11-22 18:17:42 UTC (rev 4368)
@@ -2,6 +2,7 @@
 Section: ruby
 Priority: optional
 Maintainer: Sebastien Delafond <seb at debian.org>
+Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>, Tobias Grimm <etobi at debian.org>
 Build-Depends: debhelper (>= 6), dpatch, cdbs, ruby-pkg-tools, libsetup-ruby1.8
 Build-Depends-Indep: ruby1.8, ruby1.9
 Standards-Version: 3.8.3

Modified: trunk/libruby2ruby-ruby/debian/patches/00list
===================================================================
--- trunk/libruby2ruby-ruby/debian/patches/00list	2009-11-22 18:06:12 UTC (rev 4367)
+++ trunk/libruby2ruby-ruby/debian/patches/00list	2009-11-22 18:17:42 UTC (rev 4368)
@@ -1 +1,2 @@
-#10_correct-path-for-ruby-interpreter
+10_do_not_requiere_rubygems
+

Deleted: trunk/libruby2ruby-ruby/debian/patches/10_correct-path-for-ruby-interpreter.dpatch
===================================================================
--- trunk/libruby2ruby-ruby/debian/patches/10_correct-path-for-ruby-interpreter.dpatch	2009-11-22 18:06:12 UTC (rev 4367)
+++ trunk/libruby2ruby-ruby/debian/patches/10_correct-path-for-ruby-interpreter.dpatch	2009-11-22 18:17:42 UTC (rev 4368)
@@ -1,16 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_correct-path-for-ruby-interpreter.dpatch by Sebastien Delafond <seb at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Correct Ruby interpreter.
-
- at DPATCH@
-diff -urNad ruby2ruby-1.1.8~/bin/r2r_show ruby2ruby-1.1.8/bin/r2r_show
---- ruby2ruby-1.1.8~/bin/r2r_show	2007-12-22 14:56:38.000000000 -0800
-+++ ruby2ruby-1.1.8/bin/r2r_show	2008-05-11 10:26:40.000000000 -0700
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/ruby -ws
-+#!/usr/bin/ruby1.8 -ws
- 
- require 'rubygems'
- require 'ruby2ruby'

Added: trunk/libruby2ruby-ruby/debian/patches/10_do_not_requiere_rubygems.dpatch
===================================================================
--- trunk/libruby2ruby-ruby/debian/patches/10_do_not_requiere_rubygems.dpatch	                        (rev 0)
+++ trunk/libruby2ruby-ruby/debian/patches/10_do_not_requiere_rubygems.dpatch	2009-11-22 18:17:42 UTC (rev 4368)
@@ -0,0 +1,27 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_do_not_requiere_rubygems.dpatch by Tobias Grimm <etobi at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Do not require rubygems.
+
+ at DPATCH@
+diff -urNad libruby2ruby-ruby-1.2.4~/bin/r2r_show libruby2ruby-ruby-1.2.4/bin/r2r_show
+--- libruby2ruby-ruby-1.2.4~/bin/r2r_show	2009-08-01 01:40:39.000000000 +0200
++++ libruby2ruby-ruby-1.2.4/bin/r2r_show	2009-11-22 18:06:30.000000000 +0100
+@@ -1,6 +1,5 @@
+ #!/usr/bin/ruby -ws
+ 
+-require 'rubygems'
+ require 'ruby2ruby'
+ require 'ruby_parser'
+ 
+diff -urNad libruby2ruby-ruby-1.2.4~/lib/ruby2ruby.rb libruby2ruby-ruby-1.2.4/lib/ruby2ruby.rb
+--- libruby2ruby-ruby-1.2.4~/lib/ruby2ruby.rb	2009-08-14 10:19:59.000000000 +0200
++++ libruby2ruby-ruby-1.2.4/lib/ruby2ruby.rb	2009-11-22 18:06:45.000000000 +0100
+@@ -1,6 +1,5 @@
+ #!/usr/bin/env ruby -w
+ 
+-require 'rubygems'
+ require 'sexp_processor'
+ 
+ class Ruby2Ruby < SexpProcessor