[DRE-commits] [SCM] ruby-openid.git branch, master, updated. upstream/2.1.8-19-gb6951fb

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit b6951fbbe331f6e8a71822d88f801e3de910516f
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Thu May 17 17:12:40 2012 +0200

    Added patch 01_remove_rubygems_require.diff to remove requires of rubygems

diff --git a/debian/changelog b/debian/changelog
index 91cd554..1984113 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,11 +17,14 @@ ruby-openid (2.1.8debian-2) unstable; urgency=low
       convention the team is the default maintainer.
     - Added myself to the uploaders.
     - Added libopenid-ruby and libopenid-ruby1.8 as transitional packages.
-  * debian/patches: removed as the new upstream source tries to require
-    ruby-hmac first.
+  * debian/patches:
+    - Removed patch use-system-installed-hmac as the new upstream source
+      tries to require ruby-hmac first.
+    - Added patch 01_remove_rubygems_require.diff to remove requires of
+      rubygems.
   * debian/ruby-openid.lintian-overrides: override the
     embedded-javascript-library warning as we don't want to add a depend on
-    libjs-prototype. 
+    libjs-prototype.
 
   [ Cédric Boutillier ]
   * Convert debian/copyright to Debian copyright format version 1.0.
diff --git a/debian/patches/01_remove_rubygems_require.diff b/debian/patches/01_remove_rubygems_require.diff
new file mode 100644
index 0000000..2400e53
--- /dev/null
+++ b/debian/patches/01_remove_rubygems_require.diff
@@ -0,0 +1,31 @@
+--- a/admin/runtests.rb
++++ b/admin/runtests.rb
+@@ -8,7 +8,6 @@
+ require 'test/unit/ui/console/testrunner'
+ 
+ begin
+-  require 'rubygems'
+   require 'memcache'
+ rescue LoadError
+ else
+--- a/examples/active_record_openid_store/init.rb
++++ b/examples/active_record_openid_store/init.rb
+@@ -1,8 +1,2 @@
+-# might using the ruby-openid gem
+-begin
+-  require 'rubygems'
+-rescue LoadError
+-  nil
+-end
+ require 'openid'
+ require 'openid_ar_store'
+--- a/examples/rails_openid/config/boot.rb
++++ b/examples/rails_openid/config/boot.rb
+@@ -12,7 +12,6 @@
+ if File.directory?("#{RAILS_ROOT}/vendor/rails")
+   require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
+ else
+-  require 'rubygems'
+   require 'initializer'
+ end
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8ebe3f3
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_remove_rubygems_require.diff

-- 
ruby-openid.git