[DRE-commits] [ruby-ncurses] 06/11: Remove all patches applied upstream

[Per Andersson]

This is an automated email from the git hooks/post-receive script.

avtobiff-guest pushed a commit to branch master
in repository ruby-ncurses.

commit 2b03b04158aaa11f30de9dcad893b83e7f788b20
Author: Per Andersson <avtobiff at gmail.com>
Date:   Tue Jan 21 23:08:12 2014 +0100

    Remove all patches applied upstream
---
 debian/changelog                                |  3 +
 debian/patches/0001-Define-STR2CSTR-macro.patch | 78 -------------------------
 debian/patches/0002-Format-error-string.patch   | 22 -------
 debian/patches/series                           |  2 -
 4 files changed, 3 insertions(+), 102 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8ecb87f..b5b8bdf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 ruby-ncurses (1.4.3+dfsg-1) unstable; urgency=low
 
   * New upstream release
+    + Remove patches applied upstream
+      - Ruby >= 1.9 compatibilit
+      - Formatting error string
   * Changed to new active upstream
     + Updated debian/{control,copyright,watch}
 
diff --git a/debian/patches/0001-Define-STR2CSTR-macro.patch b/debian/patches/0001-Define-STR2CSTR-macro.patch
deleted file mode 100644
index aa3a886..0000000
--- a/debian/patches/0001-Define-STR2CSTR-macro.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From: Per Andersson <avtobiff at gmail.com>
-Date: Mon, 9 Apr 2012 16:49:52 +0200
-Subject: Define STR2CSTR macro
-
-STR2CSTR is removed since Ruby 1.9.0. Define it to make ruby-ncurses
-work for Ruby >= 1.9.0.
----
- compat.h       |    8 ++++++++
- form_wrap.c    |    1 +
- menu_wrap.c    |    1 +
- ncurses_wrap.c |    1 +
- panel_wrap.c   |    1 +
- 5 files changed, 12 insertions(+), 0 deletions(-)
- create mode 100644 compat.h
-
-diff --git a/compat.h b/compat.h
-new file mode 100644
-index 0000000..3d07271
---- /dev/null
-+++ b/compat.h
-@@ -0,0 +1,8 @@
-+#ifndef _COMPAT_H
-+#define _COMPAT_H
-+
-+#ifndef STR2CSTR
-+#define STR2CSTR(x) ({ VALUE *y = (x); StringValuePtr(y); })
-+#endif
-+
-+#endif /* _COMPAT_H */
-diff --git a/form_wrap.c b/form_wrap.c
-index 346d443..c1a9e47 100644
---- a/form_wrap.c
-+++ b/form_wrap.c
-@@ -31,6 +31,7 @@
- 
- #include "form_wrap.h"
- #include "ncurses_wrap.h"
-+#include "compat.h"
- 
- VALUE mForm;
- VALUE cFIELD;
-diff --git a/menu_wrap.c b/menu_wrap.c
-index f76582f..2878723 100644
---- a/menu_wrap.c
-+++ b/menu_wrap.c
-@@ -30,6 +30,7 @@
- 
- #include "menu_wrap.h"
- #include "ncurses_wrap.h"
-+#include "compat.h"
- 
- VALUE mMenu;
- VALUE cITEM;
-diff --git a/ncurses_wrap.c b/ncurses_wrap.c
-index 09609d1..f342c61 100755
---- a/ncurses_wrap.c
-+++ b/ncurses_wrap.c
-@@ -65,6 +65,7 @@
- */
- 
- #include "ncurses_wrap.h"
-+#include "compat.h"
- #ifdef HAVE_LOCALE_H
- #include <locale.h>
- #endif
-diff --git a/panel_wrap.c b/panel_wrap.c
-index 9680b25..53b282b 100644
---- a/panel_wrap.c
-+++ b/panel_wrap.c
-@@ -24,6 +24,7 @@
- 
- #include "panel_wrap.h"
- #include "ncurses_wrap.h"
-+#include "compat.h"
- 
- VALUE mPanel;
- VALUE cPANEL;
--- 
diff --git a/debian/patches/0002-Format-error-string.patch b/debian/patches/0002-Format-error-string.patch
deleted file mode 100644
index 847b770..0000000
--- a/debian/patches/0002-Format-error-string.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Per Andersson <avtobiff at gmail.com>
-Date: Thu, 7 Jun 2012 19:04:54 +0200
-Subject: Format error string.
-
----
- form_wrap.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/form_wrap.c b/form_wrap.c
-index c1a9e47..ad35047 100644
---- a/form_wrap.c
-+++ b/form_wrap.c
-@@ -1132,7 +1132,7 @@ static void* make_arg(va_list* ap) {
- 		  char msg[500];
- 		  snprintf(msg, 500, "The validation functions for this field type need %d additional arguments.",(int)(NUM2INT(argc)-1));
- 		  msg[499]=0;
--		  rb_raise(rb_eArgError, msg);	
-+		  rb_raise(rb_eArgError, "%s", msg);
- 		}
- 	 } 
-   }
--- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index d9e4275..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-Define-STR2CSTR-macro.patch
-0002-Format-error-string.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-ncurses.git