[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Please unblock lua-penlight 1.0.2+htmldoc-2 (Closes: 680794)



I've just uploaded version 1.0.2+htmldoc-2 of lua-penlight that fixes
the FTBFS reported by Lucas (#680794).

Here the debdiff. Please give it a freeze exception.

diff -Nru lua-penlight-1.0.2+htmldoc/debian/changelog lua-penlight-1.0.2+htmldoc/debian/changelog
--- lua-penlight-1.0.2+htmldoc/debian/changelog	2012-05-14 10:34:59.000000000 +0200
+++ lua-penlight-1.0.2+htmldoc/debian/changelog	2012-07-10 14:17:15.000000000 +0200
@@ -1,3 +1,10 @@
+lua-penlight (1.0.2+htmldoc-2) unstable; urgency=low
+
+  * Fix test suite: was too strict w.r.t. the specs of Lua 5.1/5.2
+    (Closes: #680794)
+
+ -- Enrico Tassi <gareuselesinge@debian.org>  Mon, 14 May 2012 10:38:58 +0200
+
 lua-penlight (1.0.2+htmldoc-1) unstable; urgency=low
 
   * Include htmldoc tarball
diff -Nru lua-penlight-1.0.2+htmldoc/debian/patches/fix-test-suite-for-5.2 lua-penlight-1.0.2+htmldoc/debian/patches/fix-test-suite-for-5.2
--- lua-penlight-1.0.2+htmldoc/debian/patches/fix-test-suite-for-5.2	1970-01-01 01:00:00.000000000 +0100
+++ lua-penlight-1.0.2+htmldoc/debian/patches/fix-test-suite-for-5.2	2012-07-10 14:16:39.000000000 +0200
@@ -0,0 +1,75 @@
+Index: lua-penlight-1.0.2+htmldoc/tests/test-tablex.lua
+===================================================================
+--- lua-penlight-1.0.2+htmldoc.orig/tests/test-tablex.lua	2012-05-12 13:05:59.000000000 +0200
++++ lua-penlight-1.0.2+htmldoc/tests/test-tablex.lua	2012-07-10 13:20:49.000000000 +0200
+@@ -1,5 +1,6 @@
+ local tablex = require 'pl.tablex'
+ local utils = require ('pl.utils')
++local debug = require 'debug'
+ local L = utils.string_lambda
+ -- bring tablex funtions into global namespace
+ utils.import(tablex)
+@@ -7,6 +8,16 @@
+ 
+ local cmp = deepcompare
+ 
++function asserteq_no_order (x,y)
++    if not compare_no_order(x,y) then
++        local i = debug.getinfo(3)
++        local err = io.stderr
++        err:write(i.short_src..':'..i.currentline..': assertion failed\n')
++        err:write "these lists contained different elements\n"
++        os.exit(1)
++    end
++end
++
+ asserteq(
+ 	copy {10,20,30},
+ 	{10,20,30}
+@@ -22,17 +33,17 @@
+ 	{10,20,30}
+ )
+ 
+-asserteq(
++asserteq_no_order(
+ 	pairmap(L'_',{fred=10,bonzo=20}),
+ 	{'fred','bonzo'}
+ )
+ 
+-asserteq(
++asserteq_no_order(
+ 	pairmap(function(k,v) return v end,{fred=10,bonzo=20}),
+ 	{10,20}
+ )
+ 
+-asserteq(
++asserteq_no_order(
+ 	pairmap(function(i,v) return v,i end,{10,20,30}),
+ 	{10,20,30}
+ )
+Index: lua-penlight-1.0.2+htmldoc/tests/test-text.lua
+===================================================================
+--- lua-penlight-1.0.2+htmldoc.orig/tests/test-text.lua	2012-05-12 13:05:59.000000000 +0200
++++ lua-penlight-1.0.2+htmldoc/tests/test-text.lua	2012-07-10 13:22:37.000000000 +0200
+@@ -1,5 +1,6 @@
+ local T = require 'pl.text'
+ local Template = T.Template
++local OrderedMap = require 'pl.OrderedMap'
+ local asserteq = require 'pl.test'.asserteq
+ 
+ local t1 = Template [[
+@@ -85,12 +86,12 @@
+ ]])
+ 
+ t = [[
+-# for k,v in pairs(T) do
++# for k,v in T:iter() do
+     "$(k)", -- $(v)
+ # end
+ ]]
+ 
+-local Tee = {Dog = 'Bonzo', Cat = 'Felix', Lion = 'Leo'}
++local Tee = OrderedMap{{Dog = 'Bonzo'}, {Cat = 'Felix'}, {Lion = 'Leo'}}
+ 
+ asserteq(template.substitute(t,{T=Tee,_parent=_G}),[[
+     "Dog", -- Bonzo
diff -Nru lua-penlight-1.0.2+htmldoc/debian/patches/series lua-penlight-1.0.2+htmldoc/debian/patches/series
--- lua-penlight-1.0.2+htmldoc/debian/patches/series	2012-05-12 15:44:46.000000000 +0200
+++ lua-penlight-1.0.2+htmldoc/debian/patches/series	2012-07-10 13:05:47.000000000 +0200
@@ -0,0 +1 @@
+fix-test-suite-for-5.2


Reply to: