[DRE-commits] [SCM] common interface to HMAC functionality branch, master, updated. upstream/0.4.0-2-gff3d9f4

[Vasudev Kamath]

The following commit has been merged in the master branch:
commit ff3d9f454d9242f0b87bbc0e1972d4682961280b
Author: Vasudev Kamath <kamathvasudev at gmail.com>
Date:   Sun May 8 17:10:06 2011 +0530

    Fixed some issues in control file and uncommented the line in ruby-hmac.docs

diff --git a/debian/control b/debian/control
index db71e3b..66b7f8a 100644
--- a/debian/control
+++ b/debian/control
@@ -22,31 +22,28 @@ Depends: ${misc:Depends},
          ruby1.8 | ruby-interpreter,
          ruby-minitest
 Replaces: libhmac-ruby1.8 (<< 0.4.0-1~), libhmac-ruby (<< 0.4.0-1~)
-Conflicts: libhmac-ruby1.8 (<< 0.4.0-1~), libhmac-ruby (<< 0.4.0-1~)
+Conflicts: libhmac-ruby1.8 (<< 0.4.0-1~), libhmac-ruby (<< 0.4.0-1~),
+           libopenid-ruby1.8 (<< 1.1.4-2)
 Provides: libhmac-ruby1.8, libhmac-ruby
-Description: This module provides common interface to HMAC functionality
+Description: Ruby interface for HMAC algorith
  This module provides common interface to HMAC functionality. HMAC is a
  kind of "Message Authentication Code" (MAC) algorithm whose standard is
  documented in RFC2104. Namely, a MAC provides a way to check the integrity
  of information transmitted over or stored in an unreliable medium, based
  on a secret key.
- .
- Originally written by Daiki Ueno. Converted to a RubyGem by Geoffrey Grosenbach
 
 Package: libhmac-ruby1.8
 section: oldlibs
 Architecture: all
 Depends: ${misc:Depends}, ruby-hmac
-Conflicts: libopenid-ruby1.8 (<< 1.1.4-2)
 Description: Transitional package for ruby-rspec
- This is a transitional package to ease upgrades to the ruby-rspec
+ This is a transitional package to ease upgrades to the ruby-hmac
  package. It can safely be removed.
 
 Package: libhmac-ruby
 section: oldlibs
 Architecture: all
 Depends: ${misc:Depends}, ruby-hmac
-Conflicts: libopenid-ruby1.8 (<< 1.1.4-2)
-Description: Transitional package for ruby-rspec
+Description: Transitional package for ruby-hmac
  This is a transitional package to ease upgrades to the ruby-rspec
  package. It can safely be removed.
diff --git a/debian/ruby-hmac.docs b/debian/ruby-hmac.docs
index 23a54bd..71dfd5b 100644
--- a/debian/ruby-hmac.docs
+++ b/debian/ruby-hmac.docs
@@ -1,2 +1 @@
-# FIXME: READMEs found
-# README.txt
+README.txt

-- 
common interface to HMAC functionality