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

[Antonio Terceiro]

Author: terceiro-guest
Date: 2010-04-12 01:29:42 +0000 (Mon, 12 Apr 2010)
New Revision: 5102

Added:
   trunk/libopenid-ruby/debian/patches/series
   trunk/libopenid-ruby/debian/patches/use-system-installed-hmac
Modified:
   trunk/libopenid-ruby/debian/changelog
   trunk/libopenid-ruby/debian/repack.sh
Log:
Preparing upload of 2.1.8debian-1



Modified: trunk/libopenid-ruby/debian/changelog
===================================================================
--- trunk/libopenid-ruby/debian/changelog	2010-04-10 21:15:52 UTC (rev 5101)
+++ trunk/libopenid-ruby/debian/changelog	2010-04-12 01:29:42 UTC (rev 5102)
@@ -1,4 +1,4 @@
-libopenid-ruby (2.1.8-1) UNRELEASED; urgency=low
+libopenid-ruby (2.1.8debian-1) unstable; urgency=low
 
   [ Lucas Nussbaum ]
   * debian/control: 
@@ -15,8 +15,14 @@
   * 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
+  [ Antonio Terceiro ]
+  * debian/repack.sh:
+   - Fix location of repackaged tarball
+   - Remove original tarball after repackaging, but keep the originally
+     downloaded file.
 
+ -- Antonio Terceiro <terceiro at softwarelivre.org>  Sun, 11 Apr 2010 20:59:44 -0300
+
 libopenid-ruby (2.1.7debian-1) unstable; urgency=low
 
   * new upstream release

Added: trunk/libopenid-ruby/debian/patches/series
===================================================================
--- trunk/libopenid-ruby/debian/patches/series	                        (rev 0)
+++ trunk/libopenid-ruby/debian/patches/series	2010-04-12 01:29:42 UTC (rev 5102)
@@ -0,0 +1 @@
+use-system-installed-hmac

Added: trunk/libopenid-ruby/debian/patches/use-system-installed-hmac
===================================================================
--- trunk/libopenid-ruby/debian/patches/use-system-installed-hmac	                        (rev 0)
+++ trunk/libopenid-ruby/debian/patches/use-system-installed-hmac	2010-04-12 01:29:42 UTC (rev 5102)
@@ -0,0 +1,15 @@
+Index: libopenid-ruby-2.1.8debian.orig/lib/openid/cryptutil.rb
+===================================================================
+--- libopenid-ruby-2.1.8debian.orig.orig/lib/openid/cryptutil.rb	2010-04-11 22:20:42.000000000 -0300
++++ libopenid-ruby-2.1.8debian.orig/lib/openid/cryptutil.rb	2010-04-11 22:20:53.000000000 -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/repack.sh
===================================================================
--- trunk/libopenid-ruby/debian/repack.sh	2010-04-10 21:15:52 UTC (rev 5101)
+++ trunk/libopenid-ruby/debian/repack.sh	2010-04-12 01:29:42 UTC (rev 5102)
@@ -36,7 +36,9 @@
 # Using a pipe hides tar errors!
 tar cfC "$DIR/repacked.tar" "$DIR" "$REPACK_DIR"
 gzip -9 < "$DIR/repacked.tar" > "$DIR/repacked.tar.gz"
-FILE="../${PKG}_${VER}.orig.tar.gz"
-mv "$DIR/repacked.tar.gz" "$FILE"
+RESULTING_FILE="$(dirname $FILE)/${PKG}_${VER}.orig.tar.gz"
+mv "$DIR/repacked.tar.gz" "$RESULTING_FILE"
+rm -f "$FILE"
 
 echo "*** $FILE repackaged"
+echo "*** Please note that the upstream version must be $VER since we are repackaging the tarball!"