[DRE-commits] r2931 - in packages/libcairo-ruby/trunk/debian: . patches

[paulvt at alioth.debian.org]

Author: paulvt
Date: 2008-08-10 13:27:25 +0000 (Sun, 10 Aug 2008)
New Revision: 2931

Added:
   packages/libcairo-ruby/trunk/debian/patches/
   packages/libcairo-ruby/trunk/debian/patches/01_fix-st.h-ruby1.9-paths.diff
Modified:
   packages/libcairo-ruby/trunk/debian/changelog
   packages/libcairo-ruby/trunk/debian/control
   packages/libcairo-ruby/trunk/debian/copyright
Log:
* Added patch 01_fix-st.h-ruby1.9-paths.
* Fixed the too long line in debian/copyright.
* Bumped standards version to 3.8.0; no changes required.

Modified: packages/libcairo-ruby/trunk/debian/changelog
===================================================================
--- packages/libcairo-ruby/trunk/debian/changelog	2008-08-09 16:24:43 UTC (rev 2930)
+++ packages/libcairo-ruby/trunk/debian/changelog	2008-08-10 13:27:25 UTC (rev 2931)
@@ -1,15 +1,18 @@
-libcairo-ruby (1.6.3-1) UNRELEASED; urgency=low
+libcairo-ruby (1.6.3-1) unstable; urgency=low
 
   [ Paul van Tilburg ]
   * New upstream release.
   * Dropped patch 01_fix-ftools-extconf: fixed upsteam.
+  * Added patch 01_fix-st.h-ruby1.9-paths.
   * Bumped build-dependancy on libcairo2 to >= 1.6.0. 
+  * Fixed the too long line in debian/copyright.
+  * Bumped standards version to 3.8.0; no changes required.
 
   [ Lucas Nussbaum ]
   * Build-depend on r-p-t >= 0.14, to fix the ruby1.9
     libs install problem.
 
- -- Paul van Tilburg <paulvt at debian.org>  Wed, 30 Jul 2008 21:58:20 +0200
+ -- Paul van Tilburg <paulvt at debian.org>  Sun, 10 Aug 2008 15:24:03 +0200
 
 libcairo-ruby (1.5.1-1) unstable; urgency=low
 

Modified: packages/libcairo-ruby/trunk/debian/control
===================================================================
--- packages/libcairo-ruby/trunk/debian/control	2008-08-09 16:24:43 UTC (rev 2930)
+++ packages/libcairo-ruby/trunk/debian/control	2008-08-10 13:27:25 UTC (rev 2931)
@@ -4,7 +4,7 @@
 Maintainer: Paul van Tilburg <paulvt at debian.org>
 Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Build-Depends: debhelper (>> 5), ruby, ruby1.8, ruby1.8-dev, ruby1.9, ruby1.9-dev, cdbs, ruby-pkg-tools (>= 0.14), libcairo2-dev (>= 1.6.0)
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 Homepage: http://cairographics.org/rcairo/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-ruby-extras/packages/libcairo-ruby/trunk/
 Vcs-Svn: svn://svn.debian.org/pkg-ruby-extras/packages/libcairo-ruby/trunk/

Modified: packages/libcairo-ruby/trunk/debian/copyright
===================================================================
--- packages/libcairo-ruby/trunk/debian/copyright	2008-08-09 16:24:43 UTC (rev 2930)
+++ packages/libcairo-ruby/trunk/debian/copyright	2008-08-10 13:27:25 UTC (rev 2931)
@@ -1,7 +1,6 @@
+This package originally Debianised by 
+Thierry Reding <thierry at doppeltgemoppelt.de>, on November 20th, 2005.
 
-This package originally Debianised by Thierry Reding <thierry at doppeltgemoppelt.de>,
-on November 20th, 2005.
-
 Originally obtained from <http://cairographics.org/rcairo>.
 
 Copyright:

Added: packages/libcairo-ruby/trunk/debian/patches/01_fix-st.h-ruby1.9-paths.diff
===================================================================
--- packages/libcairo-ruby/trunk/debian/patches/01_fix-st.h-ruby1.9-paths.diff	                        (rev 0)
+++ packages/libcairo-ruby/trunk/debian/patches/01_fix-st.h-ruby1.9-paths.diff	2008-08-10 13:27:25 UTC (rev 2931)
@@ -0,0 +1,70 @@
+Hi,
+
+In <20080801130838.GA7296 at power.luon.net>
+  "Re: 2 rcairo issues" on Fri, 1 Aug 2008 15:08:38 +0200,
+  Paul van Tilburg <paulvt at debian.org> wrote:
+
+> My question is:  is this an error in extconf.rb or mkmf.rb, or is st.h
+> in our ruby1.9 setup incorrectly installed (and shouldn't it have been
+> put under a ruby/ subdir) or is this all a new convention and do we need
+> to work around it in the code?
+
+No. st.h should be installed in ruby/ sub directory since
+1.9.
+
+I've fixed it in HEAD.
+
+Here is a patch:
+
+Index: extconf.rb
+===================================================================
+RCS file: /cvs/cairo/rcairo/extconf.rb,v
+retrieving revision 1.22
+retrieving revision 1.23
+diff -u -p -r1.22 -r1.23
+--- extconf.rb	12 Jun 2008 14:28:35 -0000	1.22
++++ extconf.rb	2 Aug 2008 01:29:07 -0000	1.23
+@@ -80,6 +80,7 @@ major, minor, micro = 1, 2, 0
+ 
+ PKGConfig.have_package(pkg, major, minor, micro) or exit 1
+ 
++have_header("ruby/st.h") unless have_macro("HAVE_RUBY_ST_H", "ruby.h")
+ have_func("rb_errinfo", "ruby.h")
+ have_type("enum ruby_value_type", "ruby.h")
+ 
+Index: src/rb_cairo_surface.c
+===================================================================
+RCS file: /cvs/cairo/rcairo/src/rb_cairo_surface.c,v
+retrieving revision 1.36
+retrieving revision 1.37
+diff -u -p -r1.36 -r1.37
+--- src/rb_cairo_surface.c	20 Jun 2008 02:01:53 -0000	1.36
++++ src/rb_cairo_surface.c	2 Aug 2008 01:29:08 -0000	1.37
+@@ -3,7 +3,7 @@
+  * Ruby Cairo Binding
+  *
+  * $Author: kou $
+- * $Date: 2008-06-20 02:01:53 $
++ * $Date: 2008-08-02 01:29:08 $
+  *
+  * Copyright 2005 Øyvind Kolås <pippin at freedesktop.org>
+  * Copyright 2004-2005 MenTaLguY <mental at rydia.com>
+@@ -15,7 +15,11 @@
+ #include "rb_cairo.h"
+ #include "rb_cairo_private.h"
+ 
+-#include <st.h>
++#ifdef HAVE_RUBY_ST_H
++#  include <ruby/st.h>
++#else
++#  include <st.h>
++#endif
+ 
+ #ifdef CAIRO_HAS_WIN32_SURFACE
+ #  define OpenFile OpenFile_win32
+
+
+Thanks,
+--
+kou
+