[DRE-commits] r5691 - in trunk/libgems-ruby/debian: . patches source
Daigo Moriwaki
daigo at alioth.debian.org
Mon Jul 19 10:11:06 UTC 2010
Author: daigo
Date: 2010-07-19 10:11:00 +0000 (Mon, 19 Jul 2010)
New Revision: 5691
Added:
trunk/libgems-ruby/debian/patches/01_default_gem_path.diff
trunk/libgems-ruby/debian/patches/03_disable_update_system.diff
trunk/libgems-ruby/debian/patches/08_tighter_search_regex.diff
trunk/libgems-ruby/debian/patches/20100408-version_requirements-r2459.diff
trunk/libgems-ruby/debian/patches/series
trunk/libgems-ruby/debian/source/
trunk/libgems-ruby/debian/source/format
Removed:
trunk/libgems-ruby/debian/patches/00list
trunk/libgems-ruby/debian/patches/01_default_gem_path.dpatch
trunk/libgems-ruby/debian/patches/03_disable_update_system.dpatch
trunk/libgems-ruby/debian/patches/05_gem_commands.dpatch
trunk/libgems-ruby/debian/patches/08_tighter_search_regex.dpatch
trunk/libgems-ruby/debian/patches/09_installer.dpatch
trunk/libgems-ruby/debian/patches/20100408-version_requirements-r2459.dpatch
Modified:
trunk/libgems-ruby/debian/changelog
trunk/libgems-ruby/debian/control
trunk/libgems-ruby/debian/rules
Log:
Converted dpatch to quilt.
Modified: trunk/libgems-ruby/debian/changelog
===================================================================
--- trunk/libgems-ruby/debian/changelog 2010-07-19 09:53:53 UTC (rev 5690)
+++ trunk/libgems-ruby/debian/changelog 2010-07-19 10:11:00 UTC (rev 5691)
@@ -7,6 +7,7 @@
[ Daigo Moriwaki ]
* New upstream release. (Closes: #589511)
+ * Converted dpatch to quilt.
-- Daigo Moriwaki <daigo at debian.org> Mon, 19 Jul 2010 18:45:43 +0900
Modified: trunk/libgems-ruby/debian/control
===================================================================
--- trunk/libgems-ruby/debian/control 2010-07-19 09:53:53 UTC (rev 5690)
+++ trunk/libgems-ruby/debian/control 2010-07-19 10:11:00 UTC (rev 5691)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Daigo Moriwaki <daigo at debian.org>
Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Build-Depends: cdbs, dpatch (>= 2.0.10), debhelper (>= 7.0.0), ruby1.8, ruby1.9.1, ruby-pkg-tools
+Build-Depends: cdbs, quilt (>= 0.40), debhelper (>= 7.0.0), ruby1.8, ruby1.9.1, ruby-pkg-tools
Standards-Version: 3.8.4
Homepage: http://rubygems.org/
Vcs-Svn: svn://svn.debian.org/svn/pkg-ruby-extras/trunk/libgems-ruby/
Deleted: trunk/libgems-ruby/debian/patches/00list
===================================================================
--- trunk/libgems-ruby/debian/patches/00list 2010-07-19 09:53:53 UTC (rev 5690)
+++ trunk/libgems-ruby/debian/patches/00list 2010-07-19 10:11:00 UTC (rev 5691)
@@ -1,6 +0,0 @@
-01_default_gem_path.dpatch
-03_disable_update_system.dpatch
-08_tighter_search_regex.dpatch
-#05_gem_commands.dpatch
-#09_installer.dpatch
-20100408-version_requirements-r2459.dpatch
Added: trunk/libgems-ruby/debian/patches/01_default_gem_path.diff
===================================================================
--- trunk/libgems-ruby/debian/patches/01_default_gem_path.diff (rev 0)
+++ trunk/libgems-ruby/debian/patches/01_default_gem_path.diff 2010-07-19 10:11:00 UTC (rev 5691)
@@ -0,0 +1,54 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_default_gem_path.dpatch by James Healy <jimmy at deefa.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Changes the default gem dir from inside the ruby lib to /var/lib/gems/{ruby version}
+
+ at DPATCH@
+diff -urNad trunk~/lib/rubygems/defaults.rb trunk/lib/rubygems/defaults.rb
+--- 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
++ #
++ # Debian patch: search order of this directory.
++ # 1. GEM_HOME enviroment variable
++ # (Using this, Gems are to be installed in any path as you like)
++ # 2. /var/lib/gems/{ruby version} (This is the default path in Debian system)
++ #
+
+ def self.default_dir
+- if defined? RUBY_FRAMEWORK_VERSION then
+- File.join File.dirname(ConfigMap[:sitedir]), 'Gems',
+- ConfigMap[:ruby_version]
+- # 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
+- File.join(ConfigMap[:libdir], ruby_engine, 'gems',
+- ConfigMap[:ruby_version])
+- end
++ File.join('/', 'var', 'lib', 'gems', ConfigMap[:ruby_version])
+ end
+
+ ##
+@@ -65,13 +61,11 @@
+
+ ##
+ # The default directory for binaries
++ # Debian patch:
++ # /var/lib/gems/{ruby version}/bin is the default path in Debian system
+
+ def self.default_bindir
+- if defined? RUBY_FRAMEWORK_VERSION then # mac framework support
+- '/usr/bin'
+- else # generic install
+- ConfigMap[:bindir]
+- end
++ File.join('/', 'var', 'lib', 'gems', ConfigMap[:ruby_version], 'bin')
+ end
+
+ ##
Property changes on: trunk/libgems-ruby/debian/patches/01_default_gem_path.diff
___________________________________________________________________
Added: svn:executable
+ *
Deleted: trunk/libgems-ruby/debian/patches/01_default_gem_path.dpatch
===================================================================
--- trunk/libgems-ruby/debian/patches/01_default_gem_path.dpatch 2010-07-19 09:53:53 UTC (rev 5690)
+++ trunk/libgems-ruby/debian/patches/01_default_gem_path.dpatch 2010-07-19 10:11:00 UTC (rev 5691)
@@ -1,54 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_default_gem_path.dpatch by James Healy <jimmy at deefa.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Changes the default gem dir from inside the ruby lib to /var/lib/gems/{ruby version}
-
- at DPATCH@
-diff -urNad trunk~/lib/rubygems/defaults.rb trunk/lib/rubygems/defaults.rb
---- 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
-+ #
-+ # Debian patch: search order of this directory.
-+ # 1. GEM_HOME enviroment variable
-+ # (Using this, Gems are to be installed in any path as you like)
-+ # 2. /var/lib/gems/{ruby version} (This is the default path in Debian system)
-+ #
-
- def self.default_dir
-- if defined? RUBY_FRAMEWORK_VERSION then
-- File.join File.dirname(ConfigMap[:sitedir]), 'Gems',
-- ConfigMap[:ruby_version]
-- # 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
-- File.join(ConfigMap[:libdir], ruby_engine, 'gems',
-- ConfigMap[:ruby_version])
-- end
-+ File.join('/', 'var', 'lib', 'gems', ConfigMap[:ruby_version])
- end
-
- ##
-@@ -65,13 +61,11 @@
-
- ##
- # The default directory for binaries
-+ # Debian patch:
-+ # /var/lib/gems/{ruby version}/bin is the default path in Debian system
-
- def self.default_bindir
-- if defined? RUBY_FRAMEWORK_VERSION then # mac framework support
-- '/usr/bin'
-- else # generic install
-- ConfigMap[:bindir]
-- end
-+ File.join('/', 'var', 'lib', 'gems', ConfigMap[:ruby_version], 'bin')
- end
-
- ##
Added: trunk/libgems-ruby/debian/patches/03_disable_update_system.diff
===================================================================
--- trunk/libgems-ruby/debian/patches/03_disable_update_system.diff (rev 0)
+++ trunk/libgems-ruby/debian/patches/03_disable_update_system.diff 2010-07-19 10:11:00 UTC (rev 5691)
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_disable_update_system.dpatch by James Healy <jimmy at deefa.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Disable gem update --system functionality, as it can break things. Users should use apt instead
+
+ at DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' libgems-ruby~/lib/rubygems/commands/update_command.rb libgems-ruby/lib/rubygems/commands/update_command.rb
+--- libgems-ruby~/lib/rubygems/commands/update_command.rb 2010-02-09 14:58:24.000000000 +0900
++++ libgems-ruby/lib/rubygems/commands/update_command.rb 2010-04-07 19:34:33.000000000 +0900
+@@ -48,18 +48,7 @@
+ hig = {}
+
+ if options[:system] then
+- say "Updating RubyGems"
+-
+- unless options[:args].empty? then
+- raise "No gem names are allowed with the --system option"
+- end
+-
+- rubygems_update = Gem::Specification.new
+- rubygems_update.name = 'rubygems-update'
+- rubygems_update.version = Gem::Version.new Gem::RubyGemsVersion
+- hig['rubygems-update'] = rubygems_update
+-
+- options[:user_install] = false
++ fail "gem update --system is disabled on Debian. RubyGems can be updated using the official Debian repositories by aptitude or apt-get."
+ else
+ say "Updating installed gems"
+
Property changes on: trunk/libgems-ruby/debian/patches/03_disable_update_system.diff
___________________________________________________________________
Added: svn:executable
+ *
Deleted: trunk/libgems-ruby/debian/patches/03_disable_update_system.dpatch
===================================================================
--- trunk/libgems-ruby/debian/patches/03_disable_update_system.dpatch 2010-07-19 09:53:53 UTC (rev 5690)
+++ trunk/libgems-ruby/debian/patches/03_disable_update_system.dpatch 2010-07-19 10:11:00 UTC (rev 5691)
@@ -1,30 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_disable_update_system.dpatch by James Healy <jimmy at deefa.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Disable gem update --system functionality, as it can break things. Users should use apt instead
-
- at DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' libgems-ruby~/lib/rubygems/commands/update_command.rb libgems-ruby/lib/rubygems/commands/update_command.rb
---- libgems-ruby~/lib/rubygems/commands/update_command.rb 2010-02-09 14:58:24.000000000 +0900
-+++ libgems-ruby/lib/rubygems/commands/update_command.rb 2010-04-07 19:34:33.000000000 +0900
-@@ -48,18 +48,7 @@
- hig = {}
-
- if options[:system] then
-- say "Updating RubyGems"
--
-- unless options[:args].empty? then
-- raise "No gem names are allowed with the --system option"
-- end
--
-- rubygems_update = Gem::Specification.new
-- rubygems_update.name = 'rubygems-update'
-- rubygems_update.version = Gem::Version.new Gem::RubyGemsVersion
-- hig['rubygems-update'] = rubygems_update
--
-- options[:user_install] = false
-+ fail "gem update --system is disabled on Debian. RubyGems can be updated using the official Debian repositories by aptitude or apt-get."
- else
- say "Updating installed gems"
-
Deleted: trunk/libgems-ruby/debian/patches/05_gem_commands.dpatch
===================================================================
--- trunk/libgems-ruby/debian/patches/05_gem_commands.dpatch 2010-07-19 09:53:53 UTC (rev 5690)
+++ trunk/libgems-ruby/debian/patches/05_gem_commands.dpatch 2010-07-19 10:11:00 UTC (rev 5691)
@@ -1,28 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_gem_commands.dpatch by <daigo at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: New patch generated from libgems-ruby 0.8.10-1 diff.gz
-
- at DPATCH@
-
---- libgems-ruby-0.9.0.orig/lib/rubygems/gem_commands.rb
-+++ libgems-ruby-0.9.0/lib/rubygems/gem_commands.rb
-@@ -1,4 +1,3 @@
--#!/usr/bin/env ruby
- #--
- # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
- # All rights reserved.
-@@ -97,6 +96,12 @@
- options[:install_dir] = File.expand_path(value)
- end
-
-+ add_option('-B', '--build-root DIR',
-+ 'Temporary installation root. Useful for building packages.') do
-+ |value, options|
-+ options[:build_root] = File.expand_path(value)
-+ end
-+
- add_option('-d', '--[no-]rdoc',
- 'Generate RDoc documentation for the gem on install') do
- |value, options|
Added: trunk/libgems-ruby/debian/patches/08_tighter_search_regex.diff
===================================================================
--- trunk/libgems-ruby/debian/patches/08_tighter_search_regex.diff (rev 0)
+++ trunk/libgems-ruby/debian/patches/08_tighter_search_regex.diff 2010-07-19 10:11:00 UTC (rev 5691)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 08_tighter_search_regex.dpatch by Daigo Moriwaki <daigo at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Included at 0.8.11-2
+
+ at DPATCH@
+diff -urNad trunk~/lib/rubygems/source_index.rb trunk/lib/rubygems/source_index.rb
+--- trunk~/lib/rubygems/source_index.rb 2008-04-05 08:06:49.000000000 +0900
++++ trunk/lib/rubygems/source_index.rb 2008-05-10 15:40:39.000000000 +0900
+@@ -248,7 +248,7 @@
+ end
+ else
+ version_requirement = platform_only || Gem::Requirement.default
+- gem_pattern = /#{gem_pattern}/i
++ gem_pattern = /^#{gem_pattern}/i
+ end
+
+ unless Gem::Requirement === version_requirement then
Property changes on: trunk/libgems-ruby/debian/patches/08_tighter_search_regex.diff
___________________________________________________________________
Added: svn:executable
+ *
Deleted: trunk/libgems-ruby/debian/patches/08_tighter_search_regex.dpatch
===================================================================
--- trunk/libgems-ruby/debian/patches/08_tighter_search_regex.dpatch 2010-07-19 09:53:53 UTC (rev 5690)
+++ trunk/libgems-ruby/debian/patches/08_tighter_search_regex.dpatch 2010-07-19 10:11:00 UTC (rev 5691)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 08_tighter_search_regex.dpatch by Daigo Moriwaki <daigo at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Included at 0.8.11-2
-
- at DPATCH@
-diff -urNad trunk~/lib/rubygems/source_index.rb trunk/lib/rubygems/source_index.rb
---- trunk~/lib/rubygems/source_index.rb 2008-04-05 08:06:49.000000000 +0900
-+++ trunk/lib/rubygems/source_index.rb 2008-05-10 15:40:39.000000000 +0900
-@@ -248,7 +248,7 @@
- end
- else
- version_requirement = platform_only || Gem::Requirement.default
-- gem_pattern = /#{gem_pattern}/i
-+ gem_pattern = /^#{gem_pattern}/i
- end
-
- unless Gem::Requirement === version_requirement then
Deleted: trunk/libgems-ruby/debian/patches/09_installer.dpatch
===================================================================
--- trunk/libgems-ruby/debian/patches/09_installer.dpatch 2010-07-19 09:53:53 UTC (rev 5690)
+++ trunk/libgems-ruby/debian/patches/09_installer.dpatch 2010-07-19 10:11:00 UTC (rev 5691)
@@ -1,60 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 09_installer.dpatch by Daigo Moriwaki <daigo at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad trunk~/lib/rubygems/installer.rb trunk/lib/rubygems/installer.rb
---- trunk~/lib/rubygems/installer.rb 2007-05-11 04:01:45.000000000 +0900
-+++ trunk/lib/rubygems/installer.rb 2007-05-27 08:51:33.000000000 +0900
-@@ -84,6 +84,14 @@
- end
- end
-
-+ if @options[:build_root]
-+ build_root = @options[:build_root]
-+ FileUtils.mkdir_p build_root
-+ raise Gem::FilePermissionError.new(build_root) unless File.writable?(build_root)
-+ install_dir = build_root + install_dir
-+ FileUtils.mkdir_p install_dir
-+ end
-+
- raise Gem::FilePermissionError.new(Pathname.new(install_dir).expand_path) unless File.writable?(install_dir)
-
- # Build spec dir.
-@@ -393,6 +401,7 @@
- #
- def initialize(gem, options)
- @gem = gem
-+ @options = options
- @version = options[:version] || "> 0"
- @force_executables = options[:executables]
- @force_all = options[:all]
-@@ -447,8 +456,13 @@
- def remove_executables(gemspec)
- return if gemspec.nil?
- if(gemspec.executables.size > 0)
-- raise Gem::FilePermissionError.new(Gem.bindir) unless
-- File.writable?(Gem.bindir)
-+ bindir = Gem.bindir
-+ if @options[:build_root]
-+ install_dir = File.join(@options[:build_root], Gem.dir)
-+ bindir = Gem.bindir(install_dir)
-+ end
-+ raise Gem::FilePermissionError.new(bindir) unless
-+ File.writable?(bindir)
- list = Gem.source_index.search(gemspec.name).delete_if { |spec|
- spec.version == gemspec.version
- }
-@@ -469,8 +483,8 @@
- else
- gemspec.executables.each do |exe_name|
- say "Removing #{exe_name}"
-- File.unlink File.join(Gem.bindir, exe_name) rescue nil
-- File.unlink File.join(Gem.bindir, exe_name + ".cmd") rescue nil
-+ File.unlink File.join(bindir, exe_name) rescue nil
-+ File.unlink File.join(bindir, exe_name + ".cmd") rescue nil
- end
- end
- end
Added: trunk/libgems-ruby/debian/patches/20100408-version_requirements-r2459.diff
===================================================================
--- trunk/libgems-ruby/debian/patches/20100408-version_requirements-r2459.diff (rev 0)
+++ trunk/libgems-ruby/debian/patches/20100408-version_requirements-r2459.diff 2010-07-19 10:11:00 UTC (rev 5691)
@@ -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.diff
___________________________________________________________________
Added: svn:executable
+ *
Deleted: trunk/libgems-ruby/debian/patches/20100408-version_requirements-r2459.dpatch
===================================================================
--- trunk/libgems-ruby/debian/patches/20100408-version_requirements-r2459.dpatch 2010-07-19 09:53:53 UTC (rev 5690)
+++ trunk/libgems-ruby/debian/patches/20100408-version_requirements-r2459.dpatch 2010-07-19 10:11:00 UTC (rev 5691)
@@ -1,70 +0,0 @@
-#! /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
-
Added: trunk/libgems-ruby/debian/patches/series
===================================================================
--- trunk/libgems-ruby/debian/patches/series (rev 0)
+++ trunk/libgems-ruby/debian/patches/series 2010-07-19 10:11:00 UTC (rev 5691)
@@ -0,0 +1,4 @@
+01_default_gem_path.diff
+03_disable_update_system.diff
+08_tighter_search_regex.diff
+20100408-version_requirements-r2459.diff
Modified: trunk/libgems-ruby/debian/rules
===================================================================
--- trunk/libgems-ruby/debian/rules 2010-07-19 09:53:53 UTC (rev 5690)
+++ trunk/libgems-ruby/debian/rules 2010-07-19 10:11:00 UTC (rev 5691)
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/quilt/quilt.make
DEB_INSTALL_CHANGELOGS_ALL = ChangeLog debian/README.Debian
Added: trunk/libgems-ruby/debian/source/format
===================================================================
--- trunk/libgems-ruby/debian/source/format (rev 0)
+++ trunk/libgems-ruby/debian/source/format 2010-07-19 10:11:00 UTC (rev 5691)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the Pkg-ruby-extras-commits
mailing list