From: Eric Biggers <ebiggers3@gmail.com>
Date: Tue, 5 Mar 2013 20:27:31 +0000 (-0600)
Subject: Update version to 1.2.6
X-Git-Tag: v1.2.6~10
X-Git-Url: https://wimlib.net/git/?p=wimlib;a=commitdiff_plain;h=72bca3eaa105979a551612a56812250d44f9b049;ds=sidebyside

Update version to 1.2.6
---

diff --git a/NEWS b/NEWS
index c2844ad3..75a500a3 100644
--- 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 e6160880..5725849c 100644
--- 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 7bd5bee0..4778d8e2 100644
--- 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 87612a77..800d6b88 100644
--- 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 cf5ec551..eb6b95cc 100644
--- 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 5d83d857..a525caf9 100644
--- 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 bf47b834..e97d32d7 100644
--- 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 745cfcd5..8dfcd306 100644
--- 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 27801300..f5804614 100644
--- 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 52729a55..e0ad169a 100644
--- 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 fc2b64b9..48f2a946 100644
--- 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 520ffba4..96da145b 100644
--- 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 5a9928e6..91083e7d 100644
--- 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 f1ffa98a..c21585cd 100644
--- 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 8b201f0a..2c87ba54 100644
--- 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 0c2b3db6..dac2452d 100644
--- 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 9da0b7d4..684a5394 100644
--- 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 be650cfc..c93e6a1c 100755
--- 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 3c8e7ac7..7d890d81 100755
--- 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 b41cc8ed..bf62fd44 100644
--- 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 29991264..0a413dbe 100644
--- 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 73c418e5..ce91b294 100644
--- 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 294ea197..43956643 100644
--- 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