Merge branch 'experimental' into pu
* experimental:
xz-utils/README.Debian: flesh out "differences from upstream"
liblzma: Check that the first byte of range encoded data is 0x00.
xz: Fix the version number printed by xz -lvv.
xz: Update the man page about the new field in --robot -lvv.
xz: Update man page date to match the latest update.
debian/control: xz-utils is not pseudo-essential any more
xz-utils/README.Debian: Document patches
Conflicts:
debian/changelog
debian/xz-utils.README.Debian
diff --git a/debian/changelog b/debian/changelog
index dfdd474..4ea6932 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,18 +16,31 @@
-- Jonathan Nieder <jrnieder@gmail.com> Mon, 28 May 2012 20:46:41 -0500
-xz-utils (5.1.2alpha-1) experimental; urgency=low
+xz-utils (5.1.2alpha-0.1) experimental; urgency=low
* New upstream alpha release.
* Remove support for the new --block-list option to give the
interface time to evolve.
* debian/rules clean: Remove more files not included in the
release tarball.
- * xz-utils/README.Debian: Document differences from upstream.
- * Lower priority of xz-utils to optional.
-- Jonathan Nieder <jrnieder@gmail.com> Wed, 04 Jul 2012 16:18:33 -0500
+xz-utils (5.1.1alpha+20120614-1.1) unstable; urgency=low
+
+ * Fixes from upstream:
+ * liblzma: report a LZMA_DATA_ERROR when the first byte of range
+ encoded data is not zero. This is a sanity check to catch
+ malformed files that no known encoders produce.
+ * The minimal xz version needed to decompress blocks with
+ zero-length uncompressed data is 5.0.2, not 5.0.3.
+ * xz.1: Document the new "minimum xz version to decompress"
+ field of "xz --robot -v -v --list" output.
+ * Lower priority of xz-utils to standard. Closes: #685203.
+ * xz-utils/README.Debian: Document differences from upstream.
+
+ -- Jonathan Nieder <jrnieder@gmail.com> Fri, 17 Aug 2012 19:57:24 -0700
+
xz-utils (5.1.1alpha+20120614-1) unstable; urgency=low
* New snapshot, taken from upstream commit f1675f76.
diff --git a/debian/control b/debian/control
index d15cb34..d3b501b 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,7 @@
format, use the p7zip package instead.)
Package: xz-utils
-Priority: optional
+Priority: standard
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Multi-Arch: foreign
diff --git a/debian/xz-utils.README.Debian b/debian/xz-utils.README.Debian
index eefc679..8bda9f7 100644
--- a/debian/xz-utils.README.Debian
+++ b/debian/xz-utils.README.Debian
@@ -22,14 +22,19 @@
log and to avoid breakage when a binary links indirectly to liblzma
from Debian 6.0 (squeeze) and 7.0 (wheezy) at the same time.
-silent-rules:
- build: Use AM_SILENT_RULES if requested.
+Patches applied:
-abi-liblzma2-compat, configure-liblzma2-compat:
- liblzma: Do not check too much reserved space at the end of the
- lzma_stream structure when liblzma.so.2 is loaded in the same
- process image. Likewise when building statically.
- See bug #649522.
+ silent-rules:
+ build: Use AM_SILENT_RULES if requested.
+
+ xz-block-list:
+ xz: Remove support for the --block-list option.
+
+ abi-liblzma2-compat, configure-liblzma2-compat:
+ liblzma: Do not check reserved space past the historical end of
+ the lzma_stream structure if liblzma.so.2 is loaded in the same
+ process image. Likewise when building statically.
+ (See bug #649522.)
LZMA Utils compatibility
------------------------
@@ -61,4 +66,4 @@
See the "Memory usage" section of the xz(1) manual page for details.
- -- Jonathan Nieder <jrnieder@gmail.com> Wed, 04 Jul 2012 16:59:20 -0500
+ -- Jonathan Nieder <jrnieder@gmail.com> Sat, 18 Aug 2012 03:18:42 -0700
