diff -Nru xz-utils-5.1.1alpha+20120614/debian/changelog xz-utils-5.1.1alpha+20120614/debian/changelog --- xz-utils-5.1.1alpha+20120614/debian/changelog 2013-01-03 17:21:17.000000000 +0000 +++ xz-utils-5.1.1alpha+20120614/debian/changelog 2014-02-12 15:04:33.000000000 +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. 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 diff -Nru xz-utils-5.1.1alpha+20120614/debian/patches/error-parsing-less.patch xz-utils-5.1.1alpha+20120614/debian/patches/error-parsing-less.patch --- xz-utils-5.1.1alpha+20120614/debian/patches/error-parsing-less.patch 1970-01-01 00:00:00.000000000 +0000 +++ xz-utils-5.1.1alpha+20120614/debian/patches/error-parsing-less.patch 2014-02-12 15:05:52.000000000 +0000 @@ -0,0 +1,15 @@ +Description: xzless: Make "less -V" parsing more robust +Origin: lp:~chilicuil/ubuntu/trusty/xz-utils/fix-1248044 +Bug-Ubuntu: https://launchpad.net/bugs/1248044 + +--- 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" diff -Nru xz-utils-5.1.1alpha+20120614/debian/patches/series xz-utils-5.1.1alpha+20120614/debian/patches/series --- xz-utils-5.1.1alpha+20120614/debian/patches/series 2012-10-11 22:38:38.000000000 +0000 +++ xz-utils-5.1.1alpha+20120614/debian/patches/series 2014-02-12 15:04:33.000000000 +0000 @@ -6,3 +6,4 @@ man-xz-lvv-minver xz-lvv-empty-block-minver decoder-check-first-0x00 +error-parsing-less.patch