Merge lp:~javier-lopez/ubuntu/trusty/xz-utils/fix-1248044 into lp:ubuntu/trusty/xz-utils

[Javier López]

It has been two years since this bug with a solution was reported, it's already been fixed in Upstream, currently waiting for Debian to packaging a newer release version. In the meantime and if it doesn't get repackaged on time, I though it could be at least been fixed in Ubuntu.

The above change parse correctly newer less output version, and uses the original patch from Jörg-Volker Peetz.

[Martin Pitt (pitti)]

Thanks! Uploaded with a DEP-3 patch header.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-01-03 17:21:16 +0000
+++ debian/changelog	2014-02-09 07:29:17 +0000
@@ -1,3 +1,10 @@
+xz-utils (5.1.1alpha+20120614-2ubuntu2) trusty; urgency=low
+
+  * debian/patches/error-parsing-less.patch. LP: #1248044
+    - parse correctly recent versions of less output
+
+ -- Javier P.L. <[e-mail]>  Sun, 09 Feb 2014 01:21:14 -0600
+
 xz-utils (5.1.1alpha+20120614-2ubuntu1) raring; urgency=low
 
   * Remove build-dependency on perl; we use no non-trivial Perl modules so

=== added file 'debian/patches/error-parsing-less.patch'
--- debian/patches/error-parsing-less.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/error-parsing-less.patch	2014-02-09 07:29:17 +0000
@@ -0,0 +1,14 @@
+## Description: add some description
+## Origin/Author: add some origin or author
+## Bug: bug URL
+--- a/src/scripts/xzless.in
++++ b/src/scripts/xzless.in
+@@ -46,7 +46,7 @@ if test "${LESSMETACHARS+set}" != set; t
+ 	LESSMETACHARS="$space$tab$nl'"';*?"()<>[|&^`#\$%=~'
+ fi
+ 
+-if test "$(less -V | { read ver && echo ${ver#less }; })" -ge 429; then
++if test "$(less -V | { read ver && ver=${ver#less } && echo ${ver%% *}; })" -ge 429; then
+ 	# less 429 or later: LESSOPEN pipe will be used on
+ 	# standard input if $LESSOPEN begins with |-.
+ 	LESSOPEN="|-$xz -cdfq -- %s"

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-09-10 14:35:33 +0000
+++ debian/patches/series	2014-02-09 07:29:17 +0000
@@ -6,3 +6,4 @@
 man-xz-lvv-minver
 xz-lvv-empty-block-minver
 decoder-check-first-0x00
+error-parsing-less.patch