From dcdce8f085b55b0907e84ff88d43c96003d84458 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Tue, 31 May 2016 21:08:42 -0500 Subject: [PATCH] v1.9.2 --- Makefile.am | 2 +- NEWS | 2 +- README | 2 +- archlinux/PKGBUILD | 2 +- configure.ac | 2 +- debian/changelog | 6 ++++++ doc/man1/mkwinpeimg.1 | 2 +- doc/man1/wimlib-imagex-apply.1 | 2 +- doc/man1/wimlib-imagex-capture.1 | 2 +- doc/man1/wimlib-imagex-delete.1 | 2 +- doc/man1/wimlib-imagex-dir.1 | 2 +- doc/man1/wimlib-imagex-export.1 | 2 +- doc/man1/wimlib-imagex-extract.1 | 2 +- doc/man1/wimlib-imagex-info.1 | 2 +- doc/man1/wimlib-imagex-join.1 | 2 +- doc/man1/wimlib-imagex-mount.1 | 2 +- doc/man1/wimlib-imagex-optimize.1 | 2 +- doc/man1/wimlib-imagex-split.1 | 2 +- doc/man1/wimlib-imagex-update.1 | 2 +- doc/man1/wimlib-imagex-verify.1 | 2 +- doc/man1/wimlib-imagex.1 | 2 +- include/wimlib.h | 4 ++-- rpm/wimtools.spec | 2 +- tools/update-version | 8 ++++---- 24 files changed, 33 insertions(+), 27 deletions(-) diff --git a/Makefile.am b/Makefile.am index b3161222..ff5a29bb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -199,7 +199,7 @@ libwim_la_CFLAGS = \ $(LIBFUSE_CFLAGS) \ $(LIBCRYPTO_CFLAGS) -libwim_la_LDFLAGS = $(AM_LDFLAGS) -version-info 25:0:10 +libwim_la_LDFLAGS = $(AM_LDFLAGS) -version-info 26:0:11 libwim_la_LIBADD = \ $(PTHREAD_LIBS) \ diff --git a/NEWS b/NEWS index 4bda7ea3..5d0f74c1 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -Version 1.9.2-BETA: +Version 1.9.2: On UNIX, wimlib can now overwrite readonly files when extracting. On Windows, fixed a bug where wimlib could leave a null DACL (a.k.a. "no diff --git a/README b/README index 41a66b18..3a396fdc 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ INTRODUCTION -This is wimlib version 1.9.2-BETA (May 2016). wimlib is a C library for +This is wimlib version 1.9.2 (June 2016). wimlib is a C library for creating, modifying, extracting, and mounting files in the Windows Imaging Format (WIM files). wimlib and its command-line frontend 'wimlib-imagex' provide a free and cross-platform alternative to Microsoft's WIMGAPI, ImageX, diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD index f30c691d..5a0d1bd4 100644 --- a/archlinux/PKGBUILD +++ b/archlinux/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Eric Biggers pkgname=wimlib -pkgver=1.9.1 +pkgver=1.9.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 fe8cdb67..c6aed057 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ ############################################################################### -AC_INIT([wimlib], [1.9.2-BETA2], [ebiggers3@gmail.com]) +AC_INIT([wimlib], [1.9.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 e7d4b47a..11a3cb14 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +wimlib (1.9.2-1) unstable; urgency=low + + * Update to v1.9.2 + + -- Eric Biggers Tue, 31 May 2016 20:40:27 -0500 + wimlib (1.9.1-1) unstable; urgency=low * Update to v1.9.1 diff --git a/doc/man1/mkwinpeimg.1 b/doc/man1/mkwinpeimg.1 index 3c4dab67..cca04bd5 100644 --- a/doc/man1/mkwinpeimg.1 +++ b/doc/man1/mkwinpeimg.1 @@ -1,4 +1,4 @@ -.TH MKWINPEIMG "1" "March 2016" "wimlib 1.9.1" "User Commands" +.TH MKWINPEIMG "1" "June 2016" "wimlib 1.9.2" "User Commands" .SH NAME mkwinpeimg \- Make a customized bootable image of Windows PE .SH SYNOPSIS diff --git a/doc/man1/wimlib-imagex-apply.1 b/doc/man1/wimlib-imagex-apply.1 index 0fad8dd4..a046ef7f 100644 --- a/doc/man1/wimlib-imagex-apply.1 +++ b/doc/man1/wimlib-imagex-apply.1 @@ -1,4 +1,4 @@ -.TH WIMLIB-IMAGEX "1" "March 2016" "wimlib 1.9.1" "User Commands" +.TH WIMLIB-IMAGEX "1" "June 2016" "wimlib 1.9.2" "User Commands" .SH NAME wimlib-imagex-apply \- Extract one image, or all images, from a WIM archive .SH SYNOPSIS diff --git a/doc/man1/wimlib-imagex-capture.1 b/doc/man1/wimlib-imagex-capture.1 index b0c5f337..d86f043b 100644 --- a/doc/man1/wimlib-imagex-capture.1 +++ b/doc/man1/wimlib-imagex-capture.1 @@ -1,4 +1,4 @@ -.TH WIMLIB-IMAGEX "1" "March 2016" "wimlib 1.9.1" "User Commands" +.TH WIMLIB-IMAGEX "1" "June 2016" "wimlib 1.9.2" "User Commands" .SH NAME wimlib-imagex-capture, wimlib-imagex-append \- Create or append a WIM image .SH SYNOPSIS diff --git a/doc/man1/wimlib-imagex-delete.1 b/doc/man1/wimlib-imagex-delete.1 index 6ca366fb..33cd9450 100644 --- a/doc/man1/wimlib-imagex-delete.1 +++ b/doc/man1/wimlib-imagex-delete.1 @@ -1,4 +1,4 @@ -.TH WIMLIB-IMAGEX "1" "March 2016" "wimlib 1.9.1" "User Commands" +.TH WIMLIB-IMAGEX "1" "June 2016" "wimlib 1.9.2" "User Commands" .SH NAME wimlib-imagex-delete \- Delete an image from a WIM archive .SH SYNOPSIS diff --git a/doc/man1/wimlib-imagex-dir.1 b/doc/man1/wimlib-imagex-dir.1 index 7a3b8384..0efcd557 100644 --- a/doc/man1/wimlib-imagex-dir.1 +++ b/doc/man1/wimlib-imagex-dir.1 @@ -1,4 +1,4 @@ -.TH WIMLIB-IMAGEX "1" "March 2016" "wimlib 1.9.1" "User Commands" +.TH WIMLIB-IMAGEX "1" "June 2016" "wimlib 1.9.2" "User Commands" .SH NAME wimlib-imagex-dir \- Show the files contained in a WIM archive .SH SYNOPSIS diff --git a/doc/man1/wimlib-imagex-export.1 b/doc/man1/wimlib-imagex-export.1 index 863218a8..f5dbc35d 100644 --- a/doc/man1/wimlib-imagex-export.1 +++ b/doc/man1/wimlib-imagex-export.1 @@ -1,4 +1,4 @@ -.TH WIMLIB-IMAGEX "1" "March 2016" "wimlib 1.9.1" "User Commands" +.TH WIMLIB-IMAGEX "1" "June 2016" "wimlib 1.9.2" "User Commands" .SH NAME wimlib-imagex-export \- Exports an image from a WIM archive to an existing or new WIM archive .SH SYNOPSIS diff --git a/doc/man1/wimlib-imagex-extract.1 b/doc/man1/wimlib-imagex-extract.1 index 6e60a0fe..5ba8a7ae 100644 --- a/doc/man1/wimlib-imagex-extract.1 +++ b/doc/man1/wimlib-imagex-extract.1 @@ -1,4 +1,4 @@ -.TH WIMLIB-IMAGEX "1" "March 2016" "wimlib 1.9.1" "User Commands" +.TH WIMLIB-IMAGEX "1" "June 2016" "wimlib 1.9.2" "User Commands" .SH NAME wimlib-imagex-extract \- Extract files or directories from a WIM image .SH SYNOPSIS diff --git a/doc/man1/wimlib-imagex-info.1 b/doc/man1/wimlib-imagex-info.1 index 8ea4dc7b..8d0a7d85 100644 --- a/doc/man1/wimlib-imagex-info.1 +++ b/doc/man1/wimlib-imagex-info.1 @@ -1,4 +1,4 @@ -.TH WIMLIB-IMAGEX "1" "March 2016" "wimlib 1.9.1" "User Commands" +.TH WIMLIB-IMAGEX "1" "June 2016" "wimlib 1.9.2" "User Commands" .SH NAME wimlib-imagex-info \- Display information about a WIM file, or change information about an image diff --git a/doc/man1/wimlib-imagex-join.1 b/doc/man1/wimlib-imagex-join.1 index 1b456437..e02e6c66 100644 --- a/doc/man1/wimlib-imagex-join.1 +++ b/doc/man1/wimlib-imagex-join.1 @@ -1,4 +1,4 @@ -.TH WIMLIB-IMAGEX "1" "March 2016" "wimlib 1.9.1" "User Commands" +.TH WIMLIB-IMAGEX "1" "June 2016" "wimlib 1.9.2" "User Commands" .SH NAME wimlib-imagex-join \- Join split WIMs into a standalone one-part WIM .SH SYNOPSIS diff --git a/doc/man1/wimlib-imagex-mount.1 b/doc/man1/wimlib-imagex-mount.1 index 72a8d0fc..306d8d90 100644 --- a/doc/man1/wimlib-imagex-mount.1 +++ b/doc/man1/wimlib-imagex-mount.1 @@ -1,4 +1,4 @@ -.TH WIMLIB-IMAGEX "1" "March 2016" "wimlib 1.9.1" "User Commands" +.TH WIMLIB-IMAGEX "1" "June 2016" "wimlib 1.9.2" "User Commands" .SH NAME wimlib-imagex-mount, wimlib-imagex-mountrw, wimlib-imagex-unmount \- Mount and unmount an image from a WIM archive .SH SYNOPSIS diff --git a/doc/man1/wimlib-imagex-optimize.1 b/doc/man1/wimlib-imagex-optimize.1 index 371d9d1d..84cd3b51 100644 --- a/doc/man1/wimlib-imagex-optimize.1 +++ b/doc/man1/wimlib-imagex-optimize.1 @@ -1,4 +1,4 @@ -.TH WIMLIB-IMAGEX "1" "March 2016" "wimlib 1.9.1" "User Commands" +.TH WIMLIB-IMAGEX "1" "June 2016" "wimlib 1.9.2" "User Commands" .SH NAME wimlib-imagex-optimize \- Optimize a WIM archive .SH SYNOPSIS diff --git a/doc/man1/wimlib-imagex-split.1 b/doc/man1/wimlib-imagex-split.1 index 197fd1a8..4fb582bf 100644 --- a/doc/man1/wimlib-imagex-split.1 +++ b/doc/man1/wimlib-imagex-split.1 @@ -1,4 +1,4 @@ -.TH WIMLIB-IMAGEX "1" "March 2016" "wimlib 1.9.1" "User Commands" +.TH WIMLIB-IMAGEX "1" "June 2016" "wimlib 1.9.2" "User Commands" .SH NAME wimlib-imagex-split \- Split a WIM into multiple parts .SH SYNOPSIS diff --git a/doc/man1/wimlib-imagex-update.1 b/doc/man1/wimlib-imagex-update.1 index e16f5750..2edb0d0c 100644 --- a/doc/man1/wimlib-imagex-update.1 +++ b/doc/man1/wimlib-imagex-update.1 @@ -1,4 +1,4 @@ -.TH WIMLIB-IMAGEX "1" "March 2016" "wimlib 1.9.1" "User Commands" +.TH WIMLIB-IMAGEX "1" "June 2016" "wimlib 1.9.2" "User Commands" .SH NAME wimlib-imagex-update \- Update a WIM image .SH SYNOPSIS diff --git a/doc/man1/wimlib-imagex-verify.1 b/doc/man1/wimlib-imagex-verify.1 index b85bed8f..9fcae7e1 100644 --- a/doc/man1/wimlib-imagex-verify.1 +++ b/doc/man1/wimlib-imagex-verify.1 @@ -1,4 +1,4 @@ -.TH WIMLIB-IMAGEX "1" "March 2016" "wimlib 1.9.1" "User Commands" +.TH WIMLIB-IMAGEX "1" "June 2016" "wimlib 1.9.2" "User Commands" .SH NAME wimlib-imagex-verify \- Verify a WIM file .SH SYNOPSIS diff --git a/doc/man1/wimlib-imagex.1 b/doc/man1/wimlib-imagex.1 index 29f38897..3fe685af 100644 --- a/doc/man1/wimlib-imagex.1 +++ b/doc/man1/wimlib-imagex.1 @@ -1,4 +1,4 @@ -.TH WIMLIB-IMAGEX 1 "March 2016" "wimlib 1.9.1" "User Commands" +.TH WIMLIB-IMAGEX 1 "June 2016" "wimlib 1.9.2" "User Commands" .SH NAME wimlib-imagex \- Extract, create, modify, or mount a WIM (Windows Imaging Format) archive .SH SYNOPSIS diff --git a/include/wimlib.h b/include/wimlib.h index 667b2b92..3b3d3425 100644 --- a/include/wimlib.h +++ b/include/wimlib.h @@ -11,7 +11,7 @@ /** * @mainpage * - * This is the documentation for the library interface of wimlib 1.9.1, a C + * This is the documentation for the library interface of wimlib 1.9.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 @@ -401,7 +401,7 @@ #define WIMLIB_MINOR_VERSION 9 /** 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 3ae22e34..c2d7af7f 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.9.1 +Version: 1.9.2 Release: 1 License: GPLv3+ URL: https://wimlib.net diff --git a/tools/update-version b/tools/update-version index 66db3f6a..45acebc6 100755 --- a/tools/update-version +++ b/tools/update-version @@ -1,13 +1,13 @@ #!/bin/bash -oldver='1\.9\.0' -oldmonth=January +oldver='1\.9\.1' +oldmonth=March oldyear=2016 newmajor=1 newminor=9 -newpatch=1 -newmonth=March +newpatch=2 +newmonth=June newyear=2016 -- 2.43.0