Update version info and NEWS in preparation for v1.5.2

diff --git a/Makefile.am b/Makefile.am
index e0cee0ca78eb7801f32cdf4fdc37e8b663c38b03..ad8be04aca8b8aeadbb0f86f04b206d455c97b92 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,7 +15,7 @@ endif
 
 lib_LTLIBRARIES = libwim.la
 
-libwim_la_LDFLAGS = -version-info 9:1:0 $(WINDOWS_LDFLAGS)
+libwim_la_LDFLAGS = -version-info 10:0:1 $(WINDOWS_LDFLAGS)
 
 libwim_la_SOURCES =            \
        src/add_image.c         \

diff --git a/NEWS b/NEWS
index c86a155eea47f697716caf4c198dfaa476df314b..56fe21ca136776782c9ec78e8986df6915624b07 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,10 @@ Version 1.5.2:
        more --- currently usually to within a fraction of a percent of the
        results from WIMGAPI/ImageX.
 
+       A workaround has been added for compatibility with versions of WinPE
+       that interpret alternate data stream entries in the boot WIM
+       incorrectly.
+
        An alignment bug that caused a crash in the LZX decompressor on some
        builds was fixed.
 
@@ -16,9 +20,8 @@ Version 1.5.2:
        the WIM header when restoring the previous state of a WIM it failed to
        successfully update.
 
-       A workaround has been added for compatibility with versions of WinPE
-       that interpret alternate data stream entries in the boot WIM
-       incorrectly.
+       Added a workaround to avoid an access denied error on Windows when
+       replacing a WIM file that another process has opened.
 
 Version 1.5.1:
        wimlib can now open WinPE WIMs from WAIK v2.1, which had a quirk that

diff --git a/README b/README
index febaf2675d3bcdb412dd8258b411763cfafad3b9..fcc3e906e64035741e3cbedc35edc5107b58a9a2 100644 (file)
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
                                   INTRODUCTION
 
-This is wimlib version 1.5.1 (October 2013).  wimlib is a C library for creating,
+This is wimlib version 1.5.2 (November 2013).  wimlib is a C library for creating,
 modifying, extracting, and mounting files in the Windows Imaging Format (WIM
 files).  These files are normally created by using the `imagex.exe' utility on
 Windows, but wimlib is distributed with a free implementation of ImageX called

diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD
index 702eb89c7682c0809854b40822e9234b30a0a9ea..68c02d2ee1db8a8549a1992f99e2467f72f2df8a 100644 (file)
--- a/archlinux/PKGBUILD
+++ b/archlinux/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer:  Eric Biggers <ebiggers3 at gmail dot com>
 
 pkgname=wimlib
-pkgver=1.5.1
+pkgver=1.5.2
 pkgrel=1
 pkgdesc="A library and program to extract, create, and modify WIM files"
 arch=("i686" "x86_64")

diff --git a/configure.ac b/configure.ac
index 0f84c1440deedfba5b4a168b6a7e15e43c9560af..c8b09894845823a70789e93122a751182fa13598 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([wimlib], [1.5.1], [ebiggers3@gmail.com])
+AC_INIT([wimlib], [1.5.2], [ebiggers3@gmail.com])
 AC_CONFIG_SRCDIR([src/wim.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])

diff --git a/debian/changelog b/debian/changelog
index cb313db78145449c1e0b5d7c123e5b9c4c452768..b0170ccdb75b866e3db9c4f3d7f41072e6d36ee4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+wimlib (1.5.2-1) unstable; urgency=low
+
+  * Update to v1.5.2
+
+ -- Eric Biggers <ebiggers3@gmail.com>  Sun, 17 Nov 2013 17:10:43 -0600
+
 wimlib (1.5.1-1) unstable; urgency=low
 
   * Update to v1.5.1

diff --git a/doc/imagex-apply.1.in b/doc/imagex-apply.1.in
index 18f29db736d5bf406962cda1fcb8d7af7138432d..64d195e311d1c0b18f09da2648965a2aa4131f08 100644 (file)
--- a/doc/imagex-apply.1.in
+++ b/doc/imagex-apply.1.in
@@ -1,4 +1,4 @@
-.TH WIMLIB-IMAGEX "1" "October 2013" "@IMAGEX_PROGNAME@ @VERSION@" "User Commands"
+.TH WIMLIB-IMAGEX "1" "November 2013" "@IMAGEX_PROGNAME@ @VERSION@" "User Commands"
 .SH NAME
 @IMAGEX_PROGNAME@-apply \- Extract one image, or all images, from a WIM archive
 .SH SYNOPSIS

diff --git a/doc/imagex-capture.1.in b/doc/imagex-capture.1.in
index 08ac4226735bb10a22328ab3ef8fc0340b51c93a..debc0bc070b64929eb359c18d369c60fe5ef78d8 100644 (file)
--- a/doc/imagex-capture.1.in
+++ b/doc/imagex-capture.1.in
@@ -1,4 +1,4 @@
-.TH WIMLIB-IMAGEX "1" "October 2013" "@IMAGEX_PROGNAME@ @VERSION@" "User Commands"
+.TH WIMLIB-IMAGEX "1" "November 2013" "@IMAGEX_PROGNAME@ @VERSION@" "User Commands"
 .SH NAME
 @IMAGEX_PROGNAME@-capture, @IMAGEX_PROGNAME@-append \- Create or append a WIM image
 .SH SYNOPSIS

diff --git a/doc/imagex-delete.1.in b/doc/imagex-delete.1.in
index ad8ab543f190882d07ff737c17c8a22da8e3aa69..238c8cdf818af027be64aca96c6261e07c197a25 100644 (file)
--- a/doc/imagex-delete.1.in
+++ b/doc/imagex-delete.1.in
@@ -1,4 +1,4 @@
-.TH WIMLIB-IMAGEX "1" "October 2013" "@IMAGEX_PROGNAME@ @VERSION@" "User Commands"
+.TH WIMLIB-IMAGEX "1" "November 2013" "@IMAGEX_PROGNAME@ @VERSION@" "User Commands"
 .SH NAME
 @IMAGEX_PROGNAME@-delete \- Delete an image from a WIM archive
 .SH SYNOPSIS

diff --git a/doc/imagex-dir.1.in b/doc/imagex-dir.1.in
index 0cb3e13b6940b073355dc2c85eac41d7cf2c6772..e52b673f3d7d966b61b80c86b38d9651d3b2b217 100644 (file)
--- a/doc/imagex-dir.1.in
+++ b/doc/imagex-dir.1.in
@@ -1,4 +1,4 @@
-.TH WIMLIB-IMAGEX "1" "October 2013" "@IMAGEX_PROGNAME@ @VERSION@" "User Commands"
+.TH WIMLIB-IMAGEX "1" "November 2013" "@IMAGEX_PROGNAME@ @VERSION@" "User Commands"
 .SH NAME
 @IMAGEX_PROGNAME@-dir \- Show the files contained in a WIM archive
 .SH SYNOPSIS

diff --git a/doc/imagex-export.1.in b/doc/imagex-export.1.in
index 1555e4f26bf779c247300ea65c870be2817a69a2..85116bfd096d0d788787d7d335531e17d4ad938b 100644 (file)
--- a/doc/imagex-export.1.in
+++ b/doc/imagex-export.1.in
@@ -1,4 +1,4 @@
-.TH WIMLIB-IMAGEX "1" "October 2013" "@IMAGEX_PROGNAME@ @VERSION@" "User Commands"
+.TH WIMLIB-IMAGEX "1" "November 2013" "@IMAGEX_PROGNAME@ @VERSION@" "User Commands"
 .SH NAME
 @IMAGEX_PROGNAME@-export \- Exports an image from a WIM archive to an existing or new WIM archive
 .SH SYNOPSIS

diff --git a/doc/imagex-extract.1.in b/doc/imagex-extract.1.in
index 4347672e132ec2a3c0118a49f0dde63ee1991fdd..b14efde3c6b4a940e37267639f771951c9d012da 100644 (file)
--- a/doc/imagex-extract.1.in
+++ b/doc/imagex-extract.1.in
@@ -1,4 +1,4 @@
-.TH WIMLIB-IMAGEX "1" "October 2013" "@IMAGEX_PROGNAME@ @VERSION@" "User Commands"
+.TH WIMLIB-IMAGEX "1" "November 2013" "@IMAGEX_PROGNAME@ @VERSION@" "User Commands"
 .SH NAME
 @IMAGEX_PROGNAME@-extract \- Extract files or directories from a WIM image
 .SH SYNOPSIS

diff --git a/doc/imagex-info.1.in b/doc/imagex-info.1.in
index 4bb2a917f6fea3ac14b8bdea1816badee6e4b01e..3180ff8b1adff651cb1c64917a44e959c54322b5 100644 (file)
--- a/doc/imagex-info.1.in
+++ b/doc/imagex-info.1.in
@@ -1,4 +1,4 @@
-.TH WIMLIB-IMAGEX "1" "October 2013" "@IMAGEX_PROGNAME@ @VERSION@" "User Commands"
+.TH WIMLIB-IMAGEX "1" "November 2013" "@IMAGEX_PROGNAME@ @VERSION@" "User Commands"
 .SH NAME
 @IMAGEX_PROGNAME@-info \- Display information about a WIM file, or change information about
 an image

diff --git a/doc/imagex-join.1.in b/doc/imagex-join.1.in
index dcf95da54af1e4a6604c8a96015627384953d67b..e73b3cfe46af2f8918d9d46d51a9ce24aebf8f55 100644 (file)
--- a/doc/imagex-join.1.in
+++ b/doc/imagex-join.1.in
@@ -1,4 +1,4 @@
-.TH WIMLIB-IMAGEX "1" "October 2013" "@IMAGEX_PROGNAME@ @VERSION@" "User Commands"
+.TH WIMLIB-IMAGEX "1" "November 2013" "@IMAGEX_PROGNAME@ @VERSION@" "User Commands"
 .SH NAME
 @IMAGEX_PROGNAME@-join \- Join split WIMs into a standalone one-part WIM
 .SH SYNOPSIS

diff --git a/doc/imagex-mount.1.in b/doc/imagex-mount.1.in
index 15c9d922358b33cf3b22e2259cb970a6eac97229..07259a99b99ae8ed551a5e41849d2f1fcff9a08c 100644 (file)
--- a/doc/imagex-mount.1.in
+++ b/doc/imagex-mount.1.in
@@ -1,4 +1,4 @@
-.TH WIMLIB-IMAGEX "1" "October 2013" "@IMAGEX_PROGNAME@ @VERSION@" "User Commands"
+.TH WIMLIB-IMAGEX "1" "November 2013" "@IMAGEX_PROGNAME@ @VERSION@" "User Commands"
 .SH NAME
 @IMAGEX_PROGNAME@-mount, @IMAGEX_PROGNAME@-mountrw, @IMAGEX_PROGNAME@-unmount \- Mount and unmount an image from a WIM archive
 .SH SYNOPSIS

diff --git a/doc/imagex-optimize.1.in b/doc/imagex-optimize.1.in
index 8ccbaa7dcb5c2a7c5957f20fb976dc28eace2457..f0ecc549fa129d79371cfadf83d23f04551c5843 100644 (file)
--- a/doc/imagex-optimize.1.in
+++ b/doc/imagex-optimize.1.in
@@ -1,4 +1,4 @@
-.TH WIMLIB-IMAGEX "1" "October 2013" "@IMAGEX_PROGNAME@ @VERSION@" "User Commands"
+.TH WIMLIB-IMAGEX "1" "November 2013" "@IMAGEX_PROGNAME@ @VERSION@" "User Commands"
 .SH NAME
 @IMAGEX_PROGNAME@-optimize \- Optimize a WIM archive
 .SH SYNOPSIS

diff --git a/doc/imagex-split.1.in b/doc/imagex-split.1.in
index 5f08d5cb6927488a83c2d198c53d0d78a8845a3c..9b6549dc819c08e97b89b4137a0b5d8ab87fdd4c 100644 (file)
--- a/doc/imagex-split.1.in
+++ b/doc/imagex-split.1.in
@@ -1,4 +1,4 @@
-.TH WIMLIB-IMAGEX "1" "October 2013" "@IMAGEX_PROGNAME@ @VERSION@" "User Commands"
+.TH WIMLIB-IMAGEX "1" "November 2013" "@IMAGEX_PROGNAME@ @VERSION@" "User Commands"
 .SH NAME
 @IMAGEX_PROGNAME@-split \- Split a WIM into multiple parts
 .SH SYNOPSIS

diff --git a/doc/imagex-update.1.in b/doc/imagex-update.1.in
index 81018e86cb45624750c80ad71b6852c908aab677..ea757794e5678d59a3dc38b16488ceef6e10caa9 100644 (file)
--- a/doc/imagex-update.1.in
+++ b/doc/imagex-update.1.in
@@ -1,4 +1,4 @@
-.TH WIMLIB-IMAGEX "1" "October 2013" "@IMAGEX_PROGNAME@ @VERSION@" "User Commands"
+.TH WIMLIB-IMAGEX "1" "November 2013" "@IMAGEX_PROGNAME@ @VERSION@" "User Commands"
 .SH NAME
 @IMAGEX_PROGNAME@-update \- Update a WIM image
 .SH SYNOPSIS

diff --git a/doc/imagex.1.in b/doc/imagex.1.in
index 4028390ec83381593d420cd211b6d04a49c11a4e..7c52233439a5e99f93e2434902eb5d3eee53b0b5 100644 (file)
--- a/doc/imagex.1.in
+++ b/doc/imagex.1.in
@@ -1,4 +1,4 @@
-.TH WIMLIB-IMAGEX 1 "October 2013" "@IMAGEX_PROGNAME@ @VERSION@" "User Commands"
+.TH WIMLIB-IMAGEX 1 "November 2013" "@IMAGEX_PROGNAME@ @VERSION@" "User Commands"
 .SH NAME
 @IMAGEX_PROGNAME@ \- Create, modify, extract, mount, or unmount a WIM (Windows Imaging Format) archive
 .SH SYNOPSIS

diff --git a/doc/mkwinpeimg.1.in b/doc/mkwinpeimg.1.in
index 0966377c320d0bc931c11451e744bb0f5e95ae7f..cc453f99a0effb053e32ba81127a54287a219d34 100644 (file)
--- a/doc/mkwinpeimg.1.in
+++ b/doc/mkwinpeimg.1.in
@@ -1,4 +1,4 @@
-.TH MKWINPEIMG "1" "October 2013" "mkwinpeimg (wimlib @VERSION@)" "User Commands"
+.TH MKWINPEIMG "1" "November 2013" "mkwinpeimg (wimlib @VERSION@)" "User Commands"
 .SH NAME
 mkwinpeimg \- Make a customized bootable image of Windows PE
 .SH SYNOPSIS

diff --git a/include/wimlib.h b/include/wimlib.h
index d5194c17b71cba7b338c088df30c4d4c8990dd8e..234f73ecc12938880f79d4ee0d1d0e537bce1c08 100644 (file)
--- a/include/wimlib.h
+++ b/include/wimlib.h
@@ -33,7 +33,7 @@
  *
  * @section sec_intro Introduction
  *
- * This is the documentation for the library interface of wimlib 1.5.1, a C
+ * This is the documentation for the library interface of wimlib 1.5.2, a C
  * library for creating, modifying, extracting, and mounting files in the
  * Windows Imaging Format.  This documentation is intended for developers only.
  * If you have installed wimlib and want to know how to use the @b wimlib-imagex
@@ -355,7 +355,7 @@
 #define WIMLIB_MINOR_VERSION 5
 
 /** Patch version of the library (for example, the 5 in 1.2.5). */
-#define WIMLIB_PATCH_VERSION 1
+#define WIMLIB_PATCH_VERSION 2
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/rpm/wimtools.spec b/rpm/wimtools.spec
index c381d6e1d6eb365f38ecc371db6633b6b6e5aea9..51b671560c0ed76c53f660738dea87497b00e087 100644 (file)
--- a/rpm/wimtools.spec
+++ b/rpm/wimtools.spec
@@ -1,6 +1,6 @@
 Name:      wimtools
 Summary:   Tools to create, extract, modify, and mount WIM files
-Version:   1.5.1
+Version:   1.5.2
 Release:   1
 License:   GPLv3+
 URL:       http://sourceforge.net/projects/wimlib

diff --git a/update-version b/update-version
index 0b717d080957bf29c35ab6490166737e8758ce25..260408870dfc8fdded5845ff05f0534c3623110f 100755 (executable)
--- a/update-version
+++ b/update-version
@@ -1,13 +1,13 @@
 #!/bin/bash
 
-oldver='1\.5\.0'
-oldmonth=August
+oldver='1\.5\.1'
+oldmonth=October
 oldyear=2013
 
 newmajor=1
 newminor=5
-newpatch=1
-newmonth=October
+newpatch=2
+newmonth=November
 newyear=2013