[DRE-commits] r5070 - in trunk/libopenid-ruby/debian: . patches source

[Paul van Tilburg]

Author: paulvt
Date: 2010-04-09 21:36:22 +0000 (Fri, 09 Apr 2010)
New Revision: 5070

Added:
   trunk/libopenid-ruby/debian/source/
   trunk/libopenid-ruby/debian/source/format
Removed:
   trunk/libopenid-ruby/debian/patches/10-use-locally-installed-hmac.diff
Modified:
   trunk/libopenid-ruby/debian/changelog
   trunk/libopenid-ruby/debian/control
   trunk/libopenid-ruby/debian/rules
Log:
* debian/control: 
  - Added Vcs-* fields.
* debian/control:
  - Bumped standards-version to 3.8.4; no changes required.
  - Added quilt to the build-depends.
* debian/patches: 
  - Restructured to suit quilt.
* debian/rules:
  - Replaced simple-patchsys.mk by patchsys-quilt.mk.
* debian/source/format:
  - Set the 3.0 (quilt) format for now. 

Modified: trunk/libopenid-ruby/debian/changelog
===================================================================
--- trunk/libopenid-ruby/debian/changelog	2010-04-09 21:18:52 UTC (rev 5069)
+++ trunk/libopenid-ruby/debian/changelog	2010-04-09 21:36:22 UTC (rev 5070)
@@ -1,9 +1,22 @@
-libopenid-ruby (2.1.7debian-2) UNRELEASED; urgency=low
+libopenid-ruby (2.1.8-1) UNRELEASED; urgency=low
 
-  * Added Vcs-* fields.
+  [ Lucas Nussbaum ]
+  * debian/control: 
+    - Added Vcs-* fields.
 
- -- Lucas Nussbaum <lucas at lucas-nussbaum.net>  Sat, 08 Aug 2009 17:39:22 +0200
+  [ Paul van Tilburg ]
+  * debian/control:
+    - Bumped standards-version to 3.8.4; no changes required.
+    - Added quilt to the build-depends.
+  * debian/patches: 
+    - Restructured to suit quilt.
+  * debian/rules:
+    - Replaced simple-patchsys.mk by patchsys-quilt.mk.
+  * debian/source/format:
+    - Set the 3.0 (quilt) format for now. 
 
+ -- Paul van Tilburg <paulvt at debian.org>  Fri, 09 Apr 2010 23:32:14 +0200
+
 libopenid-ruby (2.1.7debian-1) unstable; urgency=low
 
   * new upstream release

Modified: trunk/libopenid-ruby/debian/control
===================================================================
--- trunk/libopenid-ruby/debian/control	2010-04-09 21:18:52 UTC (rev 5069)
+++ trunk/libopenid-ruby/debian/control	2010-04-09 21:36:22 UTC (rev 5070)
@@ -3,9 +3,9 @@
 Priority: optional
 Maintainer: Antonio Terceiro <terceiro at softwarelivre.org>
 Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>, Paul van Tilburg <paulvt at debian.org>, Ryan Niebur <ryanryan52 at gmail.com>
-Build-Depends: ruby-pkg-tools (>= 0.8), cdbs, debhelper (>= 5)
+Build-Depends: ruby-pkg-tools (>= 0.8), cdbs, debhelper (>= 5), quilt
 Build-Depends-Indep: ruby1.8
-Standards-Version: 3.8.2
+Standards-Version: 3.8.4
 Homepage: http://www.openidenabled.com/openid/libraries/ruby
 DM-Upload-Allowed: yes
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-ruby-extras/trunk/libopenid-ruby/

Deleted: trunk/libopenid-ruby/debian/patches/10-use-locally-installed-hmac.diff
===================================================================
--- trunk/libopenid-ruby/debian/patches/10-use-locally-installed-hmac.diff	2010-04-09 21:18:52 UTC (rev 5069)
+++ trunk/libopenid-ruby/debian/patches/10-use-locally-installed-hmac.diff	2010-04-09 21:36:22 UTC (rev 5070)
@@ -1,13 +0,0 @@
---- 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: trunk/libopenid-ruby/debian/rules
===================================================================
--- trunk/libopenid-ruby/debian/rules	2010-04-09 21:18:52 UTC (rev 5069)
+++ trunk/libopenid-ruby/debian/rules	2010-04-09 21:36:22 UTC (rev 5070)
@@ -5,9 +5,8 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 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/patchsys-quilt.mk
 
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-
 clean::
 	rm -rf html
 

Added: trunk/libopenid-ruby/debian/source/format
===================================================================
--- trunk/libopenid-ruby/debian/source/format	                        (rev 0)
+++ trunk/libopenid-ruby/debian/source/format	2010-04-09 21:36:22 UTC (rev 5070)
@@ -0,0 +1 @@
+3.0 (quilt)