[DRE-commits] r5692 - in trunk/libgems-ruby/debian: . patches
Daigo Moriwaki
daigo at alioth.debian.org
Mon Jul 19 10:37:34 UTC 2010
Author: daigo
Date: 2010-07-19 10:37:33 +0000 (Mon, 19 Jul 2010)
New Revision: 5692
Modified:
trunk/libgems-ruby/debian/changelog
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/20100408-version_requirements-r2459.diff
trunk/libgems-ruby/debian/patches/series
Log:
Removed: debian/patches/20100408-version_requirements-r2459.dpatch,
which has been applied by the upstream.
Modified: trunk/libgems-ruby/debian/changelog
===================================================================
--- trunk/libgems-ruby/debian/changelog 2010-07-19 10:11:00 UTC (rev 5691)
+++ trunk/libgems-ruby/debian/changelog 2010-07-19 10:37:33 UTC (rev 5692)
@@ -8,6 +8,8 @@
[ Daigo Moriwaki ]
* New upstream release. (Closes: #589511)
* Converted dpatch to quilt.
+ * Removed: debian/patches/20100408-version_requirements-r2459.dpatch,
+ which has been applied by the upstream.
-- Daigo Moriwaki <daigo at debian.org> Mon, 19 Jul 2010 18:45:43 +0900
Modified: trunk/libgems-ruby/debian/patches/01_default_gem_path.diff
===================================================================
--- trunk/libgems-ruby/debian/patches/01_default_gem_path.diff 2010-07-19 10:11:00 UTC (rev 5691)
+++ trunk/libgems-ruby/debian/patches/01_default_gem_path.diff 2010-07-19 10:37:33 UTC (rev 5692)
@@ -5,10 +5,11 @@
## DP: Changes the default gem dir from inside the ruby lib to /var/lib/gems/{ruby version}
@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 @@
+Index: libgems-ruby/lib/rubygems/defaults.rb
+===================================================================
+--- libgems-ruby.orig/lib/rubygems/defaults.rb 2010-04-20 14:57:27.000000000 +0900
++++ libgems-ruby/lib/rubygems/defaults.rb 2010-07-19 19:18:45.000000000 +0900
+@@ -15,18 +15,15 @@
##
# Default home directory path to be used if an alternate value is not
# specified in the environment
@@ -23,9 +24,8 @@
- 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',
+- elsif ConfigMap[:rubylibprefix] then
+- File.join(ConfigMap[:rubylibprefix], 'gems',
- ConfigMap[:ruby_version])
- else
- File.join(ConfigMap[:libdir], ruby_engine, 'gems',
@@ -35,7 +35,7 @@
end
##
-@@ -65,13 +61,11 @@
+@@ -63,13 +60,11 @@
##
# The default directory for binaries
Modified: trunk/libgems-ruby/debian/patches/03_disable_update_system.diff
===================================================================
--- trunk/libgems-ruby/debian/patches/03_disable_update_system.diff 2010-07-19 10:11:00 UTC (rev 5691)
+++ trunk/libgems-ruby/debian/patches/03_disable_update_system.diff 2010-07-19 10:37:33 UTC (rev 5692)
@@ -5,9 +5,10 @@
## DP: Disable gem update --system functionality, as it can break things. Users should use apt instead
@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
+Index: libgems-ruby/lib/rubygems/commands/update_command.rb
+===================================================================
+--- libgems-ruby.orig/lib/rubygems/commands/update_command.rb 2010-04-20 15:47:36.000000000 +0900
++++ libgems-ruby/lib/rubygems/commands/update_command.rb 2010-07-19 19:22:41.000000000 +0900
@@ -48,18 +48,7 @@
hig = {}
@@ -20,7 +21,7 @@
-
- rubygems_update = Gem::Specification.new
- rubygems_update.name = 'rubygems-update'
-- rubygems_update.version = Gem::Version.new Gem::RubyGemsVersion
+- rubygems_update.version = Gem::Version.new Gem::VERSION
- hig['rubygems-update'] = rubygems_update
-
- options[:user_install] = false
Modified: trunk/libgems-ruby/debian/patches/20100408-version_requirements-r2459.diff
===================================================================
--- trunk/libgems-ruby/debian/patches/20100408-version_requirements-r2459.diff 2010-07-19 10:11:00 UTC (rev 5691)
+++ trunk/libgems-ruby/debian/patches/20100408-version_requirements-r2459.diff 2010-07-19 10:37:33 UTC (rev 5692)
@@ -7,64 +7,13 @@
@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
+Index: libgems-ruby/lib/rubygems/dependency.rb
+===================================================================
+--- libgems-ruby.orig/lib/rubygems/dependency.rb 2010-07-19 19:32:32.000000000 +0900
++++ libgems-ruby/lib/rubygems/dependency.rb 2010-07-19 19:32:42.000000000 +0900
+@@ -1,4 +1,4 @@
+-require "rubygems/requirement"
++ require "rubygems/requirement"
- ##
-- # 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
-
+ ##
+ # The Dependency class holds a Gem name and a Gem::Requirement.
Modified: trunk/libgems-ruby/debian/patches/series
===================================================================
--- trunk/libgems-ruby/debian/patches/series 2010-07-19 10:11:00 UTC (rev 5691)
+++ trunk/libgems-ruby/debian/patches/series 2010-07-19 10:37:33 UTC (rev 5692)
@@ -1,4 +1,3 @@
01_default_gem_path.diff
03_disable_update_system.diff
08_tighter_search_regex.diff
-20100408-version_requirements-r2459.diff
More information about the Pkg-ruby-extras-commits
mailing list