From: Eric Biggers <ebiggers3@gmail.com>
Date: Wed, 6 Feb 2013 02:28:23 +0000 (-0600)
Subject: Inc version number, update NEWS
X-Git-Tag: v1.2.5~2
X-Git-Url: https://wimlib.net/git/?p=wimlib;a=commitdiff_plain;h=2beb22c748f33253876ca690cac7f7284c747106

Inc version number, update NEWS
---

diff --git a/Makefile.am b/Makefile.am
index dd1a0d34..f695f5cd 100644
--- 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 528c3e7a..c2844ad3 100644
--- 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 492a0cd5..cf4ea806 100644
--- 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 1b6afd77..0b28272a 100644
--- 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 5dfcd0ea..87612a77 100644
--- 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 30133b07..cf5ec551 100644
--- 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 01065696..be650cfc 100755
--- 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 def484f7..3c8e7ac7 100755
--- 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 8fff40ba..b41cc8ed 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.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 48eaa5a7..29991264 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.4
+Version:   1.2.5
 Release:   1
 License:   GPLv3+
 Group:     System/Libraries
diff --git a/rpm/wimlib.spec b/rpm/wimlib.spec
index bb25416e..73c418e5 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.4
+Version:   1.2.5
 Release:   1
 License:   GPLv3+
 Group:     System/Libraries
diff --git a/src/wimlib.h b/src/wimlib.h
index 87744064..a249b895 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.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