Update version to 1.2.6

diff --git a/NEWS b/NEWS
index c2844ad3e33512a1be9c788bbf71ec2584bf8d0c..75a500a321da43c06d895b925549f98e77021da3 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 Only the most important changes more recent than version 0.6 are noted here.
 
+Version 1.2.6:
+       Storing UNIX file owners, groups, and modes in WIM images is now
+       possible using `imagex capture' with the --unix-data flag.
+
+       Minor bug fixes and documentation fixes.
+
 Version 1.2.5:
        NTFS capture: Fixed capturing duplicate reparse points.
 

diff --git a/README b/README
index e616088022f24bf25756fed5b6b94d2e848390c0..5725849ce1c5aa87d6bd2799d78b4bca0e06dd80 100644 (file)
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
                                   WIMLIB
 
-This is wimlib version 1.2.5 (February 2013).  wimlib can be used to read,
+This is wimlib version 1.2.6 (March 2013).  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 7bd5bee096fee2dd63a8dd7350a61ae46083b3d0..4778d8e20f84b7a5205c7bdcf56ac3213b7a4dc9 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.5
+pkgver=1.2.6
 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 87612a7784f4145eea088ad7e624efeb46b65153..800d6b888f9ecd76d303cf5fe83781f526a77063 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([wimlib], [1.2.5], [ebiggers3@gmail.com])
+AC_INIT([wimlib], [1.2.6], [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 cf5ec5517c03491b1236077b13c391e416852522..eb6b95cc9c2c8829b3a3685fbab185c827668fd1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+wimlib (1.2.6-1) unstable; urgency=low
+
+  * Update to v1.2.6
+
+ -- Eric Biggers <ebiggers3gmail.com>  Tue, 05 Mar 2013 14:26:59 -0600
+
 wimlib (1.2.5-1) unstable; urgency=low
 
   * Update to v1.2.5

diff --git a/doc/imagex-apply.1.in b/doc/imagex-apply.1.in
index 5d83d857543ec18be3926a4c453f6195cd331372..a525caf97d1e8d46f9614a52e71169c3cea4307b 100644 (file)
--- a/doc/imagex-apply.1.in
+++ b/doc/imagex-apply.1.in
@@ -1,4 +1,4 @@
-.TH IMAGEX "1" "February 2013" "imagex (wimlib) wimlib @VERSION@" "User Commands"
+.TH IMAGEX "1" "March 2013" "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 bf47b8347159fa14b37b5c2e7fbd21f6d0a410d5..e97d32d71280c5a22fb27fb68431ef0636e53cd6 100644 (file)
--- a/doc/imagex-capture.1.in
+++ b/doc/imagex-capture.1.in
@@ -1,4 +1,4 @@
-.TH IMAGEX "1" "February 2013" "imagex (wimlib) wimlib @VERSION@" "User Commands"
+.TH IMAGEX "1" "March 2013" "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 745cfcd5da30755a9d9e21f0ba6b07292c0d0157..8dfcd306563f684ebad8c3e3d809e5280848ff1c 100644 (file)
--- a/doc/imagex-delete.1.in
+++ b/doc/imagex-delete.1.in
@@ -1,4 +1,4 @@
-.TH IMAGEX "1" "February 2013" "imagex (wimlib) wimlib @VERSION@" "User Commands"
+.TH IMAGEX "1" "March 2013" "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 2780130051ac8364aefa5dccb6783ba64120a8af..f5804614568da7aea77da5c5738854ee5940aecd 100644 (file)
--- a/doc/imagex-dir.1.in
+++ b/doc/imagex-dir.1.in
@@ -1,4 +1,4 @@
-.TH IMAGEX "1" "February 2013" "imagex (wimlib) wimlib @VERSION@" "User Commands"
+.TH IMAGEX "1" "March 2013" "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 52729a55affe0fbd1d8a2a7ec744a824ef8d7e69..e0ad169aef3712b7f5a6bd77b934c73e6f076ca7 100644 (file)
--- a/doc/imagex-export.1.in
+++ b/doc/imagex-export.1.in
@@ -1,4 +1,4 @@
-.TH IMAGEX "1" "February 2013" "imagex (wimlib) wimlib @VERSION@" "User Commands"
+.TH IMAGEX "1" "March 2013" "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 fc2b64b9b2ed5e6e6920b359e6278e41ad9eb23a..48f2a9466b6da321170c8052b2ca1b58132d8e57 100644 (file)
--- a/doc/imagex-info.1.in
+++ b/doc/imagex-info.1.in
@@ -1,4 +1,4 @@
-.TH IMAGEX "1" "February 2013" "imagex (wimlib) wimlib @VERSION@" "User Commands"
+.TH IMAGEX "1" "March 2013" "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 520ffba40eddd4fca91df8c8e68b21158c24af51..96da145be40403e0e90061b97e13112b192b583d 100644 (file)
--- a/doc/imagex-join.1.in
+++ b/doc/imagex-join.1.in
@@ -1,4 +1,4 @@
-.TH IMAGEX "1" "February 2013" "imagex (wimlib) wimlib @VERSION@" "User Commands"
+.TH IMAGEX "1" "March 2013" "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 5a9928e6e515bef66e8a4933bb64da0ac9fe8ea2..91083e7d1c63d0837fa1035a71b5d2989ac346e5 100644 (file)
--- a/doc/imagex-mount.1.in
+++ b/doc/imagex-mount.1.in
@@ -1,4 +1,4 @@
-.TH IMAGEX "1" "February 2013" "imagex (wimlib) wimlib @VERSION@" "User Commands"
+.TH IMAGEX "1" "March 2013" "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 f1ffa98a5dfa99567ad670866da028531494b014..c21585cd81f352f1e3919cdc911298de9a48fbb8 100644 (file)
--- a/doc/imagex-optimize.1.in
+++ b/doc/imagex-optimize.1.in
@@ -1,4 +1,4 @@
-.TH IMAGEX "1" "February 2013" "imagex (wimlib) wimlib @VERSION@" "User Commands"
+.TH IMAGEX "1" "March 2013" "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 8b201f0a83788717fded7809d4d62c9a0d2201d2..2c87ba548620db7ed1ad2123fd1f07f32048fc91 100644 (file)
--- a/doc/imagex-split.1.in
+++ b/doc/imagex-split.1.in
@@ -1,4 +1,4 @@
-.TH IMAGEX "1" "February 2013" "imagex (wimlib) wimlib @VERSION@" "User Commands"
+.TH IMAGEX "1" "March 2013" "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 0c2b3db6fa2527587b752edf0e3ba8c72c01aa6e..dac2452d6ad6b140b3ce4166812b90ea533b250d 100644 (file)
--- a/doc/imagex.1.in
+++ b/doc/imagex.1.in
@@ -1,4 +1,4 @@
-.TH IMAGEX 1 "February 2013" "imagex (wimlib @VERSION@)" "User Commands"
+.TH IMAGEX 1 "March 2013" "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 9da0b7d43c056dd3ccb6f1e1f62a5bd2ec7e00b2..684a53941cb0636c88b41220a88b7b4cfbd4ee00 100644 (file)
--- a/doc/mkwinpeimg.1.in
+++ b/doc/mkwinpeimg.1.in
@@ -1,4 +1,4 @@
-.TH MKWINPEIMG "1" "February 2013" "mkwinpeimg (wimlib @VERSION@)" "User Commands"
+.TH MKWINPEIMG "1" "March 2013" "mkwinpeimg (wimlib @VERSION@)" "User Commands"
 .SH NAME
 mkwinpeimg \- Make a customized bootable image of Windows PE
 .SH SYNOPSIS

diff --git a/make-release b/make-release
index be650cfcab5ca87c473e373326c161a73b374021..c93e6a1c296ea46dd091c17a115d4188e32e7c03 100755 (executable)
--- a/make-release
+++ b/make-release
@@ -1,13 +1,13 @@
 #!/bin/bash
 
-oldver='1\.2\.4'
+oldver='1\.2\.5'
 oldmonth=February
 oldyear=2013
 
 newmajor=1
 newminor=2
-newpatch=5
-newmonth=February
+newpatch=6
+newmonth=March
 newyear=2013
 
 

diff --git a/programs/mkwinpeimg b/programs/mkwinpeimg
index 3c8e7ac7afd1409debc784b6e29a841a439101eb..7d890d81307ee46c7214088013d1572a0b66855e 100755 (executable)
--- a/programs/mkwinpeimg
+++ b/programs/mkwinpeimg
@@ -20,7 +20,7 @@
 
 script_name="$(basename $0)"
 PREFIX_REG="::"
-WIMLIB_VERSION=1.2.5
+WIMLIB_VERSION=1.2.6
 
 calc_columns () {
        STAT_COL=80

diff --git a/rpm/wimlib-minimal.spec b/rpm/wimlib-minimal.spec
index b41cc8ed415e95c05bfceb018a440cad82279813..bf62fd447a1ab1b29486559229b4d0dbc2d07455 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.5
+Version:   1.2.6
 Release:   1
 License:   GPLv3+
 Group:     System/Libraries

diff --git a/rpm/wimlib-without-ntfs-3g.spec b/rpm/wimlib-without-ntfs-3g.spec
index 299912641fef4116a89abee943ab6d357aa1e98f..0a413dbeea6a6ec997a5878edec919c868522a85 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.5
+Version:   1.2.6
 Release:   1
 License:   GPLv3+
 Group:     System/Libraries

diff --git a/rpm/wimlib.spec b/rpm/wimlib.spec
index 73c418e578c62df84dd5d030cda8ff647fd519c0..ce91b294bb3485edcfee941afbe628073e1ec3ea 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.5
+Version:   1.2.6
 Release:   1
 License:   GPLv3+
 Group:     System/Libraries

diff --git a/src/wimlib.h b/src/wimlib.h
index 294ea19734fcfc6123574ed2cc1853e13a806194..43956643544bef880b6520c2917922511f14674c 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.5.  If you
+ * This is the documentation for the library interface of wimlib 1.2.6.  If you
  * have installed wimlib and want to know how to use the @c imagex program,
  * please see the man pages instead.
  *
@@ -228,7 +228,7 @@
 #define WIMLIB_MINOR_VERSION 2
 
 /** Patch version of the library (for example, the 5 in 1.2.5). */
-#define WIMLIB_PATCH_VERSION 5
+#define WIMLIB_PATCH_VERSION 6
 
 /**
  * Opaque structure that represents a WIM file.  This is an in-memory structure