[DRE-commits] [SCM] ruby-eventmachine.git branch, master, updated. debian/0.12.10-3-8-g6baa984

[Praveen Arimbrathodiyil]

The following commit has been merged in the master branch:
commit 75f0ec289bc863c4d69dcea2d22bac3282c5be9e
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Nov 23 22:25:39 2012 +0530

    remove already applied patch

diff --git a/debian/patches/0001-Format-error-strings-safely.patch b/debian/patches/0001-Format-error-strings-safely.patch
deleted file mode 100644
index e288efd..0000000
--- a/debian/patches/0001-Format-error-strings-safely.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: Per Andersson <avtobiff at gmail.com>
-Date: Sat, 9 Jun 2012 00:48:17 +0200
-Subject: Format error strings safely.
-
----
- ext/rubymain.cpp |    8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/ext/rubymain.cpp b/ext/rubymain.cpp
-index e6b39e4..53510b5 100644
---- a/ext/rubymain.cpp
-+++ b/ext/rubymain.cpp
-@@ -499,7 +499,7 @@ static VALUE t_connect_server (VALUE self, VALUE server, VALUE port)
- 			rb_raise (EM_eConnectionError, "no connection");
- 		return ULONG2NUM (f);
- 	} catch (std::runtime_error e) {
--		rb_raise (EM_eConnectionError, e.what());
-+		rb_raise (EM_eConnectionError, "%s", e.what());
- 	}
- 	return Qnil;
- }
-@@ -520,7 +520,7 @@ static VALUE t_bind_connect_server (VALUE self, VALUE bind_addr, VALUE bind_port
- 			rb_raise (EM_eConnectionError, "no connection");
- 		return ULONG2NUM (f);
- 	} catch (std::runtime_error e) {
--		rb_raise (EM_eConnectionError, e.what());
-+		rb_raise (EM_eConnectionError, "%s", e.what());
- 	}
- 	return Qnil;
- }
-@@ -805,7 +805,7 @@ static VALUE t_watch_filename (VALUE self, VALUE fname)
- 	try {
- 		return ULONG2NUM(evma_watch_filename(StringValuePtr(fname)));
- 	} catch (std::runtime_error e) {
--		rb_raise (EM_eUnsupported, e.what());
-+		rb_raise (EM_eUnsupported, "%s", e.what());
- 	}
- 	return Qnil;
- }
-@@ -831,7 +831,7 @@ static VALUE t_watch_pid (VALUE self, VALUE pid)
- 	try {
- 		return ULONG2NUM(evma_watch_pid(NUM2INT(pid)));
- 	} catch (std::runtime_error e) {
--		rb_raise (EM_eUnsupported, e.what());
-+		rb_raise (EM_eUnsupported, "%s", e.what());
- 	}
- 	return Qnil;
- }
--- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 235c4c1..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Format-error-strings-safely.patch

-- 
ruby-eventmachine.git