From 2bba9abc868d81e85a2a165db9ade09fdb30ac8e Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Fri, 14 Mar 2014 16:01:41 -0500 Subject: [PATCH] Update version number --- Makefile.am | 2 +- 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 +- src/mount_image.c | 2 +- update-version | 8 ++++---- 23 files changed, 32 insertions(+), 26 deletions(-) diff --git a/Makefile.am b/Makefile.am index fc7ac6ef..f5ac406a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,7 +15,7 @@ endif lib_LTLIBRARIES = libwim.la -libwim_la_LDFLAGS = -version-info 13:0:4 $(WINDOWS_LDFLAGS) +libwim_la_LDFLAGS = -version-info 14:0:5 $(WINDOWS_LDFLAGS) libwim_la_SOURCES = \ src/add_image.c \ diff --git a/README b/README index dbef7a8b..1148a539 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ INTRODUCTION -This is wimlib version 1.6.1 (January 2014). wimlib is a C library for +This is wimlib version 1.6.2 (March 2014). wimlib is a C library for creating, modifying, extracting, and mounting files in the Windows Imaging Format (WIM files). These files are normally created using the ImageX (imagex.exe) or Dism (Dism.exe) utilities on Windows, but wimlib is distributed diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD index 3b5bf23c..75022869 100644 --- a/archlinux/PKGBUILD +++ b/archlinux/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Eric Biggers pkgname=wimlib -pkgver=1.6.1 +pkgver=1.6.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 00cbfb36..944ccb00 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([wimlib], [1.6.1], [ebiggers3@gmail.com]) +AC_INIT([wimlib], [1.6.2-beta], [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 df630765..4a654f99 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +wimlib (1.6.2-1) unstable; urgency=low + + * Update to v1.6.2 + + -- Eric Biggers Fri, 14 Mar 2014 15:59:59 -0500 + wimlib (1.6.1-1) unstable; urgency=low * Update to v1.6.1 diff --git a/doc/imagex-apply.1.in b/doc/imagex-apply.1.in index c1ede60b..ab9efcd0 100644 --- a/doc/imagex-apply.1.in +++ b/doc/imagex-apply.1.in @@ -1,4 +1,4 @@ -.TH WIMLIB-IMAGEX "1" "January 2014" "@IMAGEX_PROGNAME@ @VERSION@" "User Commands" +.TH WIMLIB-IMAGEX "1" "March 2014" "@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 d1b7f95d..25212292 100644 --- a/doc/imagex-capture.1.in +++ b/doc/imagex-capture.1.in @@ -1,4 +1,4 @@ -.TH WIMLIB-IMAGEX "1" "January 2014" "@IMAGEX_PROGNAME@ @VERSION@" "User Commands" +.TH WIMLIB-IMAGEX "1" "March 2014" "@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 949368e9..71d5a278 100644 --- a/doc/imagex-delete.1.in +++ b/doc/imagex-delete.1.in @@ -1,4 +1,4 @@ -.TH WIMLIB-IMAGEX "1" "January 2014" "@IMAGEX_PROGNAME@ @VERSION@" "User Commands" +.TH WIMLIB-IMAGEX "1" "March 2014" "@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 38a578a6..379dddce 100644 --- a/doc/imagex-dir.1.in +++ b/doc/imagex-dir.1.in @@ -1,4 +1,4 @@ -.TH WIMLIB-IMAGEX "1" "January 2014" "@IMAGEX_PROGNAME@ @VERSION@" "User Commands" +.TH WIMLIB-IMAGEX "1" "March 2014" "@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 bd24e36c..28a1e774 100644 --- a/doc/imagex-export.1.in +++ b/doc/imagex-export.1.in @@ -1,4 +1,4 @@ -.TH WIMLIB-IMAGEX "1" "January 2014" "@IMAGEX_PROGNAME@ @VERSION@" "User Commands" +.TH WIMLIB-IMAGEX "1" "March 2014" "@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 a7dfd075..e8cdb52e 100644 --- a/doc/imagex-extract.1.in +++ b/doc/imagex-extract.1.in @@ -1,4 +1,4 @@ -.TH WIMLIB-IMAGEX "1" "January 2014" "@IMAGEX_PROGNAME@ @VERSION@" "User Commands" +.TH WIMLIB-IMAGEX "1" "March 2014" "@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 0bcbc4d0..6ada09a8 100644 --- a/doc/imagex-info.1.in +++ b/doc/imagex-info.1.in @@ -1,4 +1,4 @@ -.TH WIMLIB-IMAGEX "1" "January 2014" "@IMAGEX_PROGNAME@ @VERSION@" "User Commands" +.TH WIMLIB-IMAGEX "1" "March 2014" "@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 605e2af4..c2fe3e73 100644 --- a/doc/imagex-join.1.in +++ b/doc/imagex-join.1.in @@ -1,4 +1,4 @@ -.TH WIMLIB-IMAGEX "1" "January 2014" "@IMAGEX_PROGNAME@ @VERSION@" "User Commands" +.TH WIMLIB-IMAGEX "1" "March 2014" "@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 5fb88dc1..c30620cd 100644 --- a/doc/imagex-mount.1.in +++ b/doc/imagex-mount.1.in @@ -1,4 +1,4 @@ -.TH WIMLIB-IMAGEX "1" "January 2014" "@IMAGEX_PROGNAME@ @VERSION@" "User Commands" +.TH WIMLIB-IMAGEX "1" "March 2014" "@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 479b6e46..f284612d 100644 --- a/doc/imagex-optimize.1.in +++ b/doc/imagex-optimize.1.in @@ -1,4 +1,4 @@ -.TH WIMLIB-IMAGEX "1" "January 2014" "@IMAGEX_PROGNAME@ @VERSION@" "User Commands" +.TH WIMLIB-IMAGEX "1" "March 2014" "@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 9319f972..8e7d3c0e 100644 --- a/doc/imagex-split.1.in +++ b/doc/imagex-split.1.in @@ -1,4 +1,4 @@ -.TH WIMLIB-IMAGEX "1" "January 2014" "@IMAGEX_PROGNAME@ @VERSION@" "User Commands" +.TH WIMLIB-IMAGEX "1" "March 2014" "@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 fa81cb3e..83668f5a 100644 --- a/doc/imagex-update.1.in +++ b/doc/imagex-update.1.in @@ -1,4 +1,4 @@ -.TH WIMLIB-IMAGEX "1" "January 2014" "@IMAGEX_PROGNAME@ @VERSION@" "User Commands" +.TH WIMLIB-IMAGEX "1" "March 2014" "@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 8ba1ed95..44ae0480 100644 --- a/doc/imagex.1.in +++ b/doc/imagex.1.in @@ -1,4 +1,4 @@ -.TH WIMLIB-IMAGEX 1 "January 2014" "@IMAGEX_PROGNAME@ @VERSION@" "User Commands" +.TH WIMLIB-IMAGEX 1 "March 2014" "@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 a56a8180..befa2804 100644 --- a/doc/mkwinpeimg.1.in +++ b/doc/mkwinpeimg.1.in @@ -1,4 +1,4 @@ -.TH MKWINPEIMG "1" "January 2014" "mkwinpeimg (wimlib @VERSION@)" "User Commands" +.TH MKWINPEIMG "1" "March 2014" "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 22df79c5..854bca7c 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.6.1, a C + * This is the documentation for the library interface of wimlib 1.6.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 @@ -345,7 +345,7 @@ #define WIMLIB_MINOR_VERSION 6 /** 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 e132ad67..6207c7a3 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.6.1 +Version: 1.6.2 Release: 1 License: GPLv3+ URL: http://sourceforge.net/projects/wimlib diff --git a/src/mount_image.c b/src/mount_image.c index 30ee82d2..fac3f78a 100644 --- a/src/mount_image.c +++ b/src/mount_image.c @@ -1105,7 +1105,7 @@ send_unmount_request_msg(mqd_t mq, int unmount_flags, u8 want_progress_messages) struct msg_unmount_request msg = { .hdr = { .min_version = ((unmount_flags & WIMLIB_UNMOUNT_FLAG_NEW_IMAGE) ? - WIMLIB_MAKEVERSION(1, 6, 1) : + WIMLIB_MAKEVERSION(1, 6, 2) : WIMLIB_MAKEVERSION(1, 2, 1)), .cur_version = WIMLIB_VERSION_CODE, .msg_type = MSG_TYPE_UNMOUNT_REQUEST, diff --git a/update-version b/update-version index 4bb950a6..a6282901 100755 --- a/update-version +++ b/update-version @@ -1,13 +1,13 @@ #!/bin/bash -oldver='1\.6\.0' +oldver='1\.6\.1' oldmonth=January -oldyear=2013 +oldyear=2014 newmajor=1 newminor=6 -newpatch=1 -newmonth=January +newpatch=2 +newmonth=March newyear=2014 -- 2.43.0