[DRE-commits] r6101 - in trunk/libgems-ruby/debian: . patches
Daigo Moriwaki
daigo at alioth.debian.org
Fri Mar 11 12:33:39 UTC 2011
Author: daigo
Date: 2011-03-11 12:33:36 +0000 (Fri, 11 Mar 2011)
New Revision: 6101
Modified:
trunk/libgems-ruby/debian/changelog
trunk/libgems-ruby/debian/control
trunk/libgems-ruby/debian/copyright
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
Log:
* New upstream release
* debian/control: Bumped up Standards-Version to 3.9.1.
* debian/changelog: Replaced the 'debianize' word.
Modified: trunk/libgems-ruby/debian/changelog
===================================================================
--- trunk/libgems-ruby/debian/changelog 2011-03-10 21:29:36 UTC (rev 6100)
+++ trunk/libgems-ruby/debian/changelog 2011-03-11 12:33:36 UTC (rev 6101)
@@ -1,3 +1,11 @@
+libgems-ruby (1.6.2-1) unstable; urgency=low
+
+ * New upstream release
+ * debian/control: Bumped up Standards-Version to 3.9.1.
+ * debian/changelog: Replaced the 'debianize' word.
+
+ -- Daigo Moriwaki <daigo at debian.org> Fri, 11 Mar 2011 20:12:26 +0900
+
libgems-ruby (1.3.7-3) unstable; urgency=low
[ Lucas Nussbaum ]
Modified: trunk/libgems-ruby/debian/control
===================================================================
--- trunk/libgems-ruby/debian/control 2011-03-10 21:29:36 UTC (rev 6100)
+++ trunk/libgems-ruby/debian/control 2011-03-11 12:33:36 UTC (rev 6101)
@@ -3,15 +3,15 @@
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, quilt (>= 0.40), debhelper (>= 7.0.0), ruby1.8, ruby1.9.1, ruby-pkg-tools
-Standards-Version: 3.8.4
+Build-Depends: cdbs, quilt (>= 0.40), debhelper (>= 7.0.0), ruby1.8 (>= 1.8.7.302-2), ruby-pkg-tools
+Standards-Version: 3.9.1
Homepage: http://rubygems.org/
Vcs-Svn: svn://svn.debian.org/svn/pkg-ruby-extras/trunk/libgems-ruby/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-ruby-extras/trunk/libgems-ruby/
Package: rubygems1.8
Architecture: all
-Depends: ${misc:Depends}, ruby1.8, rdoc1.8
+Depends: ${misc:Depends}, ruby1.8 (>= 1.8.7.302-2)
Recommends: ruby1.8-dev, build-essential
Suggests: rubygems-doc
Conflicts: libgems-ruby1.8, rubygems (<= 1.2.0-2)
@@ -57,4 +57,4 @@
* easily remove libraries you no longer use
.
This package provides documents of RubyGems, which is available for both
- Ruby 1.8 and 1.91.
+ Ruby 1.8 and 1.9.1.
Modified: trunk/libgems-ruby/debian/copyright
===================================================================
--- trunk/libgems-ruby/debian/copyright 2011-03-10 21:29:36 UTC (rev 6100)
+++ trunk/libgems-ruby/debian/copyright 2011-03-11 12:33:36 UTC (rev 6101)
@@ -1,4 +1,4 @@
-This package was debianized by Daigo Moriwaki <beatles at sgtpepper.net> on
+This package was packaged for Debian by Daigo Moriwaki <daigo at debian.org> on
Sun, 21 Nov 2004 12:23:16 +0900.
It was downloaded from http://rubyforge.org/projects/rubygems
Modified: trunk/libgems-ruby/debian/patches/01_default_gem_path.diff
===================================================================
--- trunk/libgems-ruby/debian/patches/01_default_gem_path.diff 2011-03-10 21:29:36 UTC (rev 6100)
+++ trunk/libgems-ruby/debian/patches/01_default_gem_path.diff 2011-03-11 12:33:36 UTC (rev 6101)
@@ -7,8 +7,8 @@
@DPATCH@
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
+--- libgems-ruby.orig/lib/rubygems/defaults.rb 2011-03-04 09:01:24.000000000 +0900
++++ libgems-ruby/lib/rubygems/defaults.rb 2011-03-11 20:26:10.282034037 +0900
@@ -15,18 +15,15 @@
##
# Default home directory path to be used if an alternate value is not
Modified: trunk/libgems-ruby/debian/patches/03_disable_update_system.diff
===================================================================
--- trunk/libgems-ruby/debian/patches/03_disable_update_system.diff 2011-03-10 21:29:36 UTC (rev 6100)
+++ trunk/libgems-ruby/debian/patches/03_disable_update_system.diff 2011-03-11 12:33:36 UTC (rev 6101)
@@ -5,37 +5,20 @@
## DP: Disable gem update --system functionality, as it can break things. Users should use apt instead
@DPATCH@
---- a/lib/rubygems/commands/update_command.rb
-+++ b/lib/rubygems/commands/update_command.rb
-@@ -48,18 +48,22 @@ class Gem::Commands::UpdateCommand < Gem
- hig = {}
+Index: libgems-ruby/lib/rubygems/commands/update_command.rb
+===================================================================
+--- libgems-ruby.orig/lib/rubygems/commands/update_command.rb 2011-03-04 09:01:24.000000000 +0900
++++ libgems-ruby/lib/rubygems/commands/update_command.rb 2011-03-11 20:41:46.069813644 +0900
+@@ -128,6 +128,12 @@
+ # Update RubyGems software to the latest version.
- if options[:system] then
-- say "Updating RubyGems"
-+ if ENV.include?('REALLY_GEM_UPDATE_SYSTEM')
-+ say "Updating RubyGems"
-
-- unless options[:args].empty? then
-- raise "No gem names are allowed with the --system option"
-- end
-+ 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::VERSION
-- hig['rubygems-update'] = rubygems_update
-+ rubygems_update = Gem::Specification.new
-+ rubygems_update.name = 'rubygems-update'
-+ rubygems_update.version = Gem::Version.new Gem::VERSION
-+ hig['rubygems-update'] = rubygems_update
-
-- options[:user_install] = false
-+ options[:user_install] = false
-+ else
-+ fail "gem update --system is disabled on Debian, because it will overwrite the content of the rubygems Debian package, and might break your Debian system in subtle ways. The Debian-supported way to update rubygems is through apt-get, using Debian official repositories.\nIf you really know what you are doing, you can still update rubygems by setting the REALLY_GEM_UPDATE_SYSTEM environment variable, but please remember that this is completely unsupported by Debian."
-+ end
- else
- say "Updating installed gems"
-
+ def update_rubygems
++ if ENV.include?('REALLY_GEM_UPDATE_SYSTEM')
++ say "Updating RubyGems"
++ else
++ alert_error "gem update --system is disabled on Debian, because it will overwrite the content of the rubygems Debian package, and might break your Debian system in subtle ways. The Debian-supported way to update rubygems is through apt-get, using Debian official repositories.\nIf you really know what you are doing, you can still update rubygems by setting the REALLY_GEM_UPDATE_SYSTEM environment variable, but please remember that this is completely unsupported by Debian."
++ terminate_interaction 1
++ end
+ unless options[:args].empty? then
+ alert_error "Gem names are not allowed with the --system option"
+ terminate_interaction 1
Modified: trunk/libgems-ruby/debian/patches/08_tighter_search_regex.diff
===================================================================
--- trunk/libgems-ruby/debian/patches/08_tighter_search_regex.diff 2011-03-10 21:29:36 UTC (rev 6100)
+++ trunk/libgems-ruby/debian/patches/08_tighter_search_regex.diff 2011-03-11 12:33:36 UTC (rev 6101)
@@ -5,15 +5,16 @@
## DP: Included at 0.8.11-2
@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 @@
+Index: libgems-ruby/lib/rubygems/source_index.rb
+===================================================================
+--- libgems-ruby.orig/lib/rubygems/source_index.rb 2011-03-04 09:01:24.000000000 +0900
++++ libgems-ruby/lib/rubygems/source_index.rb 2011-03-11 20:44:36.457805714 +0900
+@@ -277,7 +277,7 @@
end
else
- version_requirement = platform_only || Gem::Requirement.default
+ 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 === requirement then
More information about the Pkg-ruby-extras-commits
mailing list