[DRE-commits] r5879 - in trunk/libstomp-ruby/debian: . patches
Laurent Arnoud
spk-guest at alioth.debian.org
Mon Sep 27 22:29:59 UTC 2010
Author: spk-guest
Date: 2010-09-27 22:29:59 +0000 (Mon, 27 Sep 2010)
New Revision: 5879
Added:
trunk/libstomp-ruby/debian/patches/
trunk/libstomp-ruby/debian/patches/case_statement_compatible_1.9.2.patch
trunk/libstomp-ruby/debian/patches/getc_returns_a_string_1.9.patch
trunk/libstomp-ruby/debian/patches/series
Modified:
trunk/libstomp-ruby/debian/changelog
trunk/libstomp-ruby/debian/control
trunk/libstomp-ruby/debian/rules
Log:
Fix require for ruby 1.9.2 (Closes: #593079).
Signed-off-by: Laurent Arnoud <laurent at spkdev.net>
Modified: trunk/libstomp-ruby/debian/changelog
===================================================================
--- trunk/libstomp-ruby/debian/changelog 2010-09-27 00:27:43 UTC (rev 5878)
+++ trunk/libstomp-ruby/debian/changelog 2010-09-27 22:29:59 UTC (rev 5879)
@@ -1,3 +1,10 @@
+libstomp-ruby (1.0.4-3) UNRELEASED; urgency=low
+
+ * Team upload.
+ * Fix require for ruby 1.9.2 (Closes: #593079).
+
+ -- Laurent Arnoud <laurent at spkdev.net> Tue, 28 Sep 2010 00:25:39 +0200
+
libstomp-ruby (1.0.4-2) unstable; urgency=low
* Bump standards version to 3.8.4
Modified: trunk/libstomp-ruby/debian/control
===================================================================
--- trunk/libstomp-ruby/debian/control 2010-09-27 00:27:43 UTC (rev 5878)
+++ trunk/libstomp-ruby/debian/control 2010-09-27 22:29:59 UTC (rev 5879)
@@ -2,7 +2,7 @@
Section: ruby
Priority: extra
Maintainer: Bryan McLellan <btm at loftninjas.org>
-Build-Depends: cdbs, debhelper (>= 5.0.0), ruby-pkg-tools (>= 0.14)
+Build-Depends: cdbs, debhelper (>= 5.0.0), ruby-pkg-tools (>= 0.14), quilt
Build-Depends-Indep: graphviz, ruby1.8, ruby1.9.1
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-ruby-extras/trunk/libstomp-ruby/
Vcs-Svn: svn://svn.debian.org/svn/pkg-ruby-extras/trunk/libstomp-ruby/
@@ -15,10 +15,10 @@
Depends: libstomp-ruby1.8, ${misc:Depends}
Suggests: libstomp-ruby-doc
Description: Ruby bindings for the stomp messaging protocol
- Stomp is a text-oriented wire protocol for messaging (MOM/MQ/JMS)
+ Stomp is a text-oriented wire protocol for messaging (MOM/MQ/JMS)
type systems. This library provides two useful interfaces, a low-
- level class, Stomp::Connection, which is a basic protocol
- implementation, and Stomp::Client, which is designed as a higher
+ level class, Stomp::Connection, which is a basic protocol
+ implementation, and Stomp::Client, which is designed as a higher
level convenience API.
.
This package is a dependency package, which depends on the package
@@ -29,10 +29,10 @@
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.8
Description: Ruby 1.8 bindings for the stomp messaging protocol
- Stomp is a text-oriented wire protocol for messaging (MOM/MQ/JMS)
+ Stomp is a text-oriented wire protocol for messaging (MOM/MQ/JMS)
type systems. This library provides two useful interfaces, a low-
- level class, Stomp::Connection, which is a basic protocol
- implementation, and Stomp::Client, which is designed as a higher
+ level class, Stomp::Connection, which is a basic protocol
+ implementation, and Stomp::Client, which is designed as a higher
level convenience API.
.
This package contains stomp libraries for Ruby 1.8.
@@ -41,10 +41,10 @@
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.9.1
Description: Ruby 1.9.1 bindings for the stomp messaging protocol
- Stomp is a text-oriented wire protocol for messaging (MOM/MQ/JMS)
+ Stomp is a text-oriented wire protocol for messaging (MOM/MQ/JMS)
type systems. This library provides two useful interfaces, a low-
- level class, Stomp::Connection, which is a basic protocol
- implementation, and Stomp::Client, which is designed as a higher
+ level class, Stomp::Connection, which is a basic protocol
+ implementation, and Stomp::Client, which is designed as a higher
level convenience API.
.
This package contains stomp libraries for Ruby 1.9.1.
@@ -54,10 +54,10 @@
Architecture: all
Depends: libstomp-ruby, ${misc:Depends}
Description: Documentation for libstomp-ruby
- Stomp is a text-oriented wire protocol for messaging (MOM/MQ/JMS)
+ Stomp is a text-oriented wire protocol for messaging (MOM/MQ/JMS)
type systems. This library provides two useful interfaces, a low-
- level class, Stomp::Connection, which is a basic protocol
- implementation, and Stomp::Client, which is designed as a higher
+ level class, Stomp::Connection, which is a basic protocol
+ implementation, and Stomp::Client, which is designed as a higher
level convenience API.
.
This package provides generated HTML documentation for libstomp-ruby.
Added: trunk/libstomp-ruby/debian/patches/case_statement_compatible_1.9.2.patch
===================================================================
--- trunk/libstomp-ruby/debian/patches/case_statement_compatible_1.9.2.patch (rev 0)
+++ trunk/libstomp-ruby/debian/patches/case_statement_compatible_1.9.2.patch 2010-09-27 22:29:59 UTC (rev 5879)
@@ -0,0 +1,23 @@
+From: Marius Mathiesen
+Description: Making 1.9 compatible
+Origin: upstream, http://github.com/js/stomp/commit/a778661ce9c074ae5b415658d17dd2639f5c9c05
+Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=593079
+--- a/lib/stomp.rb
++++ b/lib/stomp.rb
+@@ -286,13 +286,13 @@ module Stomp
+ while @running
+ message = @connection.receive
+ case
+- when message == NIL:
++ when message == NIL
+ break
+- when message.command == 'MESSAGE':
++ when message.command == 'MESSAGE'
+ if listener = @listeners[message.headers['destination']]
+ listener.call(message)
+ end
+- when message.command == 'RECEIPT':
++ when message.command == 'RECEIPT'
+ if listener = @receipt_listeners[message.headers['receipt-id']]
+ listener.call(message)
+ end
Added: trunk/libstomp-ruby/debian/patches/getc_returns_a_string_1.9.patch
===================================================================
--- trunk/libstomp-ruby/debian/patches/getc_returns_a_string_1.9.patch (rev 0)
+++ trunk/libstomp-ruby/debian/patches/getc_returns_a_string_1.9.patch 2010-09-27 22:29:59 UTC (rev 5879)
@@ -0,0 +1,27 @@
+From: Johan Sørensen <johan at johansorensen.com>
+Subject: Further Ruby 1.9 support: IO#getc returns a string, instead of a char in 1.9
+Origin: upstream, http://github.com/js/stomp/commit/2971a7922f64052c5b308f2a4a92080d7c8b046b
+--- a/lib/stomp.rb
++++ b/lib/stomp.rb
+@@ -194,12 +194,18 @@ module Stomp
+
+ if (m.headers['content-length'])
+ m.body = s.read m.headers['content-length'].to_i
+- c = s.getc
++ c = RUBY_VERSION > '1.9' ? s.getc.ord : s.getc
+ raise "Invalid content length received" unless c == 0
+ else
+ m.body = ''
+- until (c = s.getc) == 0
+- m.body << c.chr
++ if RUBY_VERSION > '1.9'
++ until (c = s.getc.ord) == 0
++ m.body << c.chr
++ end
++ else
++ until (c = s.getc) == 0
++ m.body << c.chr
++ end
+ end
+ end
+ #c = s.getc
Added: trunk/libstomp-ruby/debian/patches/series
===================================================================
--- trunk/libstomp-ruby/debian/patches/series (rev 0)
+++ trunk/libstomp-ruby/debian/patches/series 2010-09-27 22:29:59 UTC (rev 5879)
@@ -0,0 +1,2 @@
+getc_returns_a_string_1.9.patch
+case_statement_compatible_1.9.2.patch
Modified: trunk/libstomp-ruby/debian/rules
===================================================================
--- trunk/libstomp-ruby/debian/rules 2010-09-27 00:27:43 UTC (rev 5878)
+++ trunk/libstomp-ruby/debian/rules 2010-09-27 22:29:59 UTC (rev 5879)
@@ -1,4 +1,5 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/ruby-pkg-tools/1/class/ruby-setup-rb.mk
More information about the Pkg-ruby-extras-commits
mailing list