Update version to 1.2.1

diff --git a/Makefile.am b/Makefile.am
index d4a3af6a84a320f7ac0528cd9fdf3fb66eecdb79..542b540be310765345d5a9b20171c4fa74bfce49 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@ AM_CFLAGS       = -std=gnu99 -D_LARGEFILE_SOURCE \
 
 lib_LTLIBRARIES = libwim.la
 
-libwim_la_LDFLAGS = -version-info 1:0:0
+libwim_la_LDFLAGS = -version-info 2:0:0
 
 libwim_la_SOURCES =            \
        src/add_image.c         \

diff --git a/README b/README
index d4b4ed1fc9df9544299f283b018adb3240d620e9..4ffd1420667a346b4e877e1cc927bdd8acbf8a4e 100644 (file)
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
                                   WIMLIB
 
-This is wimlib version 1.2.0 (November 2012).  wimlib can be used to read,
+This is wimlib version 1.2.1 (December 2012).  wimlib can be used to read,
 write, and mount files in the Windows Imaging Format (WIM files).  These files
 are normally created by using the `imagex.exe' utility on Windows, but this
 library provides a free implementation of imagex for UNIX-based systems.

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

diff --git a/configure.ac b/configure.ac
index 799cc91132d55493d8f22ff4f4dd5da829a2b0f7..03ad48a76ac295ec00f19a55c3ebee117311574d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([wimlib], [1.2.0], [ebiggers3@gmail.com])
+AC_INIT([wimlib], [1.2.1], [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 d898c6f6b05a9ca47962ee3e47300c670bc286e2..b7fd743fc92d14bb4989794e433da1e1f5a096f0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+wimlib (1.2.1-1) unstable; urgency=low
+
+  * Update to v1.2.1
+
+ -- Eric Biggers <ebiggers3@gmail.com>  Tue, 18 Dec 2012 11:25:02 -0600
+
 wimlib (1.2.0-1) unstable; urgency=low
 
   * Update to v1.2.0

diff --git a/doc/imagex-apply.1.in b/doc/imagex-apply.1.in
index 64b0311ecf53f2d60343b00c6949756afad2b5b6..0b7f8efe0f887fc0fa416ba35d0bd95afdbd7da9 100644 (file)
--- a/doc/imagex-apply.1.in
+++ b/doc/imagex-apply.1.in
@@ -1,4 +1,4 @@
-.TH IMAGEX "1" "November 2012" "imagex (wimlib) wimlib @VERSION@" "User Commands"
+.TH IMAGEX "1" "December 2012" "imagex (wimlib) wimlib @VERSION@" "User Commands"
 .SH NAME
 imagex-apply \- Extract one image, or all images, from a WIM archive
 

diff --git a/doc/imagex-capture.1.in b/doc/imagex-capture.1.in
index a0927133c33f02d05d78d4fc94aa2e5c0d1bc33a..0d8879a260835e181a228afb8665b5dcaeaeba65 100644 (file)
--- a/doc/imagex-capture.1.in
+++ b/doc/imagex-capture.1.in
@@ -1,4 +1,4 @@
-.TH IMAGEX "1" "November 2012" "imagex (wimlib) wimlib @VERSION@" "User Commands"
+.TH IMAGEX "1" "December 2012" "imagex (wimlib) wimlib @VERSION@" "User Commands"
 .SH NAME
 imagex-capture, imagex-append \- Capture a WIM image from a directory tree
 

diff --git a/doc/imagex-delete.1.in b/doc/imagex-delete.1.in
index 1505b9bd3e6d93b34f14202d50485fc500183d5b..91e3aa8880d5f8d713119800ad4977cc4a69c3ca 100644 (file)
--- a/doc/imagex-delete.1.in
+++ b/doc/imagex-delete.1.in
@@ -1,4 +1,4 @@
-.TH IMAGEX "1" "November 2012" "imagex (wimlib) wimlib @VERSION@" "User Commands"
+.TH IMAGEX "1" "December 2012" "imagex (wimlib) wimlib @VERSION@" "User Commands"
 .SH NAME
 imagex-delete \- Delete an image from a WIM archive
 

diff --git a/doc/imagex-dir.1.in b/doc/imagex-dir.1.in
index 415e237256ce4d76acb5f99fce1c9d43179bebb9..62a8a3c3da6acf6ee7a87b078f6beaafcc07dd04 100644 (file)
--- a/doc/imagex-dir.1.in
+++ b/doc/imagex-dir.1.in
@@ -1,4 +1,4 @@
-.TH IMAGEX "1" "November 2012" "imagex (wimlib) wimlib @VERSION@" "User Commands"
+.TH IMAGEX "1" "December 2012" "imagex (wimlib) wimlib @VERSION@" "User Commands"
 .SH NAME
 imagex-dir \- Show the files contained in a WIM archive
 

diff --git a/doc/imagex-export.1.in b/doc/imagex-export.1.in
index ff76516e02291dc9085e10fdd09eaf8cea1b7b13..47804acf8bbf6db03463dee910980019eb74157a 100644 (file)
--- a/doc/imagex-export.1.in
+++ b/doc/imagex-export.1.in
@@ -1,4 +1,4 @@
-.TH IMAGEX "1" "November 2012" "imagex (wimlib) wimlib @VERSION@" "User Commands"
+.TH IMAGEX "1" "December 2012" "imagex (wimlib) wimlib @VERSION@" "User Commands"
 .SH NAME
 imagex-export \- Exports an image from a WIM archive to an existing or new WIM archive
 

diff --git a/doc/imagex-info.1.in b/doc/imagex-info.1.in
index 7750133f7b34e41e5959cfb9b8c793c8eea72a3d..5dfd595390546e28d0bd8a6fad4d55296f6da151 100644 (file)
--- a/doc/imagex-info.1.in
+++ b/doc/imagex-info.1.in
@@ -1,4 +1,4 @@
-.TH IMAGEX "1" "November 2012" "imagex (wimlib) wimlib @VERSION@" "User Commands"
+.TH IMAGEX "1" "December 2012" "imagex (wimlib) wimlib @VERSION@" "User Commands"
 .SH NAME
 imagex-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 131aed377137dc5becae138970cd57e93bd41873..6757907d08dbe65a5c675af9781855feb579c259 100644 (file)
--- a/doc/imagex-join.1.in
+++ b/doc/imagex-join.1.in
@@ -1,4 +1,4 @@
-.TH IMAGEX "1" "November 2012" "imagex (wimlib) wimlib @VERSION@" "User Commands"
+.TH IMAGEX "1" "December 2012" "imagex (wimlib) wimlib @VERSION@" "User Commands"
 .SH NAME
 imagex-join \- Join split WIMs into a standalone one-part WIM
 

diff --git a/doc/imagex-mount.1.in b/doc/imagex-mount.1.in
index 83fd9f62cafb6136531049cbc50ae5498517d325..eaeaf1a7aa9de71900d801d11116a4fed365a35e 100644 (file)
--- a/doc/imagex-mount.1.in
+++ b/doc/imagex-mount.1.in
@@ -1,4 +1,4 @@
-.TH IMAGEX "1" "November 2012" "imagex (wimlib) wimlib @VERSION@" "User Commands"
+.TH IMAGEX "1" "December 2012" "imagex (wimlib) wimlib @VERSION@" "User Commands"
 .SH NAME
 imagex-mount, imagex-mountrw, imagex-unmount \- Mount and unmount an image from a WIM archive
 

diff --git a/doc/imagex-optimize.1.in b/doc/imagex-optimize.1.in
index 9074fb41c7c8fb6e54b106e54bbb4fe9c8e9073f..36b9ed0fd491c140f0f9615c0a0eec57d8d8eb7e 100644 (file)
--- a/doc/imagex-optimize.1.in
+++ b/doc/imagex-optimize.1.in
@@ -1,4 +1,4 @@
-.TH IMAGEX "1" "November 2012" "imagex (wimlib) wimlib @VERSION@" "User Commands"
+.TH IMAGEX "1" "December 2012" "imagex (wimlib) wimlib @VERSION@" "User Commands"
 .SH NAME
 imagex-optimize \- Optimize a WIM archive
 

diff --git a/doc/imagex-split.1.in b/doc/imagex-split.1.in
index d15e69ed9d2f8fef3d55042a22a35722a2984d05..03c0a05a68731cf42d2c29bc09d8d569c8a25fa3 100644 (file)
--- a/doc/imagex-split.1.in
+++ b/doc/imagex-split.1.in
@@ -1,4 +1,4 @@
-.TH IMAGEX "1" "November 2012" "imagex (wimlib) wimlib @VERSION@" "User Commands"
+.TH IMAGEX "1" "December 2012" "imagex (wimlib) wimlib @VERSION@" "User Commands"
 .SH NAME
 imagex-split \- Split a WIM into multiple parts
 

diff --git a/doc/imagex.1.in b/doc/imagex.1.in
index 86e0eaba0ebd4ccb33cdf40ecb118379ada3c1f7..8f67adfbdd29f1dd62520e70051a043e5bb86b38 100644 (file)
--- a/doc/imagex.1.in
+++ b/doc/imagex.1.in
@@ -1,4 +1,4 @@
-.TH IMAGEX 1 "November 2012" "imagex (wimlib @VERSION@)" "User Commands"
+.TH IMAGEX 1 "December 2012" "imagex (wimlib @VERSION@)" "User Commands"
 .SH NAME
 imagex \- 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 e89ca129d29d57f5378383ca356768852cee66c4..ad975a2d87621b908b8d026973bb0b19d3e7d49a 100644 (file)
--- a/doc/mkwinpeimg.1.in
+++ b/doc/mkwinpeimg.1.in
@@ -1,4 +1,4 @@
-.TH MKWINPEIMG "1" "November 2012" "mkwinpeimg (wimlib @VERSION@)" "User Commands"
+.TH MKWINPEIMG "1" "December 2012" "mkwinpeimg (wimlib @VERSION@)" "User Commands"
 .SH NAME
 mkwinpeimg \- Make a customized bootable image of Windows PE
 .SH SYNOPSIS

diff --git a/rpm/wimlib-minimal.spec b/rpm/wimlib-minimal.spec
index 21e0daf4971df98c74ab076a3ef25bd4b649930e..5c6d84a66aa5d1b2d56ee085b2e1843a68e43ab7 100644 (file)
--- a/rpm/wimlib-minimal.spec
+++ b/rpm/wimlib-minimal.spec
@@ -1,6 +1,6 @@
 Summary:   Library to extract, create, and modify WIM files
 Name:      wimlib
-Version:   1.2.0
+Version:   1.2.1
 Release:   1
 License:   GPLv3+
 Group:     System/Libraries

diff --git a/rpm/wimlib-without-ntfs-3g.spec b/rpm/wimlib-without-ntfs-3g.spec
index acb82fdf895d91b234af520e598fafe81ebabf4f..18c1a5538132199d473c82cc79f9c68063096d78 100644 (file)
--- a/rpm/wimlib-without-ntfs-3g.spec
+++ b/rpm/wimlib-without-ntfs-3g.spec
@@ -1,6 +1,6 @@
 Summary:   Library to extract, create, and modify WIM files
 Name:      wimlib
-Version:   1.2.0
+Version:   1.2.1
 Release:   1
 License:   GPLv3+
 Group:     System/Libraries

diff --git a/rpm/wimlib.spec b/rpm/wimlib.spec
index 220dc804507e42a5f82aa96ba4aa4154a131c1a7..7e037e1c3b0efe823a6b8c656c459404a2ade9c1 100644 (file)
--- a/rpm/wimlib.spec
+++ b/rpm/wimlib.spec
@@ -1,6 +1,6 @@
 Summary:   Library to extract, create, and modify WIM files
 Name:      wimlib
-Version:   1.2.0
+Version:   1.2.1
 Release:   1
 License:   GPLv3+
 Group:     System/Libraries

diff --git a/src/mount_image.c b/src/mount_image.c
index 6a38dc33e8cabbfb7b0dce837052a18bc28650a9..987da8e9b1c5d4c60e92f11eaa513191882f95be 100644 (file)
--- a/src/mount_image.c
+++ b/src/mount_image.c
@@ -1037,7 +1037,7 @@ static int send_unmount_request_msg(mqd_t mq, int unmount_flags,
        DEBUG("Sending unmount request msg");
        struct msg_unmount_request msg = {
                .hdr = {
-                       .min_version = WIMLIB_MAKEVERSION(1, 2, 0),
+                       .min_version = WIMLIB_MAKEVERSION(1, 2, 1),
                        .cur_version = WIMLIB_VERSION_CODE,
                        .msg_type    = MSG_TYPE_UNMOUNT_REQUEST,
                        .msg_size    = sizeof(msg),
@@ -1060,7 +1060,7 @@ static int send_daemon_info_msg(mqd_t mq, pid_t pid, int mount_flags)
 
        struct msg_daemon_info msg = {
                .hdr = {
-                       .min_version = WIMLIB_MAKEVERSION(1, 2, 0),
+                       .min_version = WIMLIB_MAKEVERSION(1, 2, 1),
                        .cur_version = WIMLIB_VERSION_CODE,
                        .msg_type = MSG_TYPE_DAEMON_INFO,
                        .msg_size = sizeof(msg),
@@ -1080,7 +1080,7 @@ static void send_unmount_finished_msg(mqd_t mq, int status)
        DEBUG("Sending unmount finished msg");
        struct msg_unmount_finished msg = {
                .hdr = {
-                       .min_version = WIMLIB_MAKEVERSION(1, 2, 0),
+                       .min_version = WIMLIB_MAKEVERSION(1, 2, 1),
                        .cur_version = WIMLIB_VERSION_CODE,
                        .msg_type = MSG_TYPE_UNMOUNT_FINISHED,
                        .msg_size = sizeof(msg),
@@ -1097,7 +1097,7 @@ static int unmount_progress_func(enum wimlib_progress_msg msg,
        if (msg == WIMLIB_PROGRESS_MSG_WRITE_STREAMS) {
                struct msg_write_streams_progress msg = {
                        .hdr = {
-                               .min_version = WIMLIB_MAKEVERSION(1, 2, 0),
+                               .min_version = WIMLIB_MAKEVERSION(1, 2, 1),
                                .cur_version = WIMLIB_VERSION_CODE,
                                .msg_type = MSG_TYPE_WRITE_STREAMS_PROGRESS,
                                .msg_size = sizeof(msg),

diff --git a/src/wimlib.h b/src/wimlib.h
index 76481bdf7ba1f9b4fba26a697f245bbe19402946..57f9aa9722a3e83741571d04bf92c46a7c0cc88a 100644 (file)
--- a/src/wimlib.h
+++ b/src/wimlib.h
@@ -31,7 +31,7 @@
  *
  * \section intro Introduction
  *
- * This is the documentation for the library interface of wimlib 1.2.0.  If you
+ * This is the documentation for the library interface of wimlib 1.2.1.  If you
  * have installed wimlib and want to know how to use the @c imagex program,
  * please see the man pages instead.
  *
@@ -217,7 +217,7 @@
 
 #define WIMLIB_MAJOR_VERSION 1
 #define WIMLIB_MINOR_VERSION 2
-#define WIMLIB_PATCH_VERSION 0
+#define WIMLIB_PATCH_VERSION 1
 
 /**
  * Opaque structure that represents a WIM file.  This is an in-memory structure