tags 666632 + pending thanks Dear maintainer,
(Cc'ing Uli Schlachter as upstream) I've prepared an NMU for oocairo (versioned as 1.4-1.2) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. Salvatore
diff -Nru oocairo-1.4/debian/changelog oocairo-1.4/debian/changelog
--- oocairo-1.4/debian/changelog 2012-02-19 04:30:43.000000000 +0100
+++ oocairo-1.4/debian/changelog 2012-05-28 07:45:05.000000000 +0200
@@ -1,3 +1,13 @@
+oocairo (1.4-1.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Add 0001-Tests-Fix-for-cairo-1.12.0.patch.
+ Fix FTBFS: "FTBFS: tests failed". Fix for changed behavior of cairo
+ causing the test failure.
+ Thanks to Uli Schlachter <psyc...@znc.in> for the patch (Closes: #666632)
+
+ -- Salvatore Bonaccorso <car...@debian.org> Mon, 28 May 2012 07:25:18 +0200
+
oocairo (1.4-1.1) unstable; urgency=high
* Non-maintainer upload.
diff -Nru oocairo-1.4/debian/patches/0001-Tests-Fix-for-cairo-1.12.0.patch oocairo-1.4/debian/patches/0001-Tests-Fix-for-cairo-1.12.0.patch
--- oocairo-1.4/debian/patches/0001-Tests-Fix-for-cairo-1.12.0.patch 1970-01-01 01:00:00.000000000 +0100
+++ oocairo-1.4/debian/patches/0001-Tests-Fix-for-cairo-1.12.0.patch 2012-05-28 07:45:05.000000000 +0200
@@ -0,0 +1,30 @@
+From d6c087dcf9557ecb16bc4741b2e47de0bb90c14b Mon Sep 17 00:00:00 2001
+From: Uli Schlachter <psyc...@znc.in>
+Date: Fri, 10 Feb 2012 18:09:23 +0100
+Subject: [PATCH] Tests: Fix for cairo 1.12.0
+
+cairo recently (and accidentally?) changed its behavior and now the test fails.
+
+Signed-off-by: Uli Schlachter <psyc...@znc.in>
+---
+ test/surface.lua | 4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/test/surface.lua b/test/surface.lua
+index 73fe9a5..12108b0 100644
+--- a/test/surface.lua
++++ b/test/surface.lua
+@@ -299,7 +299,9 @@ if Cairo.check_version(1, 10, 0) then
+ function test_subsurface()
+ local surface = Cairo.image_surface_create("rgb24", 23, 45)
+ local sub = surface:create_for_rectangle(10, 11, 12, 13)
+- assert_equal("subsurface", sub:get_type())
++ local sub_type = sub:get_type()
++ -- This if is needed because of cairo commit ba855a12e8d686f2137f82d3177
++ assert_true(sub_type == "subsurface" or sub_type == "image")
+ assert_error(function() sub:create_for_rectangle(0, 0, -1, -1) end)
+ end
+ end
+--
+1.7.9.1
+
diff -Nru oocairo-1.4/debian/patches/series oocairo-1.4/debian/patches/series
--- oocairo-1.4/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ oocairo-1.4/debian/patches/series 2012-05-28 07:45:05.000000000 +0200
@@ -0,0 +1 @@
+0001-Tests-Fix-for-cairo-1.12.0.patch
signature.asc
Description: Digital signature
