[DRE-commits] r2872 - in packages/libopenid-ruby/trunk/debian: . patches

Thu Jul 17 13:31:03 UTC 2008

Author: terceiro-guest
Date: 2008-07-17 13:31:02 +0000 (Thu, 17 Jul 2008)
New Revision: 2872

Added:
   packages/libopenid-ruby/trunk/debian/README.Debian-sources
   packages/libopenid-ruby/trunk/debian/patches/10-use-locally-installed-hmac.diff
Removed:
   packages/libopenid-ruby/trunk/debian/patches/01-use-rubygems-correctly.diff
Modified:
   packages/libopenid-ruby/trunk/debian/changelog
   packages/libopenid-ruby/trunk/debian/control
   packages/libopenid-ruby/trunk/debian/rules
Log:
preparing upload of new upstream version



Added: packages/libopenid-ruby/trunk/debian/README.Debian-sources
===================================================================

--- packages/libopenid-ruby/trunk/debian/README.Debian-sources	                        (rev 0)
+++ packages/libopenid-ruby/trunk/debian/README.Debian-sources	2008-07-17 13:31:02 UTC (rev 2872)
@@ -0,0 +1,6 @@
+The upstream tarball for libopenid-ruby is as repacked version of upstream's
+pristine tarball, obtained by just removing the lib/hmac directory from the
+original tarball, and repacking it as a gzipped tarball (instead of a bzipped
+one like upsteam.)
+
+ -- Antonio Terceiro <terceiro at softwarelivre.org>  Thu, 17 Jul 2008 01:03:59 -0300

Modified: packages/libopenid-ruby/trunk/debian/changelog
===================================================================
--- packages/libopenid-ruby/trunk/debian/changelog	2008-07-05 01:30:29 UTC (rev 2871)
+++ packages/libopenid-ruby/trunk/debian/changelog	2008-07-17 13:31:02 UTC (rev 2872)
@@ -1,8 +1,23 @@
-libopenid-ruby (1.1.4-4) UNRELEASED; urgency=low
+libopenid-ruby (2.1.2debian-1) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
+  * debian/patches/01-use-rubygems-correctly.diff: removed (already fixed by
+    upstream)
+  * debian/patches/10-use-locally-installed-hmac.diff: fix references in
+    upstream source to use system-installed ruby-hmac library instead of its
+    locally-bundled (which was removed from the upstream tarball). The files
+    in the pristine tarball are identical to the ones provided by
+    libhmac-ruby.
+  * debian/rules: do not remove hmac by hand anymore. Instead, test that they
+    are not there (they should be removed from tarball).
+  * added debian/README.Debian-sources explaining the process to obtain a
+    tarball from upstream's pristine one.
+  * debian/control:
+    + removed dependency on libyadis-ruby1.8, since it is now being maintained
+      inside openid itself. (libyadis-ruby must be removed from the archive,
+      then).
+    + bumped standards version to 3.8.0. No changes needed.
 
- -- Antonio Terceiro <terceiro at softwarelivre.org>  Thu, 13 Mar 2008 14:22:18 -0300
+ -- Antonio Terceiro <terceiro at softwarelivre.org>  Thu, 17 Jul 2008 01:07:39 -0300
 
 libopenid-ruby (1.1.4-3) unstable; urgency=low
 

Modified: packages/libopenid-ruby/trunk/debian/control
===================================================================
--- packages/libopenid-ruby/trunk/debian/control	2008-07-05 01:30:29 UTC (rev 2871)
+++ packages/libopenid-ruby/trunk/debian/control	2008-07-17 13:31:02 UTC (rev 2872)
@@ -5,7 +5,7 @@
 Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>, Paul van Tilburg <paulvt at debian.org>
 Build-Depends: ruby-pkg-tools (>= 0.8), cdbs, debhelper (>= 5)
 Build-Depends-Indep: ruby1.8
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 Homepage: http://www.openidenabled.com/openid/libraries/ruby
 XS-DM-Upload-Allowed: yes
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-ruby-extras/packages/libopenid-ruby/
@@ -38,7 +38,7 @@
 
 Package: libopenid-ruby1.8
 Architecture: all
-Depends: libruby1.8, libyadis-ruby1.8, libhmac-ruby1.8
+Depends: libruby1.8, libhmac-ruby1.8
 Description: Ruby 1.8 library for verifying and serving OpenID identities
  Ruby OpenID makes it easy to add OpenID authentication to your web
  applications.

Deleted: packages/libopenid-ruby/trunk/debian/patches/01-use-rubygems-correctly.diff
===================================================================
--- packages/libopenid-ruby/trunk/debian/patches/01-use-rubygems-correctly.diff	2008-07-05 01:30:29 UTC (rev 2871)
+++ packages/libopenid-ruby/trunk/debian/patches/01-use-rubygems-correctly.diff	2008-07-17 13:31:02 UTC (rev 2872)
@@ -1,28 +0,0 @@
---- libopenid-ruby-1.1.4.orig/lib/openid/discovery.rb
-+++ libopenid-ruby-1.1.4/lib/openid/discovery.rb
-@@ -5,7 +5,7 @@
- # try and use the yadis gem, falling back to system yadis
- begin
-   require 'rubygems'
--  require_gem 'ruby-yadis', ">=0.3.3"  
-+  gem 'ruby-yadis', ">=0.3.3"
- rescue LoadError
-   require "yadis"
- end
---- libopenid-ruby-1.1.4.orig/lib/openid/service.rb
-+++ libopenid-ruby-1.1.4/lib/openid/service.rb
-@@ -1,10 +1,11 @@
-  require 'rexml/document'
- 
-+# try and use the yadis gem, falling back to system yadis
- begin
--  require 'yadis'
--rescue LoadError
-   require 'rubygems'
--  require_gem 'ruby-yadis'
-+  gem 'ruby-yadis', ">=0.3.3"
-+rescue LoadError
-+  require "yadis"
- end
- 
- module OpenID

Added: packages/libopenid-ruby/trunk/debian/patches/10-use-locally-installed-hmac.diff
===================================================================
--- packages/libopenid-ruby/trunk/debian/patches/10-use-locally-installed-hmac.diff	                        (rev 0)
+++ packages/libopenid-ruby/trunk/debian/patches/10-use-locally-installed-hmac.diff	2008-07-17 13:31:02 UTC (rev 2872)
@@ -0,0 +1,13 @@
+--- lib/openid/cryptutil.rb.orig	2008-07-17 00:51:28.882965472 -0300
++++ lib/openid/cryptutil.rb	2008-07-17 00:51:41.310965750 -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

Modified: packages/libopenid-ruby/trunk/debian/rules
===================================================================
--- packages/libopenid-ruby/trunk/debian/rules	2008-07-05 01:30:29 UTC (rev 2871)
+++ packages/libopenid-ruby/trunk/debian/rules	2008-07-17 13:31:02 UTC (rev 2872)
@@ -11,9 +11,9 @@
 clean::
 	rm -rf html
 
+# test that hmac files are not there
 install/libopenid-ruby1.8::
-	# remove hmac libraries already provided by libhmac-ruby package
-	rm debian/libopenid-ruby1.8/usr/lib/ruby/1.8/hmac*.rb
+	! test -e debian/libopenid-ruby1.8/usr/lib/ruby/1.8/hmac
 
 install/libopenid-ruby::
 	# build docs


