Merge branch 'stable/v2.16'

Conflicts:
	AUTHORS
	NEWS
	configure.ac
	debian/changelog
	disk-utils/fsck.minix.c
	po/ca.po
	po/cs.po
	po/da.po
	po/de.po
	po/es.po
	po/et.po
	po/eu.po
	po/fi.po
	po/fr.po
	po/hu.po
	po/id.po
	po/it.po
	po/ja.po
	po/nl.po
	po/pl.po
	po/pt_BR.po
	po/ru.po
	po/sl.po
	po/sv.po
	po/tr.po
	po/uk.po
	po/util-linux-ng.pot
	po/vi.po
	po/zh_CN.po
	shlibs/blkid/src/probe.c
	shlibs/blkid/src/superblocks/iso9660.c
	shlibs/blkid/src/superblocks/vfat.c

12 files changed, 379 insertions, 18 deletions

diff --git a/NEWS b/NEWS
index 7ecf0bad..4f276644 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,14 @@ util-linux-ng 2.17-rc1: Nov 20 2009
 * see docs/v2.17-ReleaseNotes or complete changelog at
   ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.17/v2.17-rc1-ChangeLog
 
+util-linux-ng 2.16.2: Nov 30 2009
+* see docs/v2.16.2-ReleaseNotes or complete changelog at
+  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.16/v2.16.2-ChangeLog
+
+util-linux-ng 2.16.1: Sep 7 2009
+* see docs/v2.16.1-ReleaseNotes or complete changelog at
+  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.16/v2.16.1-ChangeLog
+
 util-linux-ng 2.16: Jul  2009
 * see docs/v2.16-ReleaseNotes or complete changelog at
   ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.16/v2.16-ChangeLog
diff --git a/debian/changelog b/debian/changelog
index 353b2703..4ba9efcf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,37 @@
+util-linux (2.17-0) experimental; urgency=low
+
+  [Bastian Friedrich]
+
+  * libblkid: DRBD support for blkid
+
+  [Karel Zak]
+
+  * sfdisk: confused about disk size
+  * mount: fix typo in mount.8
+  * fdisk: sleep-after-sync and fsync usage
+  * lscpu: add {32,64}-bit CPU modes detection
+  * tests: refresh lscpu tests
+  * docs: update AUTHORS file
+  * docs: update v2.17 ReleaseNotes
+  * build-sys: release++ (v2.17)
+  * update TODO file
+  * fdisk: don't include scsi.h
+  * po: merge changes
+
+  [Mike Frysinger]
+
+  * pg: command enters infinite loop
+
+  [localization folks]
+
+  * po: update zh_CN.po (from translationproject.org) (Ray Wang)
+  * po: update pl.po (from translationproject.org) (Jakub Bogusz)
+  * po: update cs.po (from translationproject.org) (Petr Pisar)
+  * po: update fi.po (from translationproject.org) (Lauri Nurmi)
+  * po: update eu.po (from translationproject.org) (Mikel Olasagasti)
+
+ -- LaMont Jones <lamont@debian.org>  Mon, 18 Jan 2010 08:01:43 -0700
+
 util-linux (2.17~rc3-1) experimental; urgency=low
 
   [Mike Frysinger]
@@ -47,6 +81,190 @@ util-linux (2.17~rc1-1) experimental; urgency=low
 
  -- LaMont Jones <lamont@debian.org>  Sun, 06 Dec 2009 18:56:21 -0700
 
+util-linux (2.16.2-0) unstable; urgency=low
+
+  [Milan Broz]
+
+  * libuuid: remove .UE macro from libuuid man pages.
+
+  [Ken Kopin]
+
+  * Fix typo in dmesg manpage.
+
+  [Mike Frysinger]
+
+  * tailf: fix printf format
+  * swapon: handle <=linux-2.6.19 bug in /proc/swaps
+
+  [Cristian Rodríguez]
+
+  * fdformat: fix memory leak in verify_disk()
+
+  [Lawrence Rust]
+
+  * libblkid: fix FAT super block definition
+
+  [Scott James Remnant]
+
+  * hwclock: do not access hardware clock when using --systz
+  * hwclock: set kernel timezone with --systz --utc
+
+  [Peter Breitenlohner]
+
+  * mkswap: restore device argument in mkswap.8 synopsis
+
+  [kevin.granade@gmail.com]
+
+  * mount: document changed semantics of tmpfs size option in mount.8
+
+  [Theodore Ts'o]
+
+  * lib: fix file descriptor leak in is_mounted()
+
+  [Karel Zak]
+
+  * libblkid: fix typo (swsupend -> swsuspend)
+  * switch_root: remove TIOCSCTTY and setsid().  red: #519237
+  * libblkid: add missing packed attributes, add new UFS magic strings
+  * mount: update list of pseudo filesystems
+  * sfdisk: dump has to be $LANG insensitive
+  * mount: more explicitly explain 'strictatime' in mount.8
+  * libblkid: fix the default cache file path
+  * fsck.minix: fix broken zone checking
+  * docs: update AUTHORS file
+  * docs: add v2.16.2 ReleaseNotes
+  * build-sys: release++ (v2.16.2)
+  * po: merge changes
+
+  [localization folks]
+
+  * po: update vi.po (from translationproject.org) (Clytie Siddall)
+  * po: update pl.po (from translationproject.org) (Jakub Bogusz)
+  * po: update id.po (from translationproject.org) (Arif E. Nugroho)
+
+ -- LaMont Jones <lamont@debian.org>  Sun, 06 Dec 2009 17:38:15 -0700
+
+util-linux (2.16.1-4) unstable; urgency=low
+
+  [Petter Reinholdtsen]
+
+  * 85-hwclock.rules only ran hwclock if BADYEAR defined.  Closes: #543375
+
+  [Hiroyuki Yamamoto]
+
+  * drop rdev on hurd.  Closes: #547808
+
+  [Karel Zak]
+
+  * libblkid: fix blkid_probe_set_utf8label() call for Joliet
+  * libblkid: trim tailing whitespace from unicode LABELs.  LP: #432215
+  * libblkid: prefer ISO9660 PVD Label to Joliet Label
+
+  [LaMont Jones]
+
+  * initramfs doesn't like hyphens in hook names.  Closes: #544669
+  * Merge remote branch 'origin/stable/v2.16' into stable/v2.16
+
+  [Florentin Duneau]
+
+  * Fix typo on swapon.8 manpage.  Closes: #487497
+
+ -- LaMont Jones <lamont@debian.org>  Sat, 10 Oct 2009 19:29:39 -0600
+
+util-linux (2.16.1-3) unstable; urgency=low
+
+  [Jonas Meurer]
+
+  * provide initramfs-tools hook to copy /sbin/blkid into initramfs. 
+    Closes: #544669
+
+  [LaMont Jones]
+
+  * meta: drop Depends: install-info, install-info calls in preinst/postrm. 
+    Based on the patch in the bug.  Closes: #547430, #547320
+  * rules: remove usr/share/info/dir.gz.  Closes: #547488
+
+ -- LaMont Jones <lamont@debian.org>  Sun, 20 Sep 2009 15:58:15 -0600
+
+util-linux (2.16.1-2) unstable; urgency=low
+
+  [Zdenek Behan]
+
+  * tests: fdisk doslabel test also checks changing partition type
+  * tests: fdisk doslabel test also checks setting partition active
+  * tests: test for basic functionality of sun labels
+
+  [Peter De Wachter]
+
+  * mkswap: unbreak -c ("check") option.
+
+  [Florian Zumbiehl]
+
+  * libblkid: fix buffer overflow in blkid_encode_string()
+
+  [Peter Volkov]
+
+  * mount: mention mtab for single mount point mount in mount.8
+
+  [Petter Reinholdtsen]
+
+  * meta: util-linux Depends: initscripts.  Closes: #546834
+
+  [Scott James Remnant]
+
+  * versionsort() prototype changed
+
+  [Peter Breitenlohner]
+
+  * mkfs.8: incomplete sentence and formatting
+  * vipw.8: remove erroneous empty line, formatting
+  * umount.8: command line for umount helpers, formatting
+  * cytune.8: missing description of `-S', formatting
+  * hexdump.1: erroneous .Nm ""
+  * ul.1: erroneous .SH instead of .Sh
+  * ctrlaltdel.8: formatting
+  * various other manpage formatting
+
+  [Daniel Mierswa]
+
+  * replace bcopy,bzero,index and rindex
+  * libblkid: allow linking with uClibc
+  * replace usleep() for systems that don't have them
+
+  [Karel Zak]
+
+  * libblkid: fix FALSE definition
+  * tailf: report inotify_add_watch() problems
+  * libblkid: fix ext2 detection on systems with ext4 only
+  * libblkid: fix cache->probe memory leak
+  * dmesg: add -r to help output
+  * mount: add info about ext{3,4} barriers to mount.8
+  * mount: clean up mount.8
+  * Revert "mount: clean up mount.8"
+  * mount: clean up mount.8
+  * hwclocks: use time limit for KDGHWCLK busy wait
+  * mount: add info about ext{3,4} barriers to mount.8
+  * mount: clean up mount.8
+  * Revert "mount: clean up mount.8"
+  * mount: clean up mount.8
+  * libblkid: add *.ko.gz support to modules.dep parser
+  * mkswap: fix memory leaks, cleanup check_blocks()
+  * docs: update AUTHORS file
+  * docs: add v2.16.1 ReleaseNotes
+  * build-sys: release++ (v2.16.1)
+  * po: merge changes
+
+  [LaMont Jones]
+  * meta: fix misc:Depends
+  * Depends: install-info, set -e in postrm
+
+  [localization folks]
+
+  * po: fix grammar glitch in german translation (Hendrik Lönngren)
+  * po: update ja.po (from translationproject.org) (Makoto Kato)
+
+ -- LaMont Jones <lamont@debian.org>  Thu, 17 Sep 2009 05:16:55 -0600
+
 util-linux (2.16-3) unstable; urgency=low
 
   [Kel Modderman]
diff --git a/debian/control b/debian/control
index 2b6fa157..e8327d1d 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,7 @@ Package: util-linux-locales
 Architecture: all
 Section: utils
 Priority: optional
-Depends: util-linux (>= ${Upstream}-0), util-linux (<< ${Upstream}.0-0)
+Depends: ${shlibs:Depends}, ${misc:Depends}, util-linux (>= ${Upstream}-0), util-linux (<< ${Upstream}.0-0)
 Replaces: util-linux (<< 2.11b)
 Description: Locales files for util-linux
  This package contains the internationalization files of for the util-linux
@@ -42,7 +42,7 @@ Package: mount
 Architecture: alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 sh4 s390 sparc sparc64
 Essential: yes
 Section: admin
-Pre-Depends: ${shlibs:Depends}
+Pre-Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: nfs-common (>=1:1.1.0-13)
 Description: Tools for mounting and manipulating filesystems
  This package provides the mount(8), umount(8), swapon(8),
@@ -52,7 +52,7 @@ Package: bsdutils
 Architecture: any
 Essential: yes
 Section: utils
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: bsdmainutils
 Description: Basic utilities from 4.4BSD-Lite
  This package contains the bare minimum number of BSD utilities needed
@@ -63,7 +63,7 @@ Package: fdisk-udeb
 Architecture: alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r mips mipsel powerpc ppc64 hurd-i386 sh4 sparc s390
 Priority: extra
 Section: debian-installer
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 XC-Package-Type: udeb
 XB-Installer-Menu-Item: 99999
 Description: Manually partition a hard drive (fdisk)
@@ -72,7 +72,7 @@ Package: cfdisk-udeb
 Architecture: alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r mips mipsel powerpc ppc64 hurd-i386 sh4 s390
 Priority: extra
 Section: debian-installer
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 XC-Package-Type: udeb
 XB-Installer-Menu-Item: 99999
 Description: Manually partition a hard drive (cfdisk)
@@ -80,7 +80,7 @@ Description: Manually partition a hard drive (cfdisk)
 Package: libblkid1
 Section: libs
 Priority: required
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Architecture: any
 Description: block device id library
  The blkid library which allows system programs like fsck and
@@ -93,7 +93,7 @@ Package: libblkid1-udeb
 XC-Package-Type: udeb
 Section: debian-installer
 Priority: optional
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Architecture: any
 Description: block device id library
  The blkid library which allows system programs like fsck and
@@ -107,7 +107,7 @@ Description: block device id library
 Package: libblkid-dev
 Section: libdevel
 Priority: extra
-Depends: libc6-dev | libc-dev, libblkid1 (= ${binary:Version}), uuid-dev
+Depends: libc6-dev | libc-dev, libblkid1 (= ${binary:Version}), uuid-dev, ${shlibs:Depends}, ${misc:Depends}
 Architecture: any
 Description: block device id library - headers and static libraries
  The blkid library which allows system programs like fsck and
@@ -120,7 +120,7 @@ Description: block device id library - headers and static libraries
 
 Package: libuuid1
 Section: libs
-Depends: passwd, ${shlibs:Depends}
+Depends: passwd, ${shlibs:Depends}, ${misc:Depends}
 Recommends: uuid-runtime
 Replaces: e2fsprogs (<< 1.34-1)
 Architecture: any
@@ -137,7 +137,7 @@ Description: Universally Unique ID library
 Package: uuid-runtime
 Section: libs
 Priority: optional
-Depends: passwd, libuuid1 (>> 1.40.3-1), ${shlibs:Depends}
+Depends: passwd, libuuid1 (>> 1.40.3-1), ${shlibs:Depends}, ${misc:Depends}
 Replaces: e2fsprogs (<= 1.40.3-1ubuntu1)
 Architecture: any
 Description: runtime components for the Universally Unique ID library
@@ -162,7 +162,7 @@ Package: libuuid1-udeb
 XC-Package-Type: udeb
 Section: debian-installer
 Priority: optional
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Architecture: any
 Description: stripped down universally unique id library, for debian-installer
  libuuid generates and parses 128-bit universally unique ids (UUIDs).
@@ -173,7 +173,7 @@ Description: stripped down universally unique id library, for debian-installer
 Package: uuid-dev
 Section: libdevel
 Priority: extra
-Depends: libc6-dev | libc-dev, libuuid1 (= ${binary:Version})
+Depends: libc6-dev | libc-dev, libuuid1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Replaces: e2fslibs-dev (<< 1.15)
 Architecture: any
 Description: universally unique id library - headers and static libraries
@@ -186,7 +186,7 @@ Package: util-linux-udeb
 Architecture: any
 Priority: optional
 Section: debian-installer
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 XC-Package-Type: udeb
 Description: Miscellaneous system utilities
  This is a minimal version of util-linux for debian-installer. It only
diff --git a/debian/rules b/debian/rules
index 70c8a3e1..35f376d2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,10 @@ export arch = $(DEB_HOST_ARCH)
 version := $(shell sed -e '1{;s|^util-linux (\(.*\))\ .*|\1|;q;}' debian/changelog)
 Upstream := $(shell sed 's/^.*(\(.*\)-.*).*/\1/; q' debian/changelog)
 
-CONFOPTS= --enable-raw --enable-rdev --enable-partx --with-slang
+CONFOPTS= --enable-raw --enable-partx --with-slang
+ifneq ($(DEB_HOST_ARCH_OS),hurd)
+CONFOPTS += --enable-rdev
+endif
 ifeq ($(DEB_HOST_ARCH_OS),linux)
 CONFOPTS += --with-selinux
 endif
@@ -67,6 +70,7 @@ install: build
 	$(MAKE) install DESTDIR=`pwd`/debian/util-linux INSTALL_STRIP_FLAG=""
 	dh_installdocs -i -s
 	install -m 644 login-utils/README.modems-with-agetty debian/util-linux/usr/share/doc/util-linux/README.modems-with-getty
+	install -m 755 debian/util-linux.initramfs debian/util-linux/usr/share/initramfs-tools/hooks/utillinux
 	dh_installexamples -i -s
 	dh_installmenu -i -s
 	dh_installcron -i -s
@@ -97,6 +101,7 @@ endif
 	# perl gets to do rename, not us.
 	mv debian/util-linux/usr/bin/rename debian/util-linux/usr/bin/rename.ul
 	mv debian/util-linux/usr/share/man/man1/rename.1 debian/util-linux/usr/share/man/man1/rename.ul.1
+	rm -f debian/util-linux/usr/share/info/dir
 	#
 	#
 	mv debian/util-linux/usr/share/getopt/* debian/util-linux/usr/share/doc/util-linux/examples
diff --git a/debian/util-linux.dirs b/debian/util-linux.dirs
index 16ef4dd1..5bf27820 100644
--- a/debian/util-linux.dirs
+++ b/debian/util-linux.dirs
@@ -16,6 +16,8 @@ usr/share/info/
 usr/share/doc/
 usr/share/doc/util-linux/
 usr/share/doc/util-linux/examples/
+usr/share/initramfs-tools/
+usr/share/initramfs-tools/hooks/
 usr/share/lintian/
 usr/share/lintian/overrides/
 lib/
diff --git a/debian/util-linux.initramfs b/debian/util-linux.initramfs
new file mode 100644
index 00000000..ea1e1653
--- /dev/null
+++ b/debian/util-linux.initramfs
@@ -0,0 +1,16 @@
+#!/bin/sh -e
+
+PREREQ=""
+
+prereqs()
+{
+	echo "$PREREQ"
+}
+
+case $1 in
+    prereqs)	prereqs; exit 0;;
+esac
+
+. /usr/share/initramfs-tools/hook-functions
+
+copy_exec /sbin/blkid
diff --git a/debian/util-linux.postrm b/debian/util-linux.postrm
index 5e02ad26..21630b18 100644
--- a/debian/util-linux.postrm
+++ b/debian/util-linux.postrm
@@ -1,11 +1,13 @@
 #!/bin/sh
 
+set -e
+
 case "$1" in
 	remove)
 		;;
         purge)
-                update-rc.d hwclock.sh remove >/dev/null
-		update-rc.d hwclockfirst.sh remove >/dev/null
+                update-rc.d hwclock.sh remove >/dev/null || true
+		update-rc.d hwclockfirst.sh remove >/dev/null || true
 		rm -f /etc/adjtime
                 ;;
 	*)
diff --git a/disk-utils/fsck.minix.c b/disk-utils/fsck.minix.c
index 0ce71964..3fb80a35 100644
--- a/disk-utils/fsck.minix.c
+++ b/disk-utils/fsck.minix.c
@@ -107,6 +107,10 @@
 #include "pathnames.h"
 #include "bitops.h"
 
+#ifndef __linux__
+#define volatile
+#endif
+
 #define ROOT_INO 1
 
 #define UPPER(size,n) ((size+((n)-1))/(n))
diff --git a/docs/v2.16.1-ReleaseNotes b/docs/v2.16.1-ReleaseNotes
new file mode 100644
index 00000000..c61c3ddd
--- /dev/null
+++ b/docs/v2.16.1-ReleaseNotes
@@ -0,0 +1,57 @@
+Util-linux-ng 2.16.1 Release Notes
+==================================
+
+Changes since v2.16
+-------------------
+
+ For more details see ChangeLog files at:
+ ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.16/
+
+build-sys:
+   - don't distribute generated *.pc files  [Karel Zak]
+cal:
+   - fix (harmless) typo  [Peter Breitenlohner]
+   - fix broken computation for Sep 1752  [Peter Breitenlohner]
+dmesg:
+   - add -r to help output  [Karel Zak]
+docs:
+   - update "The Perfect Patch" URL  [Karel Zak]
+   - update AUTHORS file  [Karel Zak]
+libblkid:
+   - add *.ko.gz support to modules.dep parser  [Karel Zak]
+   - allow linking with uClibc  [Daniel Mierswa]
+   - fix FALSE definition  [Karel Zak]
+   - fix buffer overflow in blkid_encode_string()  [Florian Zumbiehl]
+   - fix cache->probe memory leak  [Karel Zak]
+   - fix ext2 detection on systems with ext4 only  [Karel Zak]
+mkswap:
+   - fix memory leaks, cleanup check_blocks()  [Karel Zak]
+   - unbreak -c ("check") option.  [Peter De Wachter]
+mount:
+   - add info about ext{3,4} barriers to mount.8  [Karel Zak]
+   - clean up mount.8  [Karel Zak]
+   - mention mtab for single mount point mount in mount.8  [Peter Volkov]
+pg:
+   - compiler warning with NLS disabled  [Peter Breitenlohner]
+po:
+   - fix grammar glitch in german translation  [Hendrik Lönngren]
+   - merge changes  [Karel Zak]
+   - update ja.po (from translationproject.org)  [Makoto Kato]
+scriptreplay:
+   - fix typo in error message  [Karel Zak]
+tailf:
+   - report inotify_add_watch() problems  [Karel Zak]
+
+
+cal.1 cfdisk.8 chfn.1 chsh.1 ctrlaltdel.8 cytune.8 ddate.1 delpart.8 dmesg.1
+elvtune.8 fdformat.8 fdisk.8 fsck.8 fsck.minix.8 fstab.5 getopt.1 hexdump.1
+hwclock.8 initctl.8 ionice.1 ipcmk.1 ipcrm.1 ipcs.1 isosize.8 kill.1 last.1
+ldattach.8: losetup.8: lscpu.1: mcookie.1: mesg.1: mkfs.8: mkfs.bfs.8:
+mkfs.minix.8: mkswap.8: more.1: addpart.8: blockdev.8: mount.8: namei.1:
+newgrp.1: partx.8: pg.1: pivot_root.8: rdev.8: readprofile.1: rename.1:
+renice.1: reset.1: rtcwake.8: scriptreplay.1: setarch.8: setsid.1: setterm.1:
+sfdisk.8: shutdown.8: simpleinit.8: swapon.8: switch_root.8: tunelp.8: ul.1:
+umount.8: uuidd.8: uuidgen.1: vipw.8: whereis.1: write.1:
+
+   - formatting  [Peter Breitenlohner]
+
diff --git a/docs/v2.16.2-ReleaseNotes b/docs/v2.16.2-ReleaseNotes
new file mode 100644
index 00000000..8084d841
--- /dev/null
+++ b/docs/v2.16.2-ReleaseNotes
@@ -0,0 +1,49 @@
+Util-linux-ng 2.16.2 Release Notes
+==================================
+
+Changes since v2.16.1
+---------------------
+
+ For more details see ChangeLog files at:
+ ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.16/
+
+docs:
+   - update AUTHORS file  [Karel Zak]
+fdformat:
+   - fix memory leak in verify_disk()  [Cristian Rodríguez]
+fsck.minix:
+   - fix broken zone checking  [Karel Zak]
+hwclock:
+   - do not access hardware clock when using --systz  [Scott James Remnant]
+   - set kernel timezone with --systz --utc  [Scott James Remnant]
+lib:
+   - fix file descriptor leak in is_mounted()  [Theodore Ts'o]
+libblkid:
+   - add missing packed attributes, add new UFS magic strings  [Karel Zak]
+   - fix FAT super block definition  [Lawrence Rust]
+   - fix blkid_probe_set_utf8label() call for Joliet  [Karel Zak]
+   - fix the default cache file path  [Karel Zak]
+   - fix typo (swsupend -> swsuspend)  [Karel Zak]
+   - prefer ISO9660 PVD Label to Joliet Label  [Karel Zak]
+   - trim tailing whitespace from unicode LABELs  [Karel Zak]
+libuuid:
+   - remove .UE macro from libuuid man pages.  [Milan Broz]
+mkswap:
+   - restore device argument in mkswap.8 synopsis  [Peter Breitenlohner]
+mount:
+   - document changed semantics of tmpfs size option in mount.8  [kevin.granade@gmail.com]
+   - more explicitly explain 'strictatime' in mount.8  [Karel Zak]
+   - update list of pseudo filesystems  [Karel Zak]
+po:
+   - merge changes  [Karel Zak]
+   - update id.po (from translationproject.org)  [Arif E. Nugroho]
+   - update pl.po (from translationproject.org)  [Jakub Bogusz]
+   - update vi.po (from translationproject.org)  [Clytie Siddall]
+sfdisk:
+   - dump has to be $LANG insensitive  [Karel Zak]
+swapon:
+   - handle <=linux-2.6.19 bug in /proc/swaps  [Mike Frysinger]
+switch_root:
+   - remove TIOCSCTTY and setsid()  [Karel Zak]
+tailf:
+   - fix printf format  [Mike Frysinger]
diff --git a/include/strverscmp.h b/include/strverscmp.h
index 23ec6709..ba974e91 100644
--- a/include/strverscmp.h
+++ b/include/strverscmp.h
@@ -2,6 +2,6 @@
 #define STRVERSCMP_H
 
 extern int strverscmp (const char *s1, const char *s2);
-extern int versionsort (const void *a, const void *b);
+extern int version_sort (const void *a, const void *b);
 
 #endif
diff --git a/lib/strverscmp.c b/lib/strverscmp.c
index 7de473bf..4405f80c 100644
--- a/lib/strverscmp.c
+++ b/lib/strverscmp.c
@@ -113,7 +113,7 @@ strverscmp (s1, s2)
 
 
 int
-versionsort (const void *a, const void *b)
+version_sort (const void *a, const void *b)
 {
   return strverscmp ((*(const struct dirent **) a)->d_name,
 		     (*(const struct dirent **) b)->d_name);