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

[terceiro-guest at alioth.debian.org]

Author: terceiro-guest
Date: 2008-03-13 16:30:24 +0000 (Thu, 13 Mar 2008)
New Revision: 2518

Added:
   packages/libopenid-ruby/trunk/debian/patches/
   packages/libopenid-ruby/trunk/debian/patches/01-use-rubygems-correctly.diff
Removed:
   packages/libopenid-ruby/trunk/debian/TODO
   packages/libopenid-ruby/trunk/debian/libopenid-ruby.dirs
   packages/libopenid-ruby/trunk/debian/libopenid-ruby.overrides
Modified:
   packages/libopenid-ruby/trunk/debian/changelog
   packages/libopenid-ruby/trunk/debian/rules
Log:
working on #470282



Deleted: packages/libopenid-ruby/trunk/debian/TODO
===================================================================
--- packages/libopenid-ruby/trunk/debian/TODO	2008-03-11 19:34:58 UTC (rev 2517)
+++ packages/libopenid-ruby/trunk/debian/TODO	2008-03-13 16:30:24 UTC (rev 2518)
@@ -1,2 +0,0 @@
-* close the ITP bug by hand since the initial upload of a -2 won't do it
-  automatically (I guess).

Modified: packages/libopenid-ruby/trunk/debian/changelog
===================================================================
--- packages/libopenid-ruby/trunk/debian/changelog	2008-03-11 19:34:58 UTC (rev 2517)
+++ packages/libopenid-ruby/trunk/debian/changelog	2008-03-13 16:30:24 UTC (rev 2518)
@@ -1,9 +1,15 @@
-libopenid-ruby (1.1.4-3) UNRELEASED; urgency=low
+libopenid-ruby (1.1.4-3) unstable; urgency=low
 
-  * adapting debian/watch to pick only tarballs with an actual version number
+  * debian/watch: pick only tarballs with an actual version number
     on the name.
+  * debian/TODO: removed
+  * debian/patches/01-use-rubygems-correctly.diff: fix usage of deprecated
+    rubygems 'require_gem'. (Closes: #470282)
+  * debian/libopenid-ruby.overrides: removed. It seems that lintian won't
+    complain about the empty files in the examples anymore.
+  * debian/libopenid-ruby.dirs: removed (contained only the overrides dir)
 
- -- Antonio Terceiro <terceiro at softwarelivre.org>  Fri, 04 Jan 2008 12:24:26 -0300
+ -- Antonio Terceiro <terceiro at softwarelivre.org>  Thu, 13 Mar 2008 12:23:53 -0300
 
 libopenid-ruby (1.1.4-2) unstable; urgency=low
 

Deleted: packages/libopenid-ruby/trunk/debian/libopenid-ruby.dirs
===================================================================
--- packages/libopenid-ruby/trunk/debian/libopenid-ruby.dirs	2008-03-11 19:34:58 UTC (rev 2517)
+++ packages/libopenid-ruby/trunk/debian/libopenid-ruby.dirs	2008-03-13 16:30:24 UTC (rev 2518)
@@ -1 +0,0 @@
-usr/share/lintian/overrides

Deleted: packages/libopenid-ruby/trunk/debian/libopenid-ruby.overrides
===================================================================
--- packages/libopenid-ruby/trunk/debian/libopenid-ruby.overrides	2008-03-11 19:34:58 UTC (rev 2517)
+++ packages/libopenid-ruby/trunk/debian/libopenid-ruby.overrides	2008-03-13 16:30:24 UTC (rev 2518)
@@ -1,5 +0,0 @@
-# upstream examples contain some empty files
-libopenid-ruby binary: zero-byte-file-in-doc-directory usr/share/doc/libopenid-ruby/examples/rails_openid_login_generator/templates/controller_test.rb
-libopenid-ruby binary: zero-byte-file-in-doc-directory usr/share/doc/libopenid-ruby/examples/rails_openid_login_generator/templates/user_test.rb
-libopenid-ruby binary: zero-byte-file-in-doc-directory usr/share/doc/libopenid-ruby/examples/rails_openid_login_generator/templates/users.yml
-libopenid-ruby binary: zero-byte-file-in-doc-directory usr/share/doc/libopenid-ruby/examples/rails_server/public/favicon.ico

Added: packages/libopenid-ruby/trunk/debian/patches/01-use-rubygems-correctly.diff
===================================================================
--- packages/libopenid-ruby/trunk/debian/patches/01-use-rubygems-correctly.diff	                        (rev 0)
+++ packages/libopenid-ruby/trunk/debian/patches/01-use-rubygems-correctly.diff	2008-03-13 16:30:24 UTC (rev 2518)
@@ -0,0 +1,28 @@
+--- 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

Modified: packages/libopenid-ruby/trunk/debian/rules
===================================================================
--- packages/libopenid-ruby/trunk/debian/rules	2008-03-11 19:34:58 UTC (rev 2517)
+++ packages/libopenid-ruby/trunk/debian/rules	2008-03-13 16:30:24 UTC (rev 2518)
@@ -6,6 +6,8 @@
 include /usr/share/cdbs/1/rules/buildvars.mk
 include /usr/share/ruby-pkg-tools/1/class/ruby-setup-rb.mk
 
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+
 clean::
 	rm -rf html
 
@@ -17,4 +19,3 @@
 	# build docs
 	cp -r doc html
 	dh_install -plibopenid-ruby html usr/share/doc/libopenid-ruby
-	install -m 644 debian/libopenid-ruby.overrides $(CURDIR)/debian/$(cdbs_curpkg)/usr/share/lintian/overrides/libopenid-ruby