Prepare for 4.999.7beta release.

diff --git a/AUTHORS b/AUTHORS
index 1bacbd6fc75b6e9ede494d8693d8373afd803216..d7bf3a9f5367648d9028ccaba43cef30fe0c8cc7 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,6 +1,6 @@
 
-Authors of LZMA Utils
----------------------
+Authors of XZ Utils
+===================
 
 Igor Pavlov
   * designed LZMA as an algorithm;

diff --git a/README b/README
index 8d80b1500123bccd0cd9342fb6422d9adb1475c7..cce2666fa31c57c2d32d3acbe0308aa6c68fe1e6 100644 (file)
--- a/README
+++ b/README
@@ -1,13 +1,13 @@
 
-LZMA Utils
-----------
+XZ Utils
+--------
 
 Warning
 
-    This is an early alpha version. Don't trust the files produced by
+    This is a beta version. Don't trust the files produced by
     this version of the software - not even if the software can
     uncompress the files properly! This is because the file format
-    isn't completely frozen yet.
+    isn't officially frozen yet although changes are very unlikely.
 
     So please test a lot, but don't use for anything serious yet.
 
@@ -18,19 +18,19 @@ Overview
     Igor Pavlov as part of 7-Zip. It provides high compression ratio
     while keeping the decompression speed fast.
 
-    LZMA Utils are an attempt to make LZMA compression easy to use
+    XZ Utils are an attempt to make LZMA compression easy to use
     on free (as in freedom) operating systems. This is achieved by
     providing tools and libraries which are similar to use than the
     equivalents of the most popular existing compression algorithms.
 
-    LZMA Utils consist of a few relatively separate parts:
+    XZ Utils consist of a few relatively separate parts:
       * liblzma is an encoder/decoder library with support for several
         filters (algorithm implementations). The primary filter is LZMA.
-      * libzfile enables reading from and writing to gzip, bzip2 and
-        LZMA compressed and uncompressed files with an API similar to
-        the standard ANSI-C file I/O.
+      * libzfile (or whatever the name will be) enables reading from and
+        writing to gzip, bzip2 and LZMA compressed and uncompressed files
+        with an API similar to the standard ANSI-C file I/O.
         [ NOTE: libzfile is not implemented yet. ]
-      * lzma command line tool has almost identical syntax than gzip
+      * xz command line tool has almost identical syntax than gzip
         and bzip2. It makes LZMA easy for average users, but also
         provides advanced options to finetune the compression settings.
       * A few shell scripts make diffing and grepping LZMA compressed
@@ -39,15 +39,15 @@ Overview
 
 Supported platforms
 
-    LZMA Utils are developed on GNU+Linux, but they should work at
+    XZ Utils are developed on GNU+Linux, but they should work at
     least on *BSDs and Solaris. They probably work on some other
     POSIX-like operating systems too.
 
-    If you use GCC to compile LZMA Utils, you need at least version
+    If you use GCC to compile XZ Utils, you need at least version
     3.x.x. GCC version 2.xx.x doesn't support some C99 features used
-    in LZMA Utils source code, thus GCC 2 won't compile LZMA Utils.
+    in XZ Utils source code, thus GCC 2 won't compile XZ Utils.
 
-    If you have written patches to make LZMA Utils to work on previously
+    If you have written patches to make XZ Utils to work on previously
     unsupported platform, please send the patches to me! I will consider
     including them to the official version. It's nice to minimize the
     need of third-party patching.
@@ -61,9 +61,9 @@ Supported platforms
 
 Version numbering
 
-    Starting from LZMA Utils 5, the version number of LZMA Utils has
-    absolutely nothing to do with the version number of LZMA SDK or
-    7-Zip. The new version number format of LZMA Utils is X.Y.ZS:
+    The version number of XZ Utils has absolutely nothing to do with
+    the version number of LZMA SDK or 7-Zip. The new version number
+    format of XZ Utils is X.Y.ZS:
 
       - X is the major version. When this is incremented, the library
         API and ABI break.

diff --git a/configure.ac b/configure.ac
index 285ecc217f1a638f6190d632e21c846dceaee53f..a9edcb0080e5564e3bb25b13bf4f1f2857a270c7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@
 
 AC_PREREQ([2.61])
 
-AC_INIT([xz], [4.999.6alpha], [lasse.collin@tukaani.org])
+AC_INIT([XZ Utils], [4.999.7beta], [lasse.collin@tukaani.org], [xz])
 AC_CONFIG_SRCDIR([src/liblzma/common/common.h])
 AC_CONFIG_HEADER([config.h])
 
@@ -115,7 +115,7 @@ AC_ARG_ENABLE([encoders], AC_HELP_STRING([--enable-encoders=LIST],
                Available encoders:]
                        m4_translit(m4_defn([SUPPORTED_FILTERS]), [,], [ ])),
        [], [enable_encoders=SUPPORTED_FILTERS])
-enable_encoders=`echo "$enable_encoders" | sed 's/,/ /g'`
+enable_encoders=`echo "$enable_encoders" | sed 's/,subblock//; s/,/ /g'`
 if test "x$enable_encoders" = xno || test "x$enable_encoders" = x; then
        AC_MSG_RESULT([(none)])
 else

diff --git a/src/liblzma/api/lzma/version.h b/src/liblzma/api/lzma/version.h
index b1e7440456c0778097707d2ca836cfdd397bd3ed..0dbb39d6750b472ed6d5f26e4597ef22635484f2 100644 (file)
--- a/src/liblzma/api/lzma/version.h
+++ b/src/liblzma/api/lzma/version.h
@@ -37,7 +37,7 @@
  * \note        The version number of liblzma has nothing to with
  *              the version number of Igor Pavlov's LZMA SDK.
  */
-#define LZMA_VERSION UINT32_C(49990060)
+#define LZMA_VERSION UINT32_C(49990071)
 
 
 /**