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

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit dcef52e53adb4ce5b14b98757a1b7f47f0f9843d
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Wed May 16 17:42:13 2012 +0200

    Use different source via uscan/the watch file; reapplied repack

diff --git a/debian/changelog b/debian/changelog
index b09ed71..02db706 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,11 @@ ruby-openid (2.1.8debian-2) UNRELEASED; urgency=low
   [ Cédric Boutillier ]
   * Convert debian/copyright to DEP-5
 
+  [ Paul van Tilburg ]
+  * Use different source via uscan/the watch file; reapplied repack.
+  * debian/patches: removed as the new upstream source tries to require
+    ruby-hmac first.
+
  -- Paul van Tilburg <paulvt at debian.org>  Sat, 12 May 2012 00:27:14 +0200
 
 libopenid-ruby (2.1.8debian-1) unstable; urgency=low
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index fba1157..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-use-system-installed-hmac
diff --git a/debian/patches/use-system-installed-hmac b/debian/patches/use-system-installed-hmac
deleted file mode 100644
index cd521d8..0000000
--- a/debian/patches/use-system-installed-hmac
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: libopenid-ruby-2.1.8debian.orig/lib/openid/cryptutil.rb
-===================================================================
---- libopenid-ruby-2.1.8debian.orig.orig/lib/openid/cryptutil.rb	2010-04-11 22:20:42.000000000 -0300
-+++ libopenid-ruby-2.1.8debian.orig/lib/openid/cryptutil.rb	2010-04-11 22:20:53.000000000 -0300
-@@ -4,8 +4,8 @@
- begin
-   require "digest/hmac"
- rescue LoadError
--  require "hmac/sha1"
--  require "hmac/sha2"
-+  require "hmac-sha1"
-+  require "hmac-sha2"
- end
- 
- module OpenID
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 4aceb10..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1 +0,0 @@
-unapply-patches

-- 
ruby-openid.git