[DRE-commits] r3619 - in packages/libgems-ruby/trunk/debian: . patches

[Daigo Moriwaki]

Author: daigo
Date: 2009-06-14 08:47:29 +0000 (Sun, 14 Jun 2009)
New Revision: 3619

Modified:
   packages/libgems-ruby/trunk/debian/changelog
   packages/libgems-ruby/trunk/debian/patches/01_default_gem_path.dpatch
Log:
New upstream release.

Modified: packages/libgems-ruby/trunk/debian/changelog
===================================================================
--- packages/libgems-ruby/trunk/debian/changelog	2009-06-14 08:34:00 UTC (rev 3618)
+++ packages/libgems-ruby/trunk/debian/changelog	2009-06-14 08:47:29 UTC (rev 3619)
@@ -1,6 +1,6 @@
 libgems-ruby (1.3.4-1) unstable; urgency=low
 
-  * (NOT RELEASED YET) New upstream release
+  * New upstream release.
 
  -- Daigo Moriwaki <daigo at debian.org>  Sun, 14 Jun 2009 17:33:44 +0900
 

Modified: packages/libgems-ruby/trunk/debian/patches/01_default_gem_path.dpatch
===================================================================
--- packages/libgems-ruby/trunk/debian/patches/01_default_gem_path.dpatch	2009-06-14 08:34:00 UTC (rev 3618)
+++ packages/libgems-ruby/trunk/debian/patches/01_default_gem_path.dpatch	2009-06-14 08:47:29 UTC (rev 3619)
@@ -6,9 +6,9 @@
 
 @DPATCH@
 diff -urNad trunk~/lib/rubygems/defaults.rb trunk/lib/rubygems/defaults.rb
---- trunk~/lib/rubygems/defaults.rb	2009-04-07 07:30:48.000000000 +0900
-+++ trunk/lib/rubygems/defaults.rb	2009-04-27 10:09:00.000000000 +0900
-@@ -15,18 +15,15 @@
+--- trunk~/lib/rubygems/defaults.rb	2009-05-21 08:30:35.000000000 +0900
++++ trunk/lib/rubygems/defaults.rb	2009-06-14 17:39:17.000000000 +0900
+@@ -15,19 +15,15 @@
    ##
    # Default home directory path to be used if an alternate value is not
    # specified in the environment
@@ -23,7 +23,8 @@
 -    if defined? RUBY_FRAMEWORK_VERSION then
 -      File.join File.dirname(ConfigMap[:sitedir]), 'Gems',
 -                ConfigMap[:ruby_version]
--    elsif RUBY_VERSION > '1.9' then
+-    # 1.9.2dev reverted to 1.8 style path
+-    elsif RUBY_VERSION > '1.9' and RUBY_VERSION < '1.9.2' then
 -      File.join(ConfigMap[:libdir], ConfigMap[:ruby_install_name], 'gems',
 -                ConfigMap[:ruby_version])
 -    else
@@ -34,7 +35,7 @@
    end
  
    ##
-@@ -64,13 +61,11 @@
+@@ -65,13 +61,11 @@
  
    ##
    # The default directory for binaries