Package: oocairo Version: 1.3-2 Severity: normal Tags: patch pending Dear maintainer,
I've prepared an NMU for oocairo (versioned as 1.3-2.1) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Cheers Luk
diff -Nru oocairo-1.3/debian/changelog oocairo-1.3/debian/changelog --- oocairo-1.3/debian/changelog 2011-05-09 14:57:18.000000000 +0200 +++ oocairo-1.3/debian/changelog 2011-07-01 19:58:22.000000000 +0200 @@ -1,3 +1,11 @@ +oocairo (1.3-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Don't ship .la files (Closes: #622466). + * Fix build against cairo 1.10 (Closes: #626747). + + -- Luk Claes <l...@debian.org> Fri, 01 Jul 2011 19:57:56 +0200 + oocairo (1.3-2) unstable; urgency=low * Add a dependency on -dev package on the library package. diff -Nru oocairo-1.3/debian/liblua5.1-oocairo-dev.install oocairo-1.3/debian/liblua5.1-oocairo-dev.install --- oocairo-1.3/debian/liblua5.1-oocairo-dev.install 2010-11-04 11:32:54.000000000 +0100 +++ oocairo-1.3/debian/liblua5.1-oocairo-dev.install 2011-07-01 19:52:56.000000000 +0200 @@ -1,4 +1,3 @@ usr/include usr/lib/pkgconfig usr/lib/liboocairo.so -usr/lib/liboocairo.la \ No newline at end of file diff -Nru oocairo-1.3/debian/patches/debian-changes-1.3-2.1 oocairo-1.3/debian/patches/debian-changes-1.3-2.1 --- oocairo-1.3/debian/patches/debian-changes-1.3-2.1 1970-01-01 01:00:00.000000000 +0100 +++ oocairo-1.3/debian/patches/debian-changes-1.3-2.1 2011-07-01 19:58:57.000000000 +0200 @@ -0,0 +1,64 @@ +Description: Upstream changes introduced in version 1.3-2.1 + This patch has been created by dpkg-source during the package build. + Here's the last changelog entry, hopefully it gives details on why + those changes were made: + . + oocairo (1.3-2.1) unstable; urgency=low + . + * Non-maintainer upload. + * Don't ship .la files (Closes: #622466). + * Fix build against cairo 1.10 (Closes: #626747). + . + The person named in the Author field signed this changelog entry. +Author: Luk Claes <l...@debian.org> +Bug-Debian: http://bugs.debian.org/622466 +Bug-Debian: http://bugs.debian.org/626747 + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: <vendor|upstream|other>, <url of original patch> +Bug: <url in upstream bugtracker> +Bug-Debian: http://bugs.debian.org/<bugnumber> +Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> +Forwarded: <no|not-needed|url proving that it has been forwarded> +Reviewed-By: <name and email of someone who approved the patch> +Last-Update: <YYYY-MM-DD> + +--- oocairo-1.3.orig/obj_font_face.c ++++ oocairo-1.3/obj_font_face.c +@@ -102,19 +102,13 @@ user_font_text_to_glyphs (cairo_scaled_f + if (lua_isnil(info->L, -2)) + *num_glyphs = -1; + else { +- if (*glyphs) { +- GLYPHS_FREE(*glyphs); +- *glyphs = 0; +- } ++ *glyphs = 0; + from_lua_glyph_array(info->L, glyphs, num_glyphs, + lua_gettop(info->L) - 1); + } + + if (clusters && !lua_isnil(info->L, -1)) { +- if (*clusters) { +- cairo_text_cluster_free(*clusters); +- *clusters = 0; +- } ++ *clusters = 0; + from_lua_clusters_table(info->L, clusters, num_clusters, cluster_flags, + lua_gettop(info->L)); + } +--- oocairo-1.3.orig/test/scaled_font.lua ++++ oocairo-1.3/test/scaled_font.lua +@@ -31,7 +31,7 @@ function test_create () + local font = mk_scaled_font(face, 23) + assert_userdata(font) + assert_equal("cairo scaled font object", font._NAME) +- assert_true(face == font:get_font_face()) ++ assert_equal("cairo font face object", font:get_font_face()._NAME) + assert_string(font:get_type()) + end + diff -Nru oocairo-1.3/debian/patches/series oocairo-1.3/debian/patches/series --- oocairo-1.3/debian/patches/series 2011-05-09 15:06:54.000000000 +0200 +++ oocairo-1.3/debian/patches/series 2011-07-01 19:58:57.000000000 +0200 @@ -1 +1,2 @@ debian-changes-1.3-2 +debian-changes-1.3-2.1
