From: Eric Biggers Date: Thu, 22 Nov 2012 21:29:37 +0000 (-0600) Subject: Version 1.2.0 X-Git-Tag: v1.2.0~1 X-Git-Url: https://wimlib.net/git/?p=wimlib;a=commitdiff_plain;h=a5e30a05b4d7f02c57cc8fbb18e22d6fe31a79a0 Version 1.2.0 --- diff --git a/NEWS b/NEWS index 61ee7c75..5a33cefa 100644 --- a/NEWS +++ b/NEWS @@ -14,8 +14,8 @@ Version 1.2.0: A possible bug with changing the bootable image of a WIM was fixed. Some advisory locking is now done to prevent two processes from - modifying a WIM at the same time (but only in some cases). e.g. You - cannot mount two images from a WIM read-write at the same time. + modifying a WIM at the same time (but only in some cases). For example, + you cannot mount two images from a WIM read-write at the same time. Some functions have been reorganized: * wimlib_mount() renamed to wimlib_mount_image(). diff --git a/README b/README index 2f0a6841..21a981ec 100644 --- a/README +++ b/README @@ -221,8 +221,8 @@ It has been tested on x86 (32-bit) GNU/Linux occasionally. wimlib may work on FreeBSD and Mac OS X. However, this is not well tested. If you do not have libntfs-3g 2011-4-12 or later available, you must configure with ---without-ntfs-3g. Before mounting a WIM you need to load the POSIX message -queue module (run `kldload mqueuefs'). +--without-ntfs-3g. On FreeBSD, before mounting a WIM you need to load the POSIX +message queue module (run `kldload mqueuefs'). wimlib should work on big endian machines but it has not been tested. diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD index 6fe4d72c..0f18eb36 100644 --- a/archlinux/PKGBUILD +++ b/archlinux/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Eric Biggers pkgname=wimlib -pkgver=1.1.0 +pkgver=1.2.0 pkgrel=1 pkgdesc="A library to extract, create, and modify WIM files" arch=("i686" "x86_64") @@ -32,5 +32,3 @@ package() { cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install } - -sha512sums=('6ad94bb7de9c6cadbbf50644dc3807ba993c1e149ce6a0d91380bfbfe59943bfa78fd06a835f426cc7b3dfa2c59a269abc2f3d4d8d12fb3681f72aeefbdb873a') diff --git a/debian/changelog b/debian/changelog index bcf014f8..d898c6f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +wimlib (1.2.0-1) unstable; urgency=low + + * Update to v1.2.0 + + -- Eric Biggers Thu, 22 Nov 2012 14:35:33 -0600 + wimlib (1.1.0-1) unstable; urgency=low * Update to v1.1.0 diff --git a/doc/imagex-apply.1.in b/doc/imagex-apply.1.in index 4715e3ae..db1af8cc 100644 --- a/doc/imagex-apply.1.in +++ b/doc/imagex-apply.1.in @@ -198,12 +198,11 @@ present. .TP \fB--hardlink\fR When extracting a file from the WIM that is identical to a file that has already -extracted, create a hard link using \fBlink\fR (3) rather than creating a -separate file. This option causes all identical files to be hard-linked, -overriding the hard link groups that are specified in the WIM image(s). In the -case of extracting all images from the WIM, files may be hard-linked even if -they are in different WIM images. This option is not available in the NTFS -extraction mode. +extracted, create a hard link rather than creating a separate file. This option +causes all identical files to be hard-linked, overriding the hard link groups +that are specified in the WIM image(s). In the case of extracting all images +from the WIM, files may be hard-linked even if they are in different WIM images. +This option is not available in the NTFS extraction mode. .TP \fB--symlink\fR This option is similar to \fB--hardlink\fR, except symbolic links are created diff --git a/rpm/wimlib-minimal.spec b/rpm/wimlib-minimal.spec index 1e2d4594..21e0daf4 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.1.0 +Version: 1.2.0 Release: 1 License: GPLv3+ Group: System/Libraries diff --git a/rpm/wimlib-without-ntfs-3g.spec b/rpm/wimlib-without-ntfs-3g.spec index 5c36e73f..acb82fdf 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.1.0 +Version: 1.2.0 Release: 1 License: GPLv3+ Group: System/Libraries diff --git a/rpm/wimlib.spec b/rpm/wimlib.spec index b62293ed..220dc804 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.1.0 +Version: 1.2.0 Release: 1 License: GPLv3+ Group: System/Libraries diff --git a/src/wimlib.h b/src/wimlib.h index 08fb9a0f..6effa1c1 100644 --- a/src/wimlib.h +++ b/src/wimlib.h @@ -31,6 +31,10 @@ * * \section intro Introduction * + * This is the documentation for the library interface of wimlib 1.2.0. If you + * have installed wimlib and want to know how to use the @c imagex program, + * please see the man pages instead. + * * wimlib is a C library to read, write, and mount archive files in the Windows * Imaging Format (WIM files). These files are normally created using the @c * imagex.exe utility on Windows, but this library provides a free @@ -297,17 +301,17 @@ enum wimlib_progress_msg { * ::wimlib_progress_info.scan. */ WIMLIB_PROGRESS_MSG_SCAN_END, - /** + /** * File resources are currently being written to the WIM. * @a info will point to ::wimlib_progress_info.write_streams. */ WIMLIB_PROGRESS_MSG_WRITE_STREAMS, - /** + /** * The metadata resource for each image is about to be written to the * WIM. @a info will not be valid. */ WIMLIB_PROGRESS_MSG_WRITE_METADATA_BEGIN, - /** + /** * The metadata resource for each image has successfully been writen to * the WIM. @a info will not be valid. */ WIMLIB_PROGRESS_MSG_WRITE_METADATA_END, diff --git a/tests/tests-common.sh b/tests/tests-common.sh index 59c28c63..72cda678 100644 --- a/tests/tests-common.sh +++ b/tests/tests-common.sh @@ -7,7 +7,7 @@ else BSD_STAT=1 fi -get_inode_number() +get_inode_number() { if [ "$BSD_STAT" -eq 1 ]; then stat -f %i "$1"