[DRE-commits] r3097 - in packages/libgems-ruby/trunk/debian: . patches
daigo at alioth.debian.org
daigo at alioth.debian.org
Thu Nov 20 14:13:45 UTC 2008
Author: daigo
Date: 2008-11-20 14:13:45 +0000 (Thu, 20 Nov 2008)
New Revision: 3097
Removed:
packages/libgems-ruby/trunk/debian/patches/21_avoid_ioseek.dpatch
Modified:
packages/libgems-ruby/trunk/debian/changelog
packages/libgems-ruby/trunk/debian/patches/00list
packages/libgems-ruby/trunk/debian/patches/01_default_gem_path.dpatch
packages/libgems-ruby/trunk/debian/patches/03_disable_update_system.dpatch
Log:
* New upstream release.
* Removed debian/patches/21_avoid_ioseek.dpatch since the upstream checks
I/O errors now.
Modified: packages/libgems-ruby/trunk/debian/changelog
===================================================================
--- packages/libgems-ruby/trunk/debian/changelog 2008-11-19 01:43:25 UTC (rev 3096)
+++ packages/libgems-ruby/trunk/debian/changelog 2008-11-20 14:13:45 UTC (rev 3097)
@@ -1,8 +1,10 @@
-libgems-ruby (1.2.0-4) UNRELEASED; urgency=low
+libgems-ruby (1.3.1-1) experimental; urgency=low
- * NOT RELEASED YET
+ * New upstream release.
+ * Removed debian/patches/21_avoid_ioseek.dpatch since the upstream checks
+ I/O errors now.
- -- Daigo Moriwaki <daigo at debian.org> Tue, 02 Sep 2008 23:01:49 -0400
+ -- Daigo Moriwaki <daigo at debian.org> Wed, 19 Nov 2008 00:03:20 +0900
libgems-ruby (1.2.0-3) unstable; urgency=low
Modified: packages/libgems-ruby/trunk/debian/patches/00list
===================================================================
--- packages/libgems-ruby/trunk/debian/patches/00list 2008-11-19 01:43:25 UTC (rev 3096)
+++ packages/libgems-ruby/trunk/debian/patches/00list 2008-11-20 14:13:45 UTC (rev 3097)
@@ -1,6 +1,5 @@
01_default_gem_path.dpatch
03_disable_update_system.dpatch
08_tighter_search_regex.dpatch
-21_avoid_ioseek.dpatch
#05_gem_commands.dpatch
#09_installer.dpatch
Modified: packages/libgems-ruby/trunk/debian/patches/01_default_gem_path.dpatch
===================================================================
--- packages/libgems-ruby/trunk/debian/patches/01_default_gem_path.dpatch 2008-11-19 01:43:25 UTC (rev 3096)
+++ packages/libgems-ruby/trunk/debian/patches/01_default_gem_path.dpatch 2008-11-20 14:13:45 UTC (rev 3097)
@@ -6,38 +6,38 @@
@DPATCH@
diff -urNad trunk~/lib/rubygems/defaults.rb trunk/lib/rubygems/defaults.rb
---- trunk~/lib/rubygems/defaults.rb 2008-03-09 12:42:07.000000000 +0900
-+++ trunk/lib/rubygems/defaults.rb 2008-05-10 16:07:33.000000000 +0900
-@@ -7,16 +7,14 @@
-
+--- trunk~/lib/rubygems/defaults.rb 2008-10-11 05:29:53.000000000 +0900
++++ trunk/lib/rubygems/defaults.rb 2008-11-19 09:05:38.000000000 +0900
+@@ -15,15 +15,15 @@
+ ##
# Default home directory path to be used if an alternate value is not
- # specified in the environment.
+ # 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]
-- elsif defined? RUBY_ENGINE then
-- File.join ConfigMap[:libdir], RUBY_ENGINE, 'gems',
-- ConfigMap[:ruby_version]
- else
-- File.join ConfigMap[:libdir], 'ruby', 'gems', ConfigMap[:ruby_version]
+- File.join(ConfigMap[:libdir], ruby_engine, 'gems',
+- ConfigMap[:ruby_version])
- end
+ File.join('/', 'var', 'lib', 'gems', ConfigMap[:ruby_version])
end
- # Default gem path.
-@@ -31,12 +29,10 @@
- end
+ ##
+@@ -51,13 +51,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'
@@ -47,4 +47,4 @@
+ File.join('/', 'var', 'lib', 'gems', ConfigMap[:ruby_version], 'bin')
end
- # The default system-wide source info cache directory.
+ ##
Modified: packages/libgems-ruby/trunk/debian/patches/03_disable_update_system.dpatch
===================================================================
--- packages/libgems-ruby/trunk/debian/patches/03_disable_update_system.dpatch 2008-11-19 01:43:25 UTC (rev 3096)
+++ packages/libgems-ruby/trunk/debian/patches/03_disable_update_system.dpatch 2008-11-20 14:13:45 UTC (rev 3097)
@@ -6,11 +6,11 @@
@DPATCH@
diff -urNad trunk~/lib/rubygems/commands/update_command.rb trunk/lib/rubygems/commands/update_command.rb
---- trunk~/lib/rubygems/commands/update_command.rb 2008-04-08 06:32:28.000000000 +0900
-+++ trunk/lib/rubygems/commands/update_command.rb 2008-05-10 15:38:29.000000000 +0900
-@@ -47,13 +47,7 @@
+--- trunk~/lib/rubygems/commands/update_command.rb 2008-10-11 06:24:10.000000000 +0900
++++ trunk/lib/rubygems/commands/update_command.rb 2008-11-19 09:15:18.000000000 +0900
+@@ -48,18 +48,7 @@
+ hig = {}
- def execute
if options[:system] then
- say "Updating RubyGems"
-
@@ -18,8 +18,13 @@
- fail "No gem names are allowed with the --system option"
- end
-
-- options[:args] = ["rubygems-update"]
+- 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"
- end
+
Deleted: packages/libgems-ruby/trunk/debian/patches/21_avoid_ioseek.dpatch
===================================================================
--- packages/libgems-ruby/trunk/debian/patches/21_avoid_ioseek.dpatch 2008-11-19 01:43:25 UTC (rev 3096)
+++ packages/libgems-ruby/trunk/debian/patches/21_avoid_ioseek.dpatch 2008-11-20 14:13:45 UTC (rev 3097)
@@ -1,34 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 21_avoid_ioseek.dpatch by Daigo Moriwaki <daigo at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: A work around for Bug#406388.
-
- at DPATCH@
-diff -urNad trunk~/lib/rubygems/package/tar_reader.rb trunk/lib/rubygems/package/tar_reader.rb
---- trunk~/lib/rubygems/package/tar_reader.rb 2008-02-29 17:55:01.000000000 +0900
-+++ trunk/lib/rubygems/package/tar_reader.rb 2008-05-10 15:44:05.000000000 +0900
-@@ -47,10 +47,10 @@
-
- skip = (512 - (size % 512)) % 512
-
-- if @io.respond_to? :seek then
-- # avoid reading...
-- @io.seek(size - entry.bytes_read, IO::SEEK_CUR)
-- else
-+ #if @io.respond_to? :seek then
-+ # # avoid reading...
-+ # @io.seek(size - entry.bytes_read, IO::SEEK_CUR)
-+ #else
- pending = size - entry.bytes_read
-
- while pending > 0 do
-@@ -58,7 +58,7 @@
- raise UnexpectedEOF if @io.eof?
- pending -= bread
- end
-- end
-+ #end
-
- @io.read skip # discard trailing zeros
-
More information about the Pkg-ruby-extras-commits
mailing list