From 055a7496d1f9af18bf0514f94228c64131cb3f02 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Tue, 17 Jan 2017 21:24:53 -0800 Subject: [PATCH] v1.11.0 --- Makefile.am | 2 +- NEWS | 2 +- README | 2 +- README.WINDOWS | 12 ++++++------ archlinux/PKGBUILD | 2 +- configure.ac | 2 +- debian/changelog | 6 ++++++ doc/man1/mkwinpeimg.1 | 2 +- doc/man1/wimapply.1 | 2 +- doc/man1/wimcapture.1 | 2 +- doc/man1/wimdelete.1 | 2 +- doc/man1/wimdir.1 | 2 +- doc/man1/wimexport.1 | 2 +- doc/man1/wimextract.1 | 2 +- doc/man1/wiminfo.1 | 2 +- doc/man1/wimjoin.1 | 2 +- doc/man1/wimlib-imagex.1 | 2 +- doc/man1/wimmount.1 | 2 +- doc/man1/wimoptimize.1 | 2 +- doc/man1/wimsplit.1 | 2 +- doc/man1/wimupdate.1 | 2 +- doc/man1/wimverify.1 | 2 +- include/wimlib.h | 4 ++-- rpm/wimtools.spec | 2 +- tools/update-version | 10 +++++----- 25 files changed, 40 insertions(+), 34 deletions(-) diff --git a/Makefile.am b/Makefile.am index 66acc43f..8d0b6cfe 100644 --- a/Makefile.am +++ b/Makefile.am @@ -201,7 +201,7 @@ libwim_la_CFLAGS = \ $(LIBFUSE_CFLAGS) \ $(LIBCRYPTO_CFLAGS) -libwim_la_LDFLAGS = $(AM_LDFLAGS) -version-info 27:0:12 +libwim_la_LDFLAGS = $(AM_LDFLAGS) -version-info 28:0:13 libwim_la_LIBADD = \ $(PTHREAD_LIBS) \ diff --git a/NEWS b/NEWS index 46cd676c..0e38dc32 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -Version 1.11.0-BETA5: +Version 1.11.0: Fixed a data corruption bug (incorrect compression) when storing an already highly-compressed file in an LZX-compressed WIM with a chunk size greater than or equal to 64K. Note that this is not the default diff --git a/README b/README index 90121b65..9832b38e 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ INTRODUCTION -This is wimlib version 1.11.0-BETA5 (January 2017). wimlib is a C library for +This is wimlib version 1.11.0 (January 2017). 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/README.WINDOWS b/README.WINDOWS index 00697e6f..c54a773b 100644 --- a/README.WINDOWS +++ b/README.WINDOWS @@ -94,7 +94,7 @@ from source, potentially with customizations. Although wimlib's build system is designed for UNIX-like systems and is easiest to use on Linux, it's possible to build Windows binaries on Windows using Cygwin with MinGW. To do this, follow the instructions below. For the sake of example, I'll assume you are building a -64-bit version of wimlib v1.10.0. +64-bit version of wimlib v1.11.0. Run the Cygwin installer, available from https://www.cygwin.com/setup-x86.exe. When you get to the package selection screen, choose the following additional @@ -107,13 +107,13 @@ packages from category "Devel": - mingw64-x86_64-pkg-config - mingw64-x86_64-winpthreads -Download wimlib's source code from https://wimlib.net/downloads/wimlib-1.10.0.tar.gz. +Download wimlib's source code from https://wimlib.net/downloads/wimlib-1.11.0.tar.gz. Start a Cygwin terminal and run the following commands: cd /cygdrive/c/Users/example/Downloads # (or wherever you downloaded the source to) - tar xf wimlib-1.10.0.tar.gz - cd wimlib-1.10.0 + tar xf wimlib-1.11.0.tar.gz + cd wimlib-1.11.0 ./configure --host=x86_64-w64-mingw32 make @@ -162,12 +162,12 @@ version you want, bootstrap the repository, and run the Windows release script: git clone git://wimlib.net/wimlib cd wimlib - git checkout v1.10.0 + git checkout v1.11.0 ./bootstrap ./tools/make-windows-release x86_64 The release script will download and build libxml2 and winpthreads as static libraries, then build wimlib, then do some final tasks and bundle the resulting files up into a ZIP archive. If successful you'll end up with a file like -"wimlib-1.10.0-windows-x86_64-bin.zip", just like the official releases. For +"wimlib-1.11.0-windows-x86_64-bin.zip", just like the official releases. For 32-bit binaries just use "i686" instead of "x86_64". diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD index 2550805f..b632deb2 100644 --- a/archlinux/PKGBUILD +++ b/archlinux/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Eric Biggers pkgname=wimlib -pkgver=1.10.0 +pkgver=1.11.0 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 a077fcdf..693e345a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ ############################################################################### -AC_INIT([wimlib], [1.11.0-BETA5], [ebiggers3@gmail.com]) +AC_INIT([wimlib], [1.11.0], [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 18d4c2b3..690169aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +wimlib (1.11.0-1) unstable; urgency=low + + * Update to v1.11.0 + + -- Eric Biggers Tue, 17 Jan 2017 19:41:32 -0800 + wimlib (1.10.0-1) unstable; urgency=low * Update to v1.10.0 diff --git a/doc/man1/mkwinpeimg.1 b/doc/man1/mkwinpeimg.1 index 92535cb9..ddcc3fde 100644 --- a/doc/man1/mkwinpeimg.1 +++ b/doc/man1/mkwinpeimg.1 @@ -1,4 +1,4 @@ -.TH MKWINPEIMG "1" "August 2016" "wimlib 1.10.0" "User Commands" +.TH MKWINPEIMG "1" "January 2017" "wimlib 1.11.0" "User Commands" .SH NAME mkwinpeimg \- Make a customized bootable image of Windows PE .SH SYNOPSIS diff --git a/doc/man1/wimapply.1 b/doc/man1/wimapply.1 index 5a7c4a85..fb649553 100644 --- a/doc/man1/wimapply.1 +++ b/doc/man1/wimapply.1 @@ -1,4 +1,4 @@ -.TH WIMAPPLY "1" "August 2016" "wimlib 1.10.0" "User Commands" +.TH WIMAPPLY "1" "January 2017" "wimlib 1.11.0" "User Commands" .SH NAME wimapply \- Apply a WIM image .SH SYNOPSIS diff --git a/doc/man1/wimcapture.1 b/doc/man1/wimcapture.1 index bbf89a1c..ffcc798c 100644 --- a/doc/man1/wimcapture.1 +++ b/doc/man1/wimcapture.1 @@ -1,4 +1,4 @@ -.TH WIMCAPTURE "1" "August 2016" "wimlib 1.10.0" "User Commands" +.TH WIMCAPTURE "1" "January 2017" "wimlib 1.11.0" "User Commands" .SH NAME wimcapture, wimappend \- Capture or append a WIM image .SH SYNOPSIS diff --git a/doc/man1/wimdelete.1 b/doc/man1/wimdelete.1 index ca3954e1..bfc2194d 100644 --- a/doc/man1/wimdelete.1 +++ b/doc/man1/wimdelete.1 @@ -1,4 +1,4 @@ -.TH WIMDELETE "1" "August 2016" "wimlib 1.10.0" "User Commands" +.TH WIMDELETE "1" "January 2017" "wimlib 1.11.0" "User Commands" .SH NAME wimdelete \- Delete an image from a WIM archive .SH SYNOPSIS diff --git a/doc/man1/wimdir.1 b/doc/man1/wimdir.1 index e6f6ca1a..6c65ede1 100644 --- a/doc/man1/wimdir.1 +++ b/doc/man1/wimdir.1 @@ -1,4 +1,4 @@ -.TH WIMDIR "1" "August 2016" "wimlib 1.10.0" "User Commands" +.TH WIMDIR "1" "January 2017" "wimlib 1.11.0" "User Commands" .SH NAME wimdir \- List the files contained in a WIM image .SH SYNOPSIS diff --git a/doc/man1/wimexport.1 b/doc/man1/wimexport.1 index cb24ab17..8be65eee 100644 --- a/doc/man1/wimexport.1 +++ b/doc/man1/wimexport.1 @@ -1,4 +1,4 @@ -.TH WIMEXPORT "1" "August 2016" "wimlib 1.10.0" "User Commands" +.TH WIMEXPORT "1" "January 2017" "wimlib 1.11.0" "User Commands" .SH NAME wimexport \- Export image(s) from a WIM archive .SH SYNOPSIS diff --git a/doc/man1/wimextract.1 b/doc/man1/wimextract.1 index 688d1919..f20f2f33 100644 --- a/doc/man1/wimextract.1 +++ b/doc/man1/wimextract.1 @@ -1,4 +1,4 @@ -.TH WIMEXTRACT "1" "August 2016" "wimlib 1.10.0" "User Commands" +.TH WIMEXTRACT "1" "January 2017" "wimlib 1.11.0" "User Commands" .SH NAME wimextract \- Extract files from a WIM image .SH SYNOPSIS diff --git a/doc/man1/wiminfo.1 b/doc/man1/wiminfo.1 index 7c44b47a..775d6a7e 100644 --- a/doc/man1/wiminfo.1 +++ b/doc/man1/wiminfo.1 @@ -1,4 +1,4 @@ -.TH WIMINFO "1" "August 2016" "wimlib 1.10.0" "User Commands" +.TH WIMINFO "1" "January 2017" "wimlib 1.11.0" "User Commands" .SH NAME wiminfo \- Display or change information about a WIM file or image .SH SYNOPSIS diff --git a/doc/man1/wimjoin.1 b/doc/man1/wimjoin.1 index bdfde023..1f291f4f 100644 --- a/doc/man1/wimjoin.1 +++ b/doc/man1/wimjoin.1 @@ -1,4 +1,4 @@ -.TH WIMJOIN "1" "August 2016" "wimlib 1.10.0" "User Commands" +.TH WIMJOIN "1" "January 2017" "wimlib 1.11.0" "User Commands" .SH NAME wimjoin\- Join a split WIM into a standalone WIM .SH SYNOPSIS diff --git a/doc/man1/wimlib-imagex.1 b/doc/man1/wimlib-imagex.1 index b16c3648..b2f39571 100644 --- a/doc/man1/wimlib-imagex.1 +++ b/doc/man1/wimlib-imagex.1 @@ -1,4 +1,4 @@ -.TH WIMLIB-IMAGEX 1 "August 2016" "wimlib 1.10.0" "User Commands" +.TH WIMLIB-IMAGEX 1 "January 2017" "wimlib 1.11.0" "User Commands" .SH NAME wimlib-imagex \- Extract, create, modify, or mount a WIM archive .SH SYNOPSIS diff --git a/doc/man1/wimmount.1 b/doc/man1/wimmount.1 index 6a049b91..5c706bd1 100644 --- a/doc/man1/wimmount.1 +++ b/doc/man1/wimmount.1 @@ -1,4 +1,4 @@ -.TH WIMMOUNT "1" "August 2016" "wimlib 1.10.0" "User Commands" +.TH WIMMOUNT "1" "January 2017" "wimlib 1.11.0" "User Commands" .SH NAME wimmount, wimmountrw, wimunmount \- Mount or unmount a WIM image .SH SYNOPSIS diff --git a/doc/man1/wimoptimize.1 b/doc/man1/wimoptimize.1 index 13444caa..f2daf6d4 100644 --- a/doc/man1/wimoptimize.1 +++ b/doc/man1/wimoptimize.1 @@ -1,4 +1,4 @@ -.TH WIMOPTIMIZE "1" "August 2016" "wimlib 1.10.0" "User Commands" +.TH WIMOPTIMIZE "1" "January 2017" "wimlib 1.11.0" "User Commands" .SH NAME wimoptimize \- Optimize a WIM archive .SH SYNOPSIS diff --git a/doc/man1/wimsplit.1 b/doc/man1/wimsplit.1 index b9e738c2..34ccdda2 100644 --- a/doc/man1/wimsplit.1 +++ b/doc/man1/wimsplit.1 @@ -1,4 +1,4 @@ -.TH WIMSPLIT "1" "August 2016" "wimlib 1.10.0" "User Commands" +.TH WIMSPLIT "1" "January 2017" "wimlib 1.11.0" "User Commands" .SH NAME wimsplit \- Split a WIM archive into multiple parts .SH SYNOPSIS diff --git a/doc/man1/wimupdate.1 b/doc/man1/wimupdate.1 index 9e6b577e..4a2698a8 100644 --- a/doc/man1/wimupdate.1 +++ b/doc/man1/wimupdate.1 @@ -1,4 +1,4 @@ -.TH WIMUPDATE "1" "August 2016" "wimlib 1.10.0" "User Commands" +.TH WIMUPDATE "1" "January 2017" "wimlib 1.11.0" "User Commands" .SH NAME wimupdate \- Update a WIM image .SH SYNOPSIS diff --git a/doc/man1/wimverify.1 b/doc/man1/wimverify.1 index 4d51118b..16ddb210 100644 --- a/doc/man1/wimverify.1 +++ b/doc/man1/wimverify.1 @@ -1,4 +1,4 @@ -.TH WIMVERIFY "1" "August 2016" "wimlib 1.10.0" "User Commands" +.TH WIMVERIFY "1" "January 2017" "wimlib 1.11.0" "User Commands" .SH NAME wimverify \- Verify a WIM archive .SH SYNOPSIS diff --git a/include/wimlib.h b/include/wimlib.h index 2a957a70..135f5cb4 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.10.0, a C + * This is the documentation for the library interface of wimlib 1.11.0, a C * library for creating, modifying, extracting, and mounting files in the * Windows Imaging (WIM) format. This documentation is intended for developers * only. If you have installed wimlib and want to know how to use the @b @@ -408,7 +408,7 @@ #define WIMLIB_MAJOR_VERSION 1 /** Minor version of the library (for example, the 2 in 1.2.5). */ -#define WIMLIB_MINOR_VERSION 10 +#define WIMLIB_MINOR_VERSION 11 /** Patch version of the library (for example, the 5 in 1.2.5). */ #define WIMLIB_PATCH_VERSION 0 diff --git a/rpm/wimtools.spec b/rpm/wimtools.spec index 03cbb3ee..962e7661 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.10.0 +Version: 1.11.0 Release: 1 License: GPLv3+ URL: https://wimlib.net diff --git a/tools/update-version b/tools/update-version index 4868d890..401e93ea 100755 --- a/tools/update-version +++ b/tools/update-version @@ -1,14 +1,14 @@ #!/bin/bash -oldver='1\.9\.2' -oldmonth=June +oldver='1\.10\.0' +oldmonth=August oldyear=2016 newmajor=1 -newminor=10 +newminor=11 newpatch=0 -newmonth=August -newyear=2016 +newmonth=January +newyear=2017 newver="${newmajor}.${newminor}.${newpatch}" -- 2.43.0