Inc version number, update NEWS

diff --git a/Makefile.am b/Makefile.am
index dd1a0d34d94a74d69e4c090c3fd656e0de1be186..f695f5cda69a4f066ee6d7d8f4038a2eb8aec9d2 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 2:2:0
+libwim_la_LDFLAGS = -version-info 2:3:0
 
 libwim_la_SOURCES =            \
        src/add_image.c         \

diff --git a/NEWS b/NEWS
index 528c3e7aeeec83b0a10105dc50fecfd901314a78..c2844ad3e33512a1be9c788bbf71ec2584bf8d0c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,13 @@
 Only the most important changes more recent than version 0.6 are noted here.
 
+Version 1.2.5:
+       NTFS capture: Fixed capturing duplicate reparse points.
+
+       NTFS capture: Capture first unnamed stream if there are more than one
+       (print warning instead of error).
+
+       Allow multiple test cases to execute concurrently (e.g. make -j2 check).
+
 Version 1.2.4:
        Added --arch switch to mkwinpeimg script to support getting AMD64 WinPE
        from the WAIK.

diff --git a/README b/README
index 492a0cd57d21f2f8bbd9657c1274644478778f0e..cf4ea8069ca6adfbe4cecf8996ea4ff2dde152c3 100644 (file)
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
                                   WIMLIB
 
-This is wimlib version 1.2.4 (February 2013).  wimlib can be used to read,
+This is wimlib version 1.2.5 (February 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 1b6afd7725ecd12243ddca3752a2abaa91cf69b9..0b28272a700e2be8898dddf576a45b03af118dde 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.4
+pkgver=1.2.5
 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 5dfcd0eabb970875710b7b2e69cf54ec120782aa..87612a7784f4145eea088ad7e624efeb46b65153 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([wimlib], [1.2.4], [ebiggers3@gmail.com])
+AC_INIT([wimlib], [1.2.5], [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 30133b07fa61bf5064ee04306ec1ee2143098e36..cf5ec5517c03491b1236077b13c391e416852522 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+wimlib (1.2.5-1) unstable; urgency=low
+
+  * Update to v1.2.5
+
+ -- Eric Biggers <ebiggers3gmail.com>  Tue, 05 Feb 2013 20:26:47 -0600
+
 wimlib (1.2.4-1) unstable; urgency=low
 
   * Update to v1.2.4

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

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

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

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

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

diff --git a/src/wimlib.h b/src/wimlib.h
index 8774406475a0974c6eaa093d5e9a200c1549c86a..a249b8954a901c55a594534b3fb49156b8e8de12 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.4.  If you
+ * This is the documentation for the library interface of wimlib 1.2.5.  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 4
+#define WIMLIB_PATCH_VERSION 5
 
 /**
  * Opaque structure that represents a WIM file.  This is an in-memory structure