[DRE-commits] r2713 - in packages/libgems-ruby/trunk/debian: . patches
daigo at alioth.debian.org
daigo at alioth.debian.org
Sat May 10 06:48:09 UTC 2008
Author: daigo
Date: 2008-05-10 06:48:07 +0000 (Sat, 10 May 2008)
New Revision: 2713
Modified:
packages/libgems-ruby/trunk/debian/changelog
packages/libgems-ruby/trunk/debian/patches/01_default_gem_path.dpatch
packages/libgems-ruby/trunk/debian/patches/03_disable_update_system.dpatch
packages/libgems-ruby/trunk/debian/patches/08_tighter_search_regex.dpatch
packages/libgems-ruby/trunk/debian/patches/21_avoid_ioseek.dpatch
Log:
make the patches work on the new version.
Modified: packages/libgems-ruby/trunk/debian/changelog
===================================================================
--- packages/libgems-ruby/trunk/debian/changelog 2008-05-09 22:28:40 UTC (rev 2712)
+++ packages/libgems-ruby/trunk/debian/changelog 2008-05-10 06:48:07 UTC (rev 2713)
@@ -1,8 +1,8 @@
-libgems-ruby (1.0.1-5) UNRELEASED; urgency=low
+libgems-ruby (1.1.1-1) unstable; urgency=low
- * NOT RELEASED YET
+ * (NOT RELEASED YET) New upstream release
- -- Daigo Moriwaki <daigo at debian.org> Sat, 29 Dec 2007 02:02:38 +0900
+ -- Daigo Moriwaki <daigo at debian.org> Sat, 10 May 2008 15:23:21 +0900
libgems-ruby (1.0.1-4) unstable; urgency=low
Modified: packages/libgems-ruby/trunk/debian/patches/01_default_gem_path.dpatch
===================================================================
--- packages/libgems-ruby/trunk/debian/patches/01_default_gem_path.dpatch 2008-05-09 22:28:40 UTC (rev 2712)
+++ packages/libgems-ruby/trunk/debian/patches/01_default_gem_path.dpatch 2008-05-10 06:48:07 UTC (rev 2713)
@@ -6,26 +6,29 @@
@DPATCH@
diff -urNad trunk~/lib/rubygems/defaults.rb trunk/lib/rubygems/defaults.rb
---- trunk~/lib/rubygems/defaults.rb 2007-12-18 07:09:42.000000000 +1100
-+++ trunk/lib/rubygems/defaults.rb 2007-12-21 19:29:22.000000000 +1100
-@@ -7,13 +7,14 @@
+--- trunk~/lib/rubygems/defaults.rb 2008-03-09 12:42:07.000000000 +0900
++++ trunk/lib/rubygems/defaults.rb 2008-05-10 15:35:02.000000000 +0900
+@@ -7,16 +7,14 @@
# 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)
-+ #
++ #
++ # 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]
- end
-+ '/' + File.join('var', 'lib', 'gems', ConfigMap[:ruby_version])
++ File.join('/', 'var', 'lib', 'gems', ConfigMap[:ruby_version])
end
# Default gem path.
Modified: packages/libgems-ruby/trunk/debian/patches/03_disable_update_system.dpatch
===================================================================
--- packages/libgems-ruby/trunk/debian/patches/03_disable_update_system.dpatch 2008-05-09 22:28:40 UTC (rev 2712)
+++ packages/libgems-ruby/trunk/debian/patches/03_disable_update_system.dpatch 2008-05-10 06:48:07 UTC (rev 2713)
@@ -6,13 +6,13 @@
@DPATCH@
diff -urNad trunk~/lib/rubygems/commands/update_command.rb trunk/lib/rubygems/commands/update_command.rb
---- trunk~/lib/rubygems/commands/update_command.rb 2007-12-16 13:42:30.000000000 +1100
-+++ trunk/lib/rubygems/commands/update_command.rb 2007-12-21 19:59:11.000000000 +1100
-@@ -45,13 +45,7 @@
+--- 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 @@
def execute
if options[:system] then
-- say "Updating RubyGems..."
+- say "Updating RubyGems"
-
- unless options[:args].empty? then
- fail "No gem names are allowed with the --system option"
@@ -21,5 +21,5 @@
- options[:args] = ["rubygems-update"]
+ 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..."
+ say "Updating installed gems"
end
Modified: packages/libgems-ruby/trunk/debian/patches/08_tighter_search_regex.dpatch
===================================================================
--- packages/libgems-ruby/trunk/debian/patches/08_tighter_search_regex.dpatch 2008-05-09 22:28:40 UTC (rev 2712)
+++ packages/libgems-ruby/trunk/debian/patches/08_tighter_search_regex.dpatch 2008-05-10 06:48:07 UTC (rev 2713)
@@ -6,14 +6,14 @@
@DPATCH@
diff -urNad trunk~/lib/rubygems/source_index.rb trunk/lib/rubygems/source_index.rb
---- trunk~/lib/rubygems/source_index.rb 2007-12-18 12:36:44.000000000 +0900
-+++ trunk/lib/rubygems/source_index.rb 2007-12-23 23:54:59.000000000 +0900
-@@ -217,7 +217,7 @@
- end
- else
- version_requirement = platform_only || Gem::Requirement.default
-- gem_pattern = /#{gem_pattern}/i
-+ gem_pattern = /^#{gem_pattern}/i
- end
+--- 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
+ unless Gem::Requirement === version_requirement then
Modified: packages/libgems-ruby/trunk/debian/patches/21_avoid_ioseek.dpatch
===================================================================
--- packages/libgems-ruby/trunk/debian/patches/21_avoid_ioseek.dpatch 2008-05-09 22:28:40 UTC (rev 2712)
+++ packages/libgems-ruby/trunk/debian/patches/21_avoid_ioseek.dpatch 2008-05-10 06:48:07 UTC (rev 2713)
@@ -5,29 +5,30 @@
## DP: A work around for Bug#406388.
@DPATCH@
-diff -urNad trunk~/lib/rubygems/package.rb trunk/lib/rubygems/package.rb
---- trunk~/lib/rubygems/package.rb 2007-05-11 04:01:45.000000000 +0900
-+++ trunk/lib/rubygems/package.rb 2007-05-27 08:20:23.000000000 +0900
-@@ -447,17 +447,17 @@
- size = entry.size
- yield entry
- skip = (512 - (size % 512)) % 512
-- if @io.respond_to? :seek
-- # avoid reading...
-- @io.seek(size - entry.bytes_read, IO::SEEK_CUR)
-- else
-+ #if @io.respond_to? :seek
-+ # # avoid reading...
-+ # @io.seek(size - entry.bytes_read, IO::SEEK_CUR)
-+ #else
- pending = size - entry.bytes_read
- while pending > 0
- bread = @io.read([pending, 4096].min).size
- raise UnexpectedEOF if @io.eof?
- pending -= bread
- end
-- end
-+ #end
- @io.read(skip) # discard trailing zeros
- # make sure nobody can use #read, #getc or #rewind anymore
- entry.close
+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