Merge branch 'stable/v2.15'

Conflicts:
	NEWS
	configure.ac
	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

8 files changed, 107 insertions, 44 deletions

diff --git a/debian/README.Debian.hwclock b/debian/README.Debian.hwclock
index d3ac5cea..c8b840cb 100644
--- a/debian/README.Debian.hwclock
+++ b/debian/README.Debian.hwclock
@@ -1,7 +1,10 @@
 hwclock and Debian:
 
-A Debian installation will, by default, call hwclock --hctosys during system
-startup and hwclock --systohc during system shutdown.
+When udev is running, hwclock -systz will be called when the RTC clock
+device is created.  When udev is not running, hwclock --hctosys will be
+called during system startup.
+
+In both cases, hwclock --systohc will be called during system shutdown.
 
 To set the date/time of the system, just use the standard UNIX date facilities
 (such as date) or any of the advanced timekeeping utilities (ntp, ntpdate,
diff --git a/debian/changelog b/debian/changelog
index 2057418e..f6b1ef1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,75 @@
+util-linux (2.15.1-1) unstable; urgency=low
+
+  [Aurelien Jarno]
+
+  * chrt: don't assume SCHED_BATCH and SCHED_IDLE exist
+  * remaining kFreeBSD hackery for building.  Closes: #527384
+  * metafile changes for kFreeBSD buildability hackery.  Closes: #527384
+
+  [Mike Frysinger]
+
+  * lscpu: fix cpuid code on x86/PIC
+  * losetup: handle symlinks in /dev/loop/
+
+  [LaMont Jones]
+
+  * Add keybuk as uploader.
+  * meta: cleanup rules targets
+
+  [Scott James Remnant]
+
+  * hwclock: only call --systz from the udev rule
+  * hwclock: make start a no-op when udev is running
+  * rules: Install udev rules into /lib/udev/rules.d
+
+  [Chris Webb]
+
+  * fdisk: (and cfdisk) fix to be consistent about maximum heads
+
+  [Rajeev V. Pillai]
+
+  * cal: Highlight today even when month or year specified
+
+  [Tom Prince]
+
+  * cal: uClibc has langinfo.h but not _NL_TIME_WEEK_1STDAY.
+
+  [Karel Zak]
+
+  * build-sys: fix "make -C" bug
+  * build-sys: fix blkid.h include for old e2fsprogs
+  * blkid: make libuuid optional
+  * blkid: fix "hangs forever with partition type mdraid"
+  * blkid: blkid_do_safeprobe() has to be tolerant to RAIDs
+  * blkid: cleanup debug messages and return codes in blkid_do_probe()
+  * mount: fix undefined reference to `security_get_initial_context'.  gentoo:
+    #270168
+  * libblkid: update man page
+  * libblkid: fix reiserfs name
+  * build-sys: add UTIL_{SET,RESTORE}_FLAGS
+  * build-sys: fix blkid detection in configure.ac
+  * tests: add mdraid libblkid test
+  * tests: fix reiserfs test
+  * tests: don't run some mount tests for non-root users
+  * tests: remove broken Xen dumps for lscpu
+  * tests: move lscpu /proc and /sys dumps to tarballs
+  * tests: fix script that creates lscpu dumps
+  * docs: update AUTHORS file
+  * docs: add v2.15.1 ReleaseNotes
+  * docs: add missing commands/projects to AUTHORS file
+  * build-sys: release++ (v2.15.1-rc1)
+  * mount: use "none" fstype for MS_PROPAGATION mounts
+  * mount: move MS_{PROPAGATION,BIND,MOVE} detection
+  * docs: update v2.15.1 ReleaseNotes
+  * build-sys: release++ (v2.15.1)
+  * po: merge changes
+
+  [localization folks]
+
+  * po: update vi.po (from translationproject.org) (Clytie Siddall)
+
+ -- Scott James Remnant <scott@ubuntu.com>  Tue, 14 Jul 2009 18:00:01 +0100
+
 util-linux (2.15.1~rc1-1) unstable; urgency=low
 
   [Aurelien Jarno]
diff --git a/debian/hwclock.rules b/debian/hwclock.rules
index 92b5e114..fc22468c 100644
--- a/debian/hwclock.rules
+++ b/debian/hwclock.rules
@@ -1,3 +1,8 @@
-# This file causes the hardware clock to be set when /dev/rtc is available.
+# Reset the System Clock to UTC if the hardware clock from which it was
+# copied by the kernel was in localtime.
 
-KERNEL=="rtc", ACTION=="add", RUN+="set_hwclock"
+KERNEL=="rtc0", IMPORT{file}="/etc/default/rcS"
+KERNEL=="rtc0", ENV{UTC}!="yes", ENV{BADYEAR}!="yes", \
+	RUN+="/sbin/hwclock --rtc=$root/$name --systz --localtime --noadjfile"
+KERNEL=="rtc0", ENV{UTC}!="yes", ENV{BADYEAR}=="yes", \
+	RUN+="/sbin/hwclock --rtc=$root/$name --systz --localtime --noadjfile --badyear"
diff --git a/debian/hwclock.sh b/debian/hwclock.sh
index 4ceb95e8..80b17bc4 100644
--- a/debian/hwclock.sh
+++ b/debian/hwclock.sh
@@ -67,6 +67,10 @@ hwclocksh()
 
     case "$1" in
 	start)
+	    if [ -d /dev/.udev ]; then
+		return 0
+	    fi
+
 	    if [ -w /etc ] && [ ! -f /etc/adjtime ] && [ ! -e /etc/adjtime ]; then
 		echo "0.0 0 0.0" > /etc/adjtime
 	    fi
diff --git a/debian/hwclock.udev b/debian/hwclock.udev
deleted file mode 100644
index d768f900..00000000
--- a/debian/hwclock.udev
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-# udev helper for hwclock
-#
-# This is based on the hwclock.sh init script, but somewhat simplified.
-
-[ ! -x /sbin/hwclock ] && exit 0
-. /etc/default/rcS
-
-[ "$GMT" = "-u" ] && UTC="yes"
-case "$UTC" in
-    no|"")	GMT="--localtime"
-		UTC=""
-		;;
-    yes)	GMT="--utc"
-		UTC="--utc"
-		;;
-    *)		exit 1 ;;
-esac
-
-case "$BADYEAR" in
-    no|"")	BADYEAR="" ;;
-    yes)	BADYEAR="--badyear" ;;
-    *)		exit 1 ;;
-esac
-
-# Copies Hardware Clock time to System Clock using the correct
-# timezone for hardware clocks in local time, and sets kernel
-# timezone. DO NOT REMOVE.
-/sbin/hwclock --hctosys $GMT $HWCLOCKPARS $BADYEAR
diff --git a/debian/rules b/debian/rules
index c8239cd3..58910736 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,9 +36,6 @@ CONFOPTS= --enable-raw --enable-rdev --enable-partx --with-slang
 ifeq ($(DEB_HOST_ARCH_OS),linux)
 CONFOPTS += --with-selinux
 endif
-ifneq ($(DISTRO),Debian)
-CONFOPTS += --with-fsprobe=volume_id 
-endif
 
 build: build-stamp
 build-stamp:
@@ -110,15 +107,12 @@ endif
 		-e '/Default-Start:/a# Default-Stop:' -e '/Default-Stop:/d' \
 		debian/util-linux/etc/init.d/hwclockfirst.sh; \
 	fi
-ifneq ($(DISTRO),Debian)
 	if [ -f debian/util-linux/sbin/hwclock ] ; then \
-	    install -m 755 debian/hwclock.udev debian/util-linux/lib/udev/set_hwclock && \
-	    install -m 644 debian/hwclock.rules debian/util-linux/etc/udev/rules.d/85-hwclock.rules; \
+	    install -m 644 debian/hwclock.rules debian/util-linux/lib/udev/rules.d/85-hwclock.rules; \
 	fi
-endif
 	cd debian; if [ -f util-linux/sbin/fdisk ]; then \
-	    ln util-linux/sbin/*fdisk fdisk-udeb/usr/sbin; \
-	    S=fdisk-udeb/usr/sbin/cfdisk; if [ -f $$S ]; then mv $$S cfdisk-udeb/usr/sbin; fi; \
+	    ln util-linux/sbin/*fdisk fdisk-udeb/usr/sbin/; \
+	    S=fdisk-udeb/usr/sbin/cfdisk; if [ -f $$S ]; then mv $$S cfdisk-udeb/usr/sbin/; fi; \
 	fi
 	cd debian/util-linux-locales && find usr/share/locale -type f | while read x; do ln $$x ../cfdisk-udeb/$$x; done
 ifeq ($(DEB_HOST_ARCH_OS),linux)
diff --git a/debian/util-linux.dirs b/debian/util-linux.dirs
index db07a87b..16ef4dd1 100644
--- a/debian/util-linux.dirs
+++ b/debian/util-linux.dirs
@@ -2,8 +2,6 @@ bin/
 sbin/
 etc/
 etc/init.d/
-etc/udev/
-etc/udev/rules.d/
 usr/
 usr/bin/
 usr/sbin/
@@ -22,3 +20,4 @@ usr/share/lintian/
 usr/share/lintian/overrides/
 lib/
 lib/udev/
+lib/udev/rules.d/
diff --git a/debian/util-linux.preinst b/debian/util-linux.preinst
new file mode 100644
index 00000000..a6a6527e
--- /dev/null
+++ b/debian/util-linux.preinst
@@ -0,0 +1,15 @@
+#! /bin/sh
+
+set -e
+
+if [ "$1" = install ] || [ "$1" = upgrade ]; then
+	if [ -e "/etc/udev/rules.d/85-hwclock.rules" ]; then
+		if [ "`md5sum \"/etc/udev/rules.d/85-hwclock.rules\" | sed -e \"s/ .*//\"`" = \
+		     "`dpkg-query -W -f='${Conffiles}' util-linux | sed -n -e \"\\\\' /etc/udev/rules.d/85-hwclock.rules's/.* //p\"`" ]
+		then
+			rm -f "/etc/udev/rules.d/85-hwclock.rules"
+		fi
+	fi
+fi
+
+#DEBHELPER#