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

[Daigo Moriwaki]

Author: daigo
Date: 2010-04-08 13:00:12 +0000 (Thu, 08 Apr 2010)
New Revision: 5047

Added:
   trunk/libgems-ruby/debian/patches/20100408-version_requirements-r2459.dpatch
Modified:
   trunk/libgems-ruby/debian/changelog
   trunk/libgems-ruby/debian/patches/00list
Log:
Added a patch: debian/patches/20100408-version_requirements-r2459.dpatch
fixing an undefined method error (version_requirements=), which is a
backport from the upstream r2459. Thanks to Jeremy Lal.
(Closes: #576870)

Modified: trunk/libgems-ruby/debian/changelog
===================================================================
--- trunk/libgems-ruby/debian/changelog	2010-04-08 12:47:23 UTC (rev 5046)
+++ trunk/libgems-ruby/debian/changelog	2010-04-08 13:00:12 UTC (rev 5047)
@@ -1,8 +1,11 @@
-libgems-ruby (1.3.6-2) UNRELEASED; urgency=low
+libgems-ruby (1.3.6-2) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Added a patch: debian/patches/20100408-version_requirements-r2459.dpatch
+    fixing an undefined method error (version_requirements=), which is a
+    backport from the upstream r2459. Thanks to Jeremy Lal.
+    (Closes: #576870)
 
- -- Daigo Moriwaki <daigo at debian.org>  Thu, 08 Apr 2010 21:47:01 +0900
+ -- Daigo Moriwaki <daigo at debian.org>  Thu, 08 Apr 2010 21:54:01 +0900
 
 libgems-ruby (1.3.6-1) unstable; urgency=low
 

Modified: trunk/libgems-ruby/debian/patches/00list
===================================================================
--- trunk/libgems-ruby/debian/patches/00list	2010-04-08 12:47:23 UTC (rev 5046)
+++ trunk/libgems-ruby/debian/patches/00list	2010-04-08 13:00:12 UTC (rev 5047)
@@ -3,3 +3,4 @@
 08_tighter_search_regex.dpatch
 #05_gem_commands.dpatch
 #09_installer.dpatch 
+20100408-version_requirements-r2459.dpatch

Added: trunk/libgems-ruby/debian/patches/20100408-version_requirements-r2459.dpatch
===================================================================
--- trunk/libgems-ruby/debian/patches/20100408-version_requirements-r2459.dpatch	                        (rev 0)
+++ trunk/libgems-ruby/debian/patches/20100408-version_requirements-r2459.dpatch	2010-04-08 13:00:12 UTC (rev 5047)
@@ -0,0 +1,70 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20100408-version_requirements-r2459.dpatch by Daigo Moriwaki <daigo at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixed an undefined method error (version_requirements=), a backport
+## DP: from the upstream r2459.
+
+
+ at DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' libgems-ruby~/lib/rubygems/dependency.rb libgems-ruby/lib/rubygems/dependency.rb
+--- libgems-ruby~/lib/rubygems/dependency.rb	2010-02-12 12:13:35.000000000 +0900
++++ libgems-ruby/lib/rubygems/dependency.rb	2010-04-08 21:51:29.000000000 +0900
+@@ -69,9 +69,6 @@
+   end
+ 
+   ##
+-  # What does this dependency require?
+-
+-  ##
+   # A dependency's hash is the XOR of the hashes of +name+, +type+,
+   # and +requirement+.
+ 
+@@ -106,6 +103,9 @@
+     end
+   end
+ 
++  ##
++  # What does this dependency require?
++
+   def requirement
+     return @requirement if defined?(@requirement) and @requirement
+ 
+@@ -160,7 +160,16 @@
+     __requirement
+   end
+ 
+-  alias_method :version_requirement, :version_requirements
++  alias version_requirement version_requirements # :nodoc:
++
++  def version_requirements= requirements # :nodoc:
++    warn "#{Gem.location_of_caller.join ':'}:Warning: " \
++         "Gem::Dependency#version_requirements= is deprecated " \
++         "and will be removed on or after August 2010.  " \
++         "Use Gem::Dependency.new."
++
++    @requirement = Gem::Requirement.create requirements
++  end
+ 
+   def == other # :nodoc:
+     Gem::Dependency === other &&
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' libgems-ruby~/test/test_gem_dependency.rb libgems-ruby/test/test_gem_dependency.rb
+--- libgems-ruby~/test/test_gem_dependency.rb	2010-02-11 04:48:13.000000000 +0900
++++ libgems-ruby/test/test_gem_dependency.rb	2010-04-08 21:51:29.000000000 +0900
+@@ -134,5 +134,16 @@
+     assert d.prerelease?
+   end
+ 
++  def test_version_requirements_equals_deprecated
++    d = dep "pkg", "1.0"
++
++    out, err = capture_io do
++      d.version_requirements = '2.0'
++      assert_equal Gem::Requirement.new(%w[2.0]), d.requirement
++    end
++
++    assert_match %r%deprecated%, err
++  end
++
+ end
+ 


Property changes on: trunk/libgems-ruby/debian/patches/20100408-version_requirements-r2459.dpatch
___________________________________________________________________
Added: svn:executable
   + *