Merge branch 'master' into pu
A bit of an ugly -Xours merge in xz-utils/README.Debian.
* master:
debian: prepare for upload
xz-utils/README.Debian: flesh out "differences from upstream"
xz-utils/README.Debian: Document patches
diff --git a/debian/changelog b/debian/changelog
index 4ea6932..54f0aa5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,23 +23,24 @@
interface time to evolve.
* debian/rules clean: Remove more files not included in the
release tarball.
+ * Lower priority of xz-utils to standard. Closes: #685203.
-- Jonathan Nieder <jrnieder@gmail.com> Wed, 04 Jul 2012 16:18:33 -0500
-xz-utils (5.1.1alpha+20120614-1.1) unstable; urgency=low
+xz-utils (5.1.1alpha+20120614-2) 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.
+ * Apply fixes from 5.1.2alpha. Closes: #685220.
+ - liblzma: report a LZMA_DATA_ERROR when range encoded data starts
+ with a nonzero byte. This is a sanity check to catch malformed
+ files that no known encoders produce.
+ - xz -v -v --list: Support for decompressing blocks with
+ zero-length uncompressed data was added in xz 5.0.2, not 5.0.3.
+ - xz.1: "xz --robot -v -v --list" gained a "minimum xz version to
+ decompress" field.
* xz-utils/README.Debian: Document differences from upstream.
+ Closes: #685217.
- -- Jonathan Nieder <jrnieder@gmail.com> Fri, 17 Aug 2012 19:57:24 -0700
+ -- Jonathan Nieder <jrnieder@gmail.com> Mon, 10 Sep 2012 14:35:33 -0700
xz-utils (5.1.1alpha+20120614-1) unstable; urgency=low
