From f0134c285fae01e5c943ed2b96cb8656ba01bf5a Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Sun, 17 Nov 2013 17:18:30 -0600 Subject: [PATCH] Update version info and NEWS in preparation for v1.5.2 --- Makefile.am | 2 +- NEWS | 9 ++++++--- README | 2 +- archlinux/PKGBUILD | 2 +- configure.ac | 2 +- debian/changelog | 6 ++++++ doc/imagex-apply.1.in | 2 +- doc/imagex-capture.1.in | 2 +- doc/imagex-delete.1.in | 2 +- doc/imagex-dir.1.in | 2 +- doc/imagex-export.1.in | 2 +- doc/imagex-extract.1.in | 2 +- doc/imagex-info.1.in | 2 +- doc/imagex-join.1.in | 2 +- doc/imagex-mount.1.in | 2 +- doc/imagex-optimize.1.in | 2 +- doc/imagex-split.1.in | 2 +- doc/imagex-update.1.in | 2 +- doc/imagex.1.in | 2 +- doc/mkwinpeimg.1.in | 2 +- include/wimlib.h | 4 ++-- rpm/wimtools.spec | 2 +- update-version | 8 ++++---- 23 files changed, 37 insertions(+), 28 deletions(-) diff --git a/Makefile.am b/Makefile.am index e0cee0ca..ad8be04a 100644 --- 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 c86a155e..56fe21ca 100644 --- 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 febaf267..fcc3e906 100644 --- 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 702eb89c..68c02d2e 100644 --- a/archlinux/PKGBUILD +++ b/archlinux/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Eric Biggers 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 0f84c144..c8b09894 100644 --- 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 cb313db7..b0170ccd 100644 --- 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 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 18f29db7..64d195e3 100644 --- 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 08ac4226..debc0bc0 100644 --- 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 ad8ab543..238c8cdf 100644 --- 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 0cb3e13b..e52b673f 100644 --- 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 1555e4f2..85116bfd 100644 --- 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 4347672e..b14efde3 100644 --- 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 4bb2a917..3180ff8b 100644 --- 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 dcf95da5..e73b3cfe 100644 --- 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 15c9d922..07259a99 100644 --- 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 8ccbaa7d..f0ecc549 100644 --- 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 5f08d5cb..9b6549dc 100644 --- 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 81018e86..ea757794 100644 --- 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 4028390e..7c522334 100644 --- 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 0966377c..cc453f99 100644 --- 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 d5194c17..234f73ec 100644 --- 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 c381d6e1..51b67156 100644 --- 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 0b717d08..26040887 100755 --- 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 -- 2.43.0