[DRE-commits] r2745 - in packages/libtermios-ruby/trunk/debian: . patches

[lucas at alioth.debian.org]

Author: lucas
Date: 2008-06-03 08:49:28 +0000 (Tue, 03 Jun 2008)
New Revision: 2745

Added:
   packages/libtermios-ruby/trunk/debian/patches/
   packages/libtermios-ruby/trunk/debian/patches/rb_io_t+ruby1.8.7.patch
   packages/libtermios-ruby/trunk/debian/patches/series
Modified:
   packages/libtermios-ruby/trunk/debian/changelog
   packages/libtermios-ruby/trunk/debian/control
   packages/libtermios-ruby/trunk/debian/rules
Log:
added quilt support, added rb_io_t+ruby1.8.7.patch

Modified: packages/libtermios-ruby/trunk/debian/changelog
===================================================================
--- packages/libtermios-ruby/trunk/debian/changelog	2008-06-02 18:41:23 UTC (rev 2744)
+++ packages/libtermios-ruby/trunk/debian/changelog	2008-06-03 08:49:28 UTC (rev 2745)
@@ -1,8 +1,10 @@
 libtermios-ruby (0.9.5-4) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
+  * Added rb_io_t+ruby1.8.7.patch to build with ruby 1.8.7. Closes: #484186.
+  * Now uses quilt to manage patches.
+  * Added build-dependencies on quilt and patchutils.
 
- -- Lucas Nussbaum <lucas at lucas-nussbaum.net>  Thu, 17 Jan 2008 23:14:22 +0100
+ -- Lucas Nussbaum <lucas at lucas-nussbaum.net>  Tue, 03 Jun 2008 12:11:10 +0200
 
 libtermios-ruby (0.9.5-3) unstable; urgency=low
 

Modified: packages/libtermios-ruby/trunk/debian/control
===================================================================
--- packages/libtermios-ruby/trunk/debian/control	2008-06-02 18:41:23 UTC (rev 2744)
+++ packages/libtermios-ruby/trunk/debian/control	2008-06-03 08:49:28 UTC (rev 2745)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Lucas Nussbaum <lucas at lucas-nussbaum.net>
 Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>, Paul van Tilburg <paulvt at debian.org>
-Build-Depends: debhelper (>>5), cdbs, ruby1.8-dev, ruby1.8, rdoc, graphviz, ruby-pkg-tools
+Build-Depends: debhelper (>>5), cdbs, ruby1.8-dev, ruby1.8, rdoc, graphviz, ruby-pkg-tools, quilt, patchutils
 Standards-Version: 3.7.3
 Homepage: http://arika.org/ruby/termios
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-ruby-extras/packages/libtermios-ruby/trunk/

Added: packages/libtermios-ruby/trunk/debian/patches/rb_io_t+ruby1.8.7.patch
===================================================================
--- packages/libtermios-ruby/trunk/debian/patches/rb_io_t+ruby1.8.7.patch	                        (rev 0)
+++ packages/libtermios-ruby/trunk/debian/patches/rb_io_t+ruby1.8.7.patch	2008-06-03 08:49:28 UTC (rev 2745)
@@ -0,0 +1,54 @@
+only in patch2:
+unchanged:
+--- libtermios-ruby-0.9.5.orig/termios.c
++++ libtermios-ruby-0.9.5/termios.c
+@@ -12,14 +12,14 @@
+ #include <unistd.h>
+ #include <string.h>
+ 
+-#ifdef HAVE_TYPE_RB_IO_T
++#if defined(HAVE_TYPE_RB_IO_T) && !defined(HAVE_MACRO_OPENFILE)
+ typedef rb_io_t OpenFile;
+ #endif
+ 
+-#if defined(HAVE_TYPE_RB_IO_T) ||  defined(HAVE_ST_FD)
+-# define FILENO(fptr) (fptr->fd)
++#if defined(HAVE_ST_FD)
++#define FILENO(fptr) (fptr->fd)
+ #else
+-# define FILENO(fptr) fileno(fptr->f)
++#define FILENO(fptr) fileno(fptr->f)
+ #endif
+ 
+ #define validate_ulong(v) ULONG2NUM(NUM2ULONG(v))
+@@ -229,7 +229,7 @@
+     Check_Type(io,  T_FILE);
+     Check_Type(opt, T_FIXNUM);
+     if (CLASS_OF(param) != cTermios) {
+-	char *type = rb_class2name(CLASS_OF(param));
++	const char *type = rb_class2name(CLASS_OF(param));
+ 	rb_raise(rb_eTypeError, 
+ 		 "wrong argument type %s (expected Termios::Termios)", 
+ 		 type);
+only in patch2:
+unchanged:
+--- libtermios-ruby-0.9.5.orig/extconf.rb
++++ libtermios-ruby-0.9.5/extconf.rb
+@@ -3,8 +3,15 @@
+ if have_header('termios.h') &&
+     have_header('unistd.h')
+ 
+-  unless RUBY_VERSION < '1.7' || have_type("rb_io_t", ["ruby.h", "rubyio.h"])
+-    have_struct_member("OpenFile", "fd", ["ruby.h", "rubyio.h"])
++  if RUBY_VERSION >= '1.7'
++    if have_type("rb_io_t", ["ruby.h", "rubyio.h"])
++      have_struct_member("rb_io_t", "fd", ["ruby.h", "rubyio.h"])
++    else
++      have_struct_member("OpenFile", "fd", ["ruby.h", "rubyio.h"])
++    end
++    if have_macro("OpenFile", ["ruby.h", "rubyio.h"])
++      $defs.push("-DHAVE_MACRO_OPENFILE")
++    end
+   end
+ 
+   create_makefile('termios')

Added: packages/libtermios-ruby/trunk/debian/patches/series
===================================================================
--- packages/libtermios-ruby/trunk/debian/patches/series	                        (rev 0)
+++ packages/libtermios-ruby/trunk/debian/patches/series	2008-06-03 08:49:28 UTC (rev 2745)
@@ -0,0 +1 @@
+rb_io_t+ruby1.8.7.patch

Modified: packages/libtermios-ruby/trunk/debian/rules
===================================================================
--- packages/libtermios-ruby/trunk/debian/rules	2008-06-02 18:41:23 UTC (rev 2744)
+++ packages/libtermios-ruby/trunk/debian/rules	2008-06-03 08:49:28 UTC (rev 2745)
@@ -4,3 +4,4 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/ruby-pkg-tools/1/class/ruby-extconf-rb.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk