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

[Paul van Tilburg]

Author: paulvt
Date: 2009-05-05 10:07:26 +0000 (Tue, 05 May 2009)
New Revision: 3502

Removed:
   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
Log:
* New upstream release.
* debian/patches:
  - Dropped patch 01_fix-st.h-ruby1.9-paths: fixed by upstream. 
* debian/control:
  - Bumped standards version to 3.8.1; no changes required.
  - Added ${misc:Depends} to the depends of libcairo-ruby (binary).

Modified: packages/libcairo-ruby/trunk/debian/changelog
===================================================================
--- packages/libcairo-ruby/trunk/debian/changelog	2009-05-03 10:24:20 UTC (rev 3501)
+++ packages/libcairo-ruby/trunk/debian/changelog	2009-05-05 10:07:26 UTC (rev 3502)
@@ -1,13 +1,18 @@
-libcairo-ruby (1.6.3-2) UNRELEASED; urgency=low
+libcairo-ruby (1.8.0-1) UNRELEASED; urgency=low
 
-  [ Paul van Tilburg ]
-  * NOT RELEASED YET
-
   [ Gunnar Wolf ]
   * Changed section to Ruby as per ftp-masters' request
 
- -- Gunnar Wolf <gwolf at debian.org>  Tue, 21 Apr 2009 15:54:30 -0500
+  [ Paul van Tilburg ]
+  * New upstream release.
+  * debian/patches:
+    - Dropped patch 01_fix-st.h-ruby1.9-paths: fixed by upstream. 
+  * debian/control:
+    - Bumped standards version to 3.8.1; no changes required.
+    - Added ${misc:Depends} to the depends of libcairo-ruby (binary).
 
+ -- Paul van Tilburg <paulvt at debian.org>  Tue, 05 May 2009 11:45:53 +0200
+
 libcairo-ruby (1.6.3-1) unstable; urgency=low
 
   [ Paul van Tilburg ]

Modified: packages/libcairo-ruby/trunk/debian/control
===================================================================
--- packages/libcairo-ruby/trunk/debian/control	2009-05-03 10:24:20 UTC (rev 3501)
+++ packages/libcairo-ruby/trunk/debian/control	2009-05-05 10:07:26 UTC (rev 3502)
@@ -4,14 +4,14 @@
 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.8.0
+Standards-Version: 3.8.1
 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/
 
 Package: libcairo-ruby
 Architecture: all
-Depends: libcairo-ruby1.8
+Depends: libcairo-ruby1.8, ${misc:Depends}
 Description: Cairo bindings for the Ruby language
  Cairo is a multi-platform library providing anti-aliased vector-based
  rendering for multiple target backends. This package contains libraries for

Deleted: 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	2009-05-03 10:24:20 UTC (rev 3501)
+++ packages/libcairo-ruby/trunk/debian/patches/01_fix-st.h-ruby1.9-paths.diff	2009-05-05 10:07:26 UTC (rev 3502)
@@ -1,70 +0,0 @@
-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
-