[DRE-commits] r4872 - in trunk/liboauth-ruby/debian: . patches

[Will Daniels]

Author: wdaniels-guest
Date: 2010-03-03 05:35:56 +0000 (Wed, 03 Mar 2010)
New Revision: 4872

Modified:
   trunk/liboauth-ruby/debian/control
   trunk/liboauth-ruby/debian/copyright
   trunk/liboauth-ruby/debian/patches/repack-deprecate-rubygems
   trunk/liboauth-ruby/debian/rules
Log:
[svn-inject] Applying Debian modifications to trunk

Modified: trunk/liboauth-ruby/debian/control
===================================================================
--- trunk/liboauth-ruby/debian/control	2010-03-03 05:35:14 UTC (rev 4871)
+++ trunk/liboauth-ruby/debian/control	2010-03-03 05:35:56 UTC (rev 4872)
@@ -5,7 +5,7 @@
 Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Build-Depends: cdbs, debhelper (>> 7), ruby-pkg-tools, ruby1.8, quilt,
  graphviz
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Vcs-Browser: http://github.com/mojodna/oauth
 Vcs-Git: git://github.com/mojodna/oauth.git
 
@@ -15,7 +15,7 @@
 Suggests: liboauth-ruby-doc
 Homepage: http://oauth.rubyforge.org
 Description: The OAuth Ruby Library
- A ruby library for implementing both OAuth clients and servers in Ruby
+ A Ruby library for implementing both OAuth clients and servers in Ruby
  applications.
  .
  The OAuth protocol enables websites or applications (Consumers) to access
@@ -44,8 +44,8 @@
 Architecture: all
 Depends: libjson-ruby, ${misc:Depends}
 Description: Documentation for the OAuth Ruby Library
- liboauth-ruby is a ruby library for implementing both OAuth clients and
+ liboauth-ruby is a Ruby library for implementing both OAuth clients and
  servers in Ruby applications.
  .
  This is the documentation package, with upstream documentation as well as
- generated rdoc.
+ generated RDoc.

Modified: trunk/liboauth-ruby/debian/copyright
===================================================================
--- trunk/liboauth-ruby/debian/copyright	2010-03-03 05:35:14 UTC (rev 4871)
+++ trunk/liboauth-ruby/debian/copyright	2010-03-03 05:35:56 UTC (rev 4872)
@@ -19,12 +19,16 @@
 Copyright:
 
     Copyright (C) 2007 Blaine Cook, Larry Halff, Pelle Braendgaard
+    curvyCorners.js is Copyright (C) 2006 Cameron Cooke
 
 License:
 
     This code is free to use under the terms of the MIT license.
     See License.txt for full license terms.
 
+    curvyCorners.js is licensed under the LGPL 2.1 license, see
+    `/usr/share/common-licenses/LGPL-2.1' for full license text.
+
 The Debian packaging is:
 
     Copyright (C) 2010 Will Daniels <mail at willdaniels.co.uk>

Modified: trunk/liboauth-ruby/debian/patches/repack-deprecate-rubygems
===================================================================
--- trunk/liboauth-ruby/debian/patches/repack-deprecate-rubygems	2010-03-03 05:35:14 UTC (rev 4871)
+++ trunk/liboauth-ruby/debian/patches/repack-deprecate-rubygems	2010-03-03 05:35:56 UTC (rev 4872)
@@ -1,16 +1,19 @@
+Dependencies are handled by APT in Debian, not RubyGems
 --- a/bin/oauth
 +++ b/bin/oauth
-@@ -1,4 +1,4 @@
+@@ -1,4 +1,5 @@
 -#!/usr/bin/env ruby -w -rubygems
 +#!/usr/bin/ruby1.8
++# Debian maintainer: removed unsupported option -rubygems and use ruby1.8
  
  require "oauth/cli"
  
 --- a/examples/yql.rb
 +++ b/examples/yql.rb
-@@ -1,4 +1,4 @@
+@@ -1,4 +1,5 @@
 -#!/usr/bin/env ruby -rubygems
 +#!/usr/bin/ruby1.8
++# Debian maintainer: removed unsupported option -rubygems and use ruby1.8
  
  # Sample queries:
  #  ./yql.rb --consumer-key <key> --consumer-secret <secret> "show tables"

Modified: trunk/liboauth-ruby/debian/rules
===================================================================
--- trunk/liboauth-ruby/debian/rules	2010-03-03 05:35:14 UTC (rev 4871)
+++ trunk/liboauth-ruby/debian/rules	2010-03-03 05:35:56 UTC (rev 4872)
@@ -6,15 +6,13 @@
 
 DEB_INSTALL_DOCS_liboauth-ruby += README.rdoc
 DEB_INSTALL_DOCS_liboauth-ruby-doc += README.rdoc
+DEB_INSTALL_CHANGELOGS_liboauth-ruby1.8 := History.txt
 
-install/liboauth-ruby1.8::
-	dh_installchangelogs -pliboauth-ruby1.8 History.txt
-
 get-orig-source:
 	-uscan --download --verbose
 
 help2man:
-	echo "NB: Extra Build-Depends to use this rule; libhmac-ruby, help2man"
+	echo "NB: Extra Build-Depends to use this target; libhmac-ruby, help2man"
 	rm -f debian/oauth.1
 	/usr/bin/help2man -N -S 'Debian GNU/Linux' -o debian/oauth.1 \
     debian/help2man/oauth -n 'CLI for the OAuth Ruby Library'