Update version to 1.2.3

diff --git a/Makefile.am b/Makefile.am
index 35b2ad1a8eb23b31cc93c52b91b06bf6173a1d6a..98a247eaabebd4a1ea050d60e1442bf92d26f7dc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@ AM_CFLAGS       = -std=gnu99 -D_LARGEFILE_SOURCE \
 
 lib_LTLIBRARIES = libwim.la
 
 
 lib_LTLIBRARIES = libwim.la
 

-libwim_la_LDFLAGS = -version-info 2:0:0
+libwim_la_LDFLAGS = -version-info 2:1:0

 
 libwim_la_SOURCES =            \
        src/add_image.c         \
 
 libwim_la_SOURCES =            \
        src/add_image.c         \

diff --git a/NEWS b/NEWS
index baafabaa4059c1b46558f7f389e8a80e86489dfc..db29f510e06251adb358aeb8b90c09120abb9c58 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 Only the most important changes more recent than version 0.6 are noted here.
 
 Only the most important changes more recent than version 0.6 are noted here.
 

+Version 1.2.3:
+       Fixed truncating file to shorter but non-zero length on read-write
+       mounted WIM image.
+
+       Various code cleanups and minor documentation fixes.
+

 Version 1.2.2:
        LZX and XPRESS decompression have received some additional optimizations
        and should now be even faster.  (Although, they were already pretty
 Version 1.2.2:
        LZX and XPRESS decompression have received some additional optimizations
        and should now be even faster.  (Although, they were already pretty

diff --git a/README b/README
index 212c554e61400f5cbc6975be8838bc213d788e7b..ef60b7fe60e148e5508e3a939bad24b13c4aa764 100644 (file)
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
                                   WIMLIB
 
                                   WIMLIB
 

-This is wimlib version 1.2.2 (December 2012).  wimlib can be used to read,
+This is wimlib version 1.2.3 (January 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.
 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.


@@ -328,8 +328,8 @@ By default, wimlib will be linked to the system library "libcrypto", which
 probably will be OpenSSL.  Some people believe that GPL code cannot be linked to
 OpenSSL without a linking exception.  As far as I know, I cannot officially
 include a linking exception with the license of this library because several
 probably will be OpenSSL.  Some people believe that GPL code cannot be linked to
 OpenSSL without a linking exception.  As far as I know, I cannot officially
 include a linking exception with the license of this library because several

-files could be considered derived works of LGPL code copyrighted by others.  If
-you believe this to be a problem, configure with --without-libcrypto to avoid
+files could be considered derived works of code copyrighted by others.  If you
+believe this to be a problem, configure with --without-libcrypto to avoid

 linking with OpenSSL.  There is no difference in functionality--- there will
 just be stand-alone SHA1 message digest code built into the library.
 
 linking with OpenSSL.  There is no difference in functionality--- there will
 just be stand-alone SHA1 message digest code built into the library.
 

diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD
index 20280e3b415a01f021ed164678fa5a44ae8ce84f..4d838ea709180fa8a59f4e4c4a4410a409932c60 100644 (file)
--- a/archlinux/PKGBUILD
+++ b/archlinux/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer:  Eric Biggers <ebiggers3 at gmail dot com>
 
 pkgname=wimlib
 # Maintainer:  Eric Biggers <ebiggers3 at gmail dot com>
 
 pkgname=wimlib

-pkgver=1.2.2
+pkgver=1.2.3

 pkgrel=1
 pkgdesc="A library to extract, create, and modify WIM files"
 arch=("i686" "x86_64")
 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 dff445590be12b0a42730a07e21198fb479cde72..2ed9d7da89218a2d572b62badc16ed064e255fd0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([wimlib], [1.2.2], [ebiggers3@gmail.com])
+AC_INIT([wimlib], [1.2.3], [ebiggers3@gmail.com])

 AC_CONFIG_SRCDIR([src/wim.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
 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 3fc432849fde2dab7fc33959f962cd8fce710ec1..0fd968d5518318cb75543a907e7dcaf390ea327d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+wimlib (1.2.3-1) unstable; urgency=low
+
+  * Update to v1.2.3
+
+ -- Eric Biggers <ebiggers3gmail.com>  Mon, 31 Dec 2012 14:33:36 -0600
+

 wimlib (1.2.2-1) unstable; urgency=low
 
   * Update to v1.2.2
 wimlib (1.2.2-1) unstable; urgency=low
 
   * Update to v1.2.2

diff --git a/doc/imagex-apply.1.in b/doc/imagex-apply.1.in
index 8d8095afe3eba3033e04b6b059415199e0a31118..2b3869239d83586759905f7f20f86bc5502a9818 100644 (file)
--- a/doc/imagex-apply.1.in
+++ b/doc/imagex-apply.1.in
@@ -1,4 +1,4 @@
-.TH IMAGEX "1" "December 2012" "imagex (wimlib) wimlib @VERSION@" "User Commands"
+.TH IMAGEX "1" "January 2013" "imagex (wimlib) wimlib @VERSION@" "User Commands"

 .SH NAME
 imagex-apply \- Extract one image, or all images, from a WIM archive
 
 .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 0d8879a260835e181a228afb8665b5dcaeaeba65..d8dc92a2dd816fa809aa67658fbe61054111af03 100644 (file)
--- a/doc/imagex-capture.1.in
+++ b/doc/imagex-capture.1.in
@@ -1,4 +1,4 @@
-.TH IMAGEX "1" "December 2012" "imagex (wimlib) wimlib @VERSION@" "User Commands"
+.TH IMAGEX "1" "January 2013" "imagex (wimlib) wimlib @VERSION@" "User Commands"

 .SH NAME
 imagex-capture, imagex-append \- Capture a WIM image from a directory tree
 
 .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 91e3aa8880d5f8d713119800ad4977cc4a69c3ca..5347fb2c01870dbf64cbe1655349714ff28db8d8 100644 (file)
--- a/doc/imagex-delete.1.in
+++ b/doc/imagex-delete.1.in
@@ -1,4 +1,4 @@
-.TH IMAGEX "1" "December 2012" "imagex (wimlib) wimlib @VERSION@" "User Commands"
+.TH IMAGEX "1" "January 2013" "imagex (wimlib) wimlib @VERSION@" "User Commands"

 .SH NAME
 imagex-delete \- Delete an image from a WIM archive
 
 .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 62a8a3c3da6acf6ee7a87b078f6beaafcc07dd04..6c424f43fae55402f795572f7a60cea3c424562b 100644 (file)
--- a/doc/imagex-dir.1.in
+++ b/doc/imagex-dir.1.in
@@ -1,4 +1,4 @@
-.TH IMAGEX "1" "December 2012" "imagex (wimlib) wimlib @VERSION@" "User Commands"
+.TH IMAGEX "1" "January 2013" "imagex (wimlib) wimlib @VERSION@" "User Commands"

 .SH NAME
 imagex-dir \- Show the files contained in a WIM archive
 
 .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 47804acf8bbf6db03463dee910980019eb74157a..b49e19290ee59df3b30f93712993387998166db3 100644 (file)
--- a/doc/imagex-export.1.in
+++ b/doc/imagex-export.1.in
@@ -1,4 +1,4 @@
-.TH IMAGEX "1" "December 2012" "imagex (wimlib) wimlib @VERSION@" "User Commands"
+.TH IMAGEX "1" "January 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
 
 .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 5dfd595390546e28d0bd8a6fad4d55296f6da151..b95edb01a589b77be9d0060ad6607c5ca7c37f39 100644 (file)
--- a/doc/imagex-info.1.in
+++ b/doc/imagex-info.1.in
@@ -1,4 +1,4 @@
-.TH IMAGEX "1" "December 2012" "imagex (wimlib) wimlib @VERSION@" "User Commands"
+.TH IMAGEX "1" "January 2013" "imagex (wimlib) wimlib @VERSION@" "User Commands"

 .SH NAME
 imagex-info \- Display information about a WIM file, or change information about
 an image
 .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 6757907d08dbe65a5c675af9781855feb579c259..93430ed75edcae9b6dcf1374377058a5ac67ade9 100644 (file)
--- a/doc/imagex-join.1.in
+++ b/doc/imagex-join.1.in
@@ -1,4 +1,4 @@
-.TH IMAGEX "1" "December 2012" "imagex (wimlib) wimlib @VERSION@" "User Commands"
+.TH IMAGEX "1" "January 2013" "imagex (wimlib) wimlib @VERSION@" "User Commands"

 .SH NAME
 imagex-join \- Join split WIMs into a standalone one-part WIM
 
 .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 beda7c9c777f747fdb92415e13a37346fa83e66d..3d4431265253122dd533db1b0a4e657012ae69a2 100644 (file)
--- a/doc/imagex-mount.1.in
+++ b/doc/imagex-mount.1.in
@@ -1,4 +1,4 @@
-.TH IMAGEX "1" "December 2012" "imagex (wimlib) wimlib @VERSION@" "User Commands"
+.TH IMAGEX "1" "January 2013" "imagex (wimlib) wimlib @VERSION@" "User Commands"

 .SH NAME
 imagex-mount, imagex-mountrw, imagex-unmount \- Mount and unmount an image from a WIM archive
 
 .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 779c7f374ce1942a2c5c3d6f33aae9f04d8eb736..a229ec7bb5a6c75754fd53f0a326e2cbf15768d2 100644 (file)
--- a/doc/imagex-optimize.1.in
+++ b/doc/imagex-optimize.1.in
@@ -1,4 +1,4 @@
-.TH IMAGEX "1" "December 2012" "imagex (wimlib) wimlib @VERSION@" "User Commands"
+.TH IMAGEX "1" "January 2013" "imagex (wimlib) wimlib @VERSION@" "User Commands"

 .SH NAME
 imagex-optimize \- Optimize a WIM archive
 
 .SH NAME
 imagex-optimize \- Optimize a WIM archive
 

diff --git a/doc/imagex-split.1.in b/doc/imagex-split.1.in
index 03c0a05a68731cf42d2c29bc09d8d569c8a25fa3..e7e92977c2bbad180cfc849655d1822d41f03437 100644 (file)
--- a/doc/imagex-split.1.in
+++ b/doc/imagex-split.1.in
@@ -1,4 +1,4 @@
-.TH IMAGEX "1" "December 2012" "imagex (wimlib) wimlib @VERSION@" "User Commands"
+.TH IMAGEX "1" "January 2013" "imagex (wimlib) wimlib @VERSION@" "User Commands"

 .SH NAME
 imagex-split \- Split a WIM into multiple parts
 
 .SH NAME
 imagex-split \- Split a WIM into multiple parts
 

diff --git a/doc/imagex.1.in b/doc/imagex.1.in
index 8f67adfbdd29f1dd62520e70051a043e5bb86b38..d62ec8965aba604bdc1878e8b6f6546bccfe90c3 100644 (file)
--- a/doc/imagex.1.in
+++ b/doc/imagex.1.in
@@ -1,4 +1,4 @@
-.TH IMAGEX 1 "December 2012" "imagex (wimlib @VERSION@)" "User Commands"
+.TH IMAGEX 1 "January 2013" "imagex (wimlib @VERSION@)" "User Commands"

 .SH NAME
 imagex \- Create, modify, extract, mount, or unmount a WIM (Windows Imaging Format) archive
 .SH SYNOPSIS
 .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 ad975a2d87621b908b8d026973bb0b19d3e7d49a..94092e64cecf619f94fc603ca444ed2c90c86512 100644 (file)
--- a/doc/mkwinpeimg.1.in
+++ b/doc/mkwinpeimg.1.in
@@ -1,4 +1,4 @@
-.TH MKWINPEIMG "1" "December 2012" "mkwinpeimg (wimlib @VERSION@)" "User Commands"
+.TH MKWINPEIMG "1" "January 2013" "mkwinpeimg (wimlib @VERSION@)" "User Commands"

 .SH NAME
 mkwinpeimg \- Make a customized bootable image of Windows PE
 .SH SYNOPSIS
 .SH NAME
 mkwinpeimg \- Make a customized bootable image of Windows PE
 .SH SYNOPSIS

diff --git a/make-release b/make-release
index ce72220f885db5920228f117a61b6af780664215..527491a4e14ec549a68e6773008970f72d604594 100755 (executable)
--- a/make-release
+++ b/make-release
@@ -1,14 +1,14 @@
 #!/bin/bash
 
 #!/bin/bash
 

-oldver='1\.2\.1'
+oldver='1\.2\.2'

 oldmonth=December
 oldyear=2012
 
 newmajor=1
 newminor=2
 oldmonth=December
 oldyear=2012
 
 newmajor=1
 newminor=2

-newpatch=2
-newmonth=December
-newyear=2012
+newpatch=3
+newmonth=January
+newyear=2013

 
 
 newver="${newmajor}.${newminor}.${newpatch}"
 
 
 newver="${newmajor}.${newminor}.${newpatch}"

diff --git a/programs/mkwinpeimg b/programs/mkwinpeimg
index 9e259be5f382fb371d9a40ca07c55ec05348d336..3bc175cd6f7a0975c07278fe30ab3c7b7dc51f16 100755 (executable)
--- a/programs/mkwinpeimg
+++ b/programs/mkwinpeimg
@@ -20,7 +20,7 @@
 
 script_name="$(basename $0)"
 PREFIX_REG="::"
 
 script_name="$(basename $0)"
 PREFIX_REG="::"

-WIMLIB_VERSION=1.2.2
+WIMLIB_VERSION=1.2.3

 
 calc_columns () {
        STAT_COL=80
 
 calc_columns () {
        STAT_COL=80

diff --git a/rpm/wimlib-minimal.spec b/rpm/wimlib-minimal.spec
index a874e1f83c85c9fa178fb3f1d301e331b0ea7f29..7c3caf146e6245d9313dc3a6595e45e291ca5740 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
 Summary:   Library to extract, create, and modify WIM files
 Name:      wimlib

-Version:   1.2.2
+Version:   1.2.3

 Release:   1
 License:   GPLv3+
 Group:     System/Libraries
 Release:   1
 License:   GPLv3+
 Group:     System/Libraries

diff --git a/rpm/wimlib-without-ntfs-3g.spec b/rpm/wimlib-without-ntfs-3g.spec
index c51fbb8f77ff59ac74182056735a7a6f0236e442..c0ec891f6203791a9437b41e8a238bbca25ae1fb 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
 Summary:   Library to extract, create, and modify WIM files
 Name:      wimlib

-Version:   1.2.2
+Version:   1.2.3

 Release:   1
 License:   GPLv3+
 Group:     System/Libraries
 Release:   1
 License:   GPLv3+
 Group:     System/Libraries

diff --git a/rpm/wimlib.spec b/rpm/wimlib.spec
index 4a3037a0443f9d99bf13069e30b195f5af8d56b7..17894d506e1227f920155b8a82e41ed1e4437d03 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
 Summary:   Library to extract, create, and modify WIM files
 Name:      wimlib

-Version:   1.2.2
+Version:   1.2.3

 Release:   1
 License:   GPLv3+
 Group:     System/Libraries
 Release:   1
 License:   GPLv3+
 Group:     System/Libraries

diff --git a/src/wimlib.h b/src/wimlib.h
index 50fc3631193a1a6f7a64f9ac4568ef0f0067bb47..a3066b096f3ad3fbd59bf5571ded8fbf4e1342d1 100644 (file)
--- a/src/wimlib.h
+++ b/src/wimlib.h
@@ -31,7 +31,7 @@
  *
  * \section intro Introduction
  *
  *
  * \section intro Introduction
  *

- * This is the documentation for the library interface of wimlib 1.2.2.  If you
+ * This is the documentation for the library interface of wimlib 1.2.3.  If you

  * have installed wimlib and want to know how to use the @c imagex program,
  * please see the man pages instead.
  *
  * 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_MAJOR_VERSION 1
 #define WIMLIB_MINOR_VERSION 2

-#define WIMLIB_PATCH_VERSION 2
+#define WIMLIB_PATCH_VERSION 3

 
 /**
  * Opaque structure that represents a WIM file.  This is an in-memory structure
 
 /**
  * Opaque structure that represents a WIM file.  This is an in-memory structure