Merge commit 'keybuk/master'

29 files changed, 686 insertions, 46 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..f349b70f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,262 @@
+util-linux (2.16-1) unstable; urgency=low
+
+  [John Keeping]
+
+  * hwclock: fix mismatched popen/fclose.
+
+  [Jakob Unterwurzacher]
+
+  * ionice: Allow setting the none class
+
+  [Karel Zak]
+
+  * build-sys: fix "make -C" bug
+  * build-sys: fix blkid.h include for old e2fsprogs
+  * blkid: make libuuid optional
+  * build-sys: rename /libs to /shlibs
+  * build-sys: complete /libs to /shlibs rename
+  * 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()
+  * tests: add functions for work withdisk images
+  * mount: fix undefined reference to `security_get_initial_context'.  gentoo:
+    #270168
+  * libuuid: import UUID library from e2fsprogs
+  * libuuid: add --disable-libuuid and LIBUUID_VERSION
+  * libuuid: add info about u-l-ng to man pages
+  * libblkid: update man page
+  * build-sys: add UTIL_{SET,RESTORE}_FLAGS
+  * build-sys: fix headers in mkswap and libblkid
+  * build-sys: cleanup libuuid stuff
+  * mount: (and fsck) remove libvolume_id support
+  * build-sys: add --disable-libblkid, remove volume_id support
+  * build-sys: enable fsck by default
+  * build-sys: add --disable-tls
+  * uuidgen: new command (from e2fsprogs)
+  * libuuid: add .gitignore
+  * uuidd: new command (UUID daemon from e2fsprogs)
+  * build-sys: add --disable-uuidd
+  * tests: fix 'delete extended partition' checksum
+  * libblkid: fix reiserfs name
+  * 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: add missing commands/projects to AUTHORS file
+  * mount: use TAG parsing function from libblkid
+  * losetup: add --set-capacity
+  * mount: cleanup notes about -l option in mount.8
+  * mount: add ext4 to mount.8
+  * mount: add ext4 to the list of filesystems in mount.8
+  * mount: use "none" fstype for MS_PROPAGATION mounts
+  * mount: move MS_{PROPAGATION,BIND,MOVE} detection
+  * libblkid: don't require udev symlinks verification for non-root users
+  * switch_root: new command
+  * build-sys: add --disable-switch_root
+  * switch_root: fix coding style
+  * switch_root: rewrite to use fstatat() and unlinkat()
+  * build-sys: check for openat() and linux for switch_root
+  * switch_root: use err.h, clean up return codes
+  * switch_root: clean up argv[] usage, add -h and -V
+  * switch_root: use snprintf() rather tan str{cpy,cat}()
+  * switch_root: add man page
+  * docs: refresh TODO list
+  * docs: remove obsolete information from fstab example.  Closes: #507700
+  * umount: clean up help output.  Closes: #320500
+  * mount: add info about obsolete vfat options to mount.8.  Closes: #329856
+  * losetup: suggest to use modprobe rather than insmod in losetup.8. 
+    Closes: #334796
+  * mount: a little clean up info about loopdevs in man page.  Closes: #478600
+  * build-sys: fix libuuid Makefile.am
+  * docs: update AUTHORS file
+  * build-sys: fix --disable-uuidd
+  * docs: add v2.16 ReleaseNotes
+  * docs: update v2.16-ReleaseNotes
+  * build-sys: release++ (v2.16-rc1)
+  * uuidd: move uuidd files from /var/lib/libuuid to /var/run/uuidd
+  * libuuid: move clock state file from /var/lib to /var/run
+  * losetup: fix return codes of functions arounf is_associated()
+  * include: clean up _PATH_DEV_* macros
+  * Revert "libuuid: move clock state file from /var/lib to /var/run"
+  * libblkid: fix #ifdefs readability
+  * libuuid: add install-hook for libuuid.[a,so] devel files
+  * libblkid: add install-hook for libuuid.[a,so] devel files
+  * buildsys: move $usr{bin,sbin,lib}execdir definition to ./configure
+  * libblkid: fix $libdir in blkid.pc
+  * libuuid: fix $libdir in uuid.pc
+  * docs: remove example.files/rc[.local]
+  * uuidd: move uuidd.rc to misc-utils directory
+  * uuidd: fix $PIDFILE in uuidd.rc
+  * uuidd: init /var/run/uuidd, add option for on-demand mode to .rc file
+  * include: fix _PATH_DEV
+  * raw: undeprecate raw
+  * blkid: move to misc-utils/ directory
+  * docs: update AUTHORS file
+  * docs: update v2.16 ReleaseNotes
+  * build-sys: release++ (v2.16-rc2)
+  * build-sys: fix exec/data install hooks
+  * build-sys: improve symlinks creation in shlibs/
+  * build-sys: rename to _execdir
+  * libuuid: fix parallel building
+  * build-sys: improve $libdirname definition
+  * libblkid: add stdarg.h to blkidP.h
+  * build-sys: fix libuuid and libblkid version-info
+  * docs: update AUTHORS file
+  * libuuid: generate uuid_generate_{random,time}.3 man page links
+  * docs: update v2.16 ReleaseNotes
+  * build-sys: release++ (v2.16)
+  * po: refresh POTFILES.in
+  * po: merge changes
+
+  [Jeff Mahoney]
+
+  * raw: Use the RAW_SETBIND ioctl without stat'ing the raw# file
+
+  [Peter Jones]
+
+  * switch_root: use file descriptor instead of path for recursiveRemove()
+  * switch_root: fork before cleaning up the filesystem.
+  * switch_root: do recursiveRemove after our root is moved to avoid races.
+
+  [Kay Sievers]
+
+  * mount: allow loop suid umount.  suse: #461732
+  * build-sys: reverse shlibs installation
+
+  [Daniel Drake]
+
+  * switch_root: add subroot support
+
+  [Chris Webb]
+
+  * fdisk: (and cfdisk) fix to be consistent about maximum heads
+
+  [Zdenek Behan]
+
+  * fdisk: add simple test for doslabel stuff
+
+  [Milan Broz]
+
+  * blkid: fix LVM1 probe
+  * blkid: add device-mapper snapshot cow device probe
+
+  [Valerie Aurora]
+
+  * mount: when a remount to rw fails, quit and return an error
+
+  [Robert Förster]
+
+  * build-sys: fix typo from 30688dde55f637c9b984809c685b61378b82805f
+
+  [Tom Prince]
+
+  * cal: uClibc has langinfo.h but not _NL_TIME_WEEK_1STDAY.
+
+  [Tilman Schmidt]
+
+  * ldattach: add N_PPS support
+
+  [Mike Frysinger]
+
+  * lscpu: fix cpuid code on x86/PIC
+  * losetup: handle symlinks in /dev/loop/
+
+  [Scott James Remnant]
+
+  * build libblkid binary packages
+  * build libuuid binary packages
+
+  [Theodore Ts'o]
+
+  * libuuid: Make sure fd's 0, 1, and 2 are valid before exec'ing uuidd
+  * uuidd: Avoid closing the server socket when calling create_daemon()
+  * libuuid, uuidd: Avoid infinite loop while reading from the socket fd
+  * libuuid: Don't run uuidd if it would fail due to permission problems
+
+  [localization folks]
+
+  * po: fix typo in French translation.  mandriva: #42783 (Olivier Blin)
+  * po: update fi.po (from translationproject.org) (Lauri Nurmi)
+  * po: update fr.po (from translationproject.org) (Nicolas Provost)
+  * po: update vi.po (from translationproject.org) (Clytie Siddall)
+  * po: update cs.po (from translationproject.org) (Petr Pisar)
+
+ -- Scott James Remnant <scott@ubuntu.com>  Thu, 16 Jul 2009 14:41:50 +0100
+
+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/control b/debian/control
index 472b0f58..0ead573e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Source: util-linux
-Build-Depends: libncurses5-dev, libslang2-dev (>=2.0.4), gettext, zlib1g-dev, libblkid-dev, uuid-dev, dpkg-dev (>=1.13.12), libselinux1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], debhelper (>=5), lsb-release, pkg-config
+Build-Depends: libncurses5-dev, libslang2-dev (>=2.0.4), gettext, zlib1g-dev, dpkg-dev (>=1.13.12), libselinux1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], debhelper (>=5), lsb-release, pkg-config
 Section: base
 Priority: required
 Uploaders: Scott James Remnant <scott@ubuntu.com>
@@ -16,7 +16,7 @@ Essential: yes
 Depends: lsb-base (>= 3.0-6), tzdata (>=2006c-2)
 Pre-Depends: ${shlibs:Depends}
 Suggests: util-linux-locales, kbd | console-tools, dosfstools
-Replaces: schedutils, miscutils, setterm, fdisk, linux32, sparc-utils, ${util-linux:Conflicts}
+Replaces: schedutils, miscutils, setterm, fdisk, linux32, sparc-utils, e2fsprogs, ${util-linux:Conflicts}
 Conflicts: schedutils, setterm, fdisk, kbd (<< 1.05-3), console-tools (<< 1:0.2.3-21), linux32, ${util-linux:Conflicts}
 Provides: schedutils, linux32
 Description: Miscellaneous system utilities
@@ -76,3 +76,118 @@ Depends: ${shlibs:Depends}
 XC-Package-Type: udeb
 XB-Installer-Menu-Item: 99999
 Description: Manually partition a hard drive (cfdisk)
+
+Package: libblkid1
+Section: libs
+Priority: required
+Depends: ${shlibs:Depends}
+Architecture: any
+Description: block device id library
+ The blkid library which allows system programs like fsck and
+ mount to quickly and easily find block devices by filesystem UUID and
+ LABEL.  This allows system administrators to avoid specifying
+ filesystems by hard-coded device names, but via a logical naming
+ system instead.
+
+Package: libblkid1-udeb
+XC-Package-Type: udeb
+Section: debian-installer
+Priority: optional
+Depends: ${shlibs:Depends}
+Architecture: any
+Description: block device id library
+ The blkid library which allows system programs like fsck and
+ mount to quickly and easily find block devices by filesystem UUID and
+ LABEL.  This allows system administrators to avoid specifiying
+ filesystems by hard-coded device names, but via a logical naming
+ system instead.
+ .
+ This is a minimal package for debian-installer.
+
+Package: libblkid-dev
+Section: libdevel
+Priority: extra
+Depends: libc6-dev | libc-dev, libblkid1 (= ${binary:Version}), uuid-dev
+Architecture: any
+Description: block device id library - headers and static libraries
+ The blkid library which allows system programs like fsck and
+ mount to quickly and easily find block devices by filesystem UUID and
+ LABEL.  This allows system administrators to avoid specifiying
+ filesystems by hard-coded device names, but via a logical naming
+ system instead.
+ .
+ This package contains the development environment for the blkid library.
+
+Package: libuuid1
+Section: libs
+Depends: passwd, ${shlibs:Depends}
+Recommends: uuid-runtime
+Replaces: e2fsprogs (<< 1.34-1)
+Architecture: any
+Description: Universally Unique ID library
+ The libuuid library generates and parses 128-bit universally unique
+ ids (UUIDs).  A UUID is an identifier that is unique across both
+ space and time, with respect to the space of all UUIDs.  A UUID can
+ be used for multiple purposes, from tagging objects with an extremely
+ short lifetime, to reliably identifying very persistent objects
+ across a network.
+ .
+ See RFC 4122 for more information.
+
+Package: uuid-runtime
+Section: libs
+Priority: optional
+Depends: passwd, libuuid1 (>> 1.40.3-1), ${shlibs:Depends}
+Replaces: e2fsprogs (<= 1.40.3-1ubuntu1)
+Architecture: any
+Description: runtime components for the Universally Unique ID library
+ The libuuid library generates and parses 128-bit universally unique
+ ids (UUIDs).  A UUID is an identifier that is unique across both
+ space and time, with respect to the space of all UUIDs.  A UUID can
+ be used for multiple purposes, from tagging objects with an extremely
+ short lifetime, to reliably identifying very persistent objects
+ across a network.
+ .
+ See RFC 4122 for more information.
+ .
+ This package contains the uuidgen program and the uuidd daemon.
+ .
+ The uuidd daemon is used to generate UUIDs, especially time-based
+ UUID’s, in a secure and guaranteed-unique fashion, even in the face
+ of large numbers of threads trying to grab UUID’s running on
+ different CPU’s. It is used by libuuid as well as the uuidgen
+ program.
+
+Package: libuuid1-udeb
+XC-Package-Type: udeb
+Section: debian-installer
+Priority: optional
+Depends: ${shlibs:Depends}
+Architecture: any
+Description: stripped down universally unique id library, for debian-installer
+ libuuid generates and parses 128-bit universally unique ids (UUIDs).
+ See RFC 4122 for more information.
+ .
+ This is a minimal package for debian-installer.
+
+Package: uuid-dev
+Section: libdevel
+Priority: extra
+Depends: libc6-dev | libc-dev, libuuid1 (= ${binary:Version})
+Replaces: e2fslibs-dev (<< 1.15)
+Architecture: any
+Description: universally unique id library - headers and static libraries
+ libuuid generates and parses 128-bit universally unique ids (UUIDs).
+ See RFC 4122 for more information.
+ .
+ This package contains the development environment for the uuid library.
+
+Package: util-linux-udeb
+Architecture: any
+Priority: optional
+Section: debian-installer
+Depends: ${shlibs:Depends}
+XC-Package-Type: udeb
+Description: Miscellaneous system utilities
+ This is a minimal version of util-linux for debian-installer. It only
+ contains the blkid binary at the moment.
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/libblkid-dev.files b/debian/libblkid-dev.files
new file mode 100644
index 00000000..31ec0f01
--- /dev/null
+++ b/debian/libblkid-dev.files
@@ -0,0 +1,4 @@
+usr/lib/libblkid*
+usr/include/blkid
+usr/share/man/man3/libblkid.3
+usr/lib/pkgconfig/blkid.pc
diff --git a/debian/libblkid.copyright b/debian/libblkid.copyright
new file mode 100644
index 00000000..8d2fd96f
--- /dev/null
+++ b/debian/libblkid.copyright
@@ -0,0 +1,19 @@
+This is libblkid, previously part of e2fsprogs this is now part of
+util-linux-ng and has thus moved to the util-linux Debian source
+package.
+
+Upstream Author: Theodore Ts'o <tytso@mit.edu>
+
+Copyright:
+
+Copyright (C) 1999, 2001 by Andries Brouwer
+Copyright (C) 1999, 2000, 2003 by Theodore Ts'o
+Copyright (C) 2001 Andreas Dilger
+Copyright (C) 2008 Kay Sievers <kay.sievers@vrfy.org>
+Copyright (C) 2009 Karel Zak <kzak@redhat.com>
+
+You are free to distribute this software under the terms of the GNU
+Lesser (Library) General Public License.
+
+On Debian systems, the complete text of the GNU Lesser (Library)
+General Public License can be found in /usr/share/common-licenses/LGPL.
diff --git a/debian/libblkid1-udeb.dirs b/debian/libblkid1-udeb.dirs
new file mode 100644
index 00000000..c3af8579
--- /dev/null
+++ b/debian/libblkid1-udeb.dirs
@@ -0,0 +1 @@
+lib/
diff --git a/debian/libblkid1.files b/debian/libblkid1.files
new file mode 100644
index 00000000..d2f1ccc2
--- /dev/null
+++ b/debian/libblkid1.files
@@ -0,0 +1 @@
+lib/libblkid*
diff --git a/debian/libblkid1.symbols b/debian/libblkid1.symbols
new file mode 100644
index 00000000..b0854dc5
--- /dev/null
+++ b/debian/libblkid1.symbols
@@ -0,0 +1,47 @@
+libblkid.so.1 libblkid1 #MINVER#
+ BLKID_1.0@BLKID_1.0 2.16-1
+ BLKID_2.15@BLKID_2.15 2.16-1
+ blkid_dev_devname@BLKID_1.0 2.16-1
+ blkid_dev_has_tag@BLKID_1.0 2.16-1
+ blkid_dev_iterate_begin@BLKID_1.0 2.16-1
+ blkid_dev_iterate_end@BLKID_1.0 2.16-1
+ blkid_dev_next@BLKID_1.0 2.16-1
+ blkid_dev_set_search@BLKID_1.0 2.16-1
+ blkid_devno_to_devname@BLKID_1.0 2.16-1
+ blkid_do_probe@BLKID_2.15 2.16-1
+ blkid_do_safeprobe@BLKID_2.15 2.16-1
+ blkid_encode_string@BLKID_2.15 2.16-1
+ blkid_evaluate_tag@BLKID_2.15 2.16-1
+ blkid_find_dev_with_tag@BLKID_1.0 2.16-1
+ blkid_free_probe@BLKID_2.15 2.16-1
+ blkid_gc_cache@BLKID_1.0 2.16-1
+ blkid_get_cache@BLKID_1.0 2.16-1
+ blkid_get_dev@BLKID_1.0 2.16-1
+ blkid_get_dev_size@BLKID_1.0 2.16-1
+ blkid_get_devname@BLKID_1.0 2.16-1
+ blkid_get_library_version@BLKID_1.0 2.16-1
+ blkid_get_tag_value@BLKID_1.0 2.16-1
+ blkid_known_fstype@BLKID_1.0 2.16-1
+ blkid_new_probe@BLKID_2.15 2.16-1
+ blkid_parse_tag_string@BLKID_1.0 2.16-1
+ blkid_parse_version_string@BLKID_1.0 2.16-1
+ blkid_probe_all@BLKID_1.0 2.16-1
+ blkid_probe_all_new@BLKID_1.0 2.16-1
+ blkid_probe_filter_types@BLKID_2.15 2.16-1
+ blkid_probe_filter_usage@BLKID_2.15 2.16-1
+ blkid_probe_get_value@BLKID_2.15 2.16-1
+ blkid_probe_has_value@BLKID_2.15 2.16-1
+ blkid_probe_invert_filter@BLKID_2.15 2.16-1
+ blkid_probe_lookup_value@BLKID_2.15 2.16-1
+ blkid_probe_numof_values@BLKID_2.15 2.16-1
+ blkid_probe_reset_filter@BLKID_2.15 2.16-1
+ blkid_probe_set_device@BLKID_2.15 2.16-1
+ blkid_probe_set_request@BLKID_2.15 2.16-1
+ blkid_put_cache@BLKID_1.0 2.16-1
+ blkid_reset_probe@BLKID_2.15 2.16-1
+ blkid_safe_string@BLKID_2.15 2.16-1
+ blkid_send_uevent@BLKID_2.15 2.16-1
+ blkid_tag_iterate_begin@BLKID_1.0 2.16-1
+ blkid_tag_iterate_end@BLKID_1.0 2.16-1
+ blkid_tag_next@BLKID_1.0 2.16-1
+ blkid_verify@BLKID_1.0 2.16-1
diff --git a/debian/libuuid.copyright b/debian/libuuid.copyright
new file mode 100644
index 00000000..fcb9afc6
--- /dev/null
+++ b/debian/libuuid.copyright
@@ -0,0 +1,35 @@
+This is libuuid, previously part of e2fsprogs this is now part of
+util-linux-ng and has thus moved to the util-linux Debian source
+package.
+
+Upstream Author: Theodore Ts'o <tytso@mit.edu>
+
+Copyright:
+
+Copyright (C) 1999, 2000, 2003, 2004 by Theodore Ts'o
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, and the entire permission notice in its entirety,
+   including the disclaimer of warranties.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. The name of the author may not be used to endorse or promote
+   products derived from this software without specific prior
+   written permission.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
+WHICH ARE HEREBY DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
diff --git a/debian/libuuid1-udeb.dirs b/debian/libuuid1-udeb.dirs
new file mode 100644
index 00000000..bf90b050
--- /dev/null
+++ b/debian/libuuid1-udeb.dirs
@@ -0,0 +1,2 @@
+lib
+sbin
diff --git a/debian/libuuid1.files b/debian/libuuid1.files
new file mode 100644
index 00000000..da600dc8
--- /dev/null
+++ b/debian/libuuid1.files
@@ -0,0 +1 @@
+lib/libuuid*
diff --git a/debian/libuuid1.postinst b/debian/libuuid1.postinst
new file mode 100644
index 00000000..5336fcfd
--- /dev/null
+++ b/debian/libuuid1.postinst
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+set -e
+
+ADDUSERCONF='/etc/adduser.conf'
+
+if test -f $ADDUSERCONF; then
+    FIRST_SYSTEM_UID=$(sed -n "s/^[[:space:]]*FIRST_SYSTEM_UID[[:space:]]*=[[:space:]]*[\"']\?\([^\"']*\)[\"']\?/\1/p" $ADDUSERCONF)
+    LAST_SYSTEM_UID=$(sed -n "s/^[[:space:]]*LAST_SYSTEM_UID[[:space:]]*=[[:space:]]*[\"']\?\([^\"']*\)[\"']\?/\1/p" $ADDUSERCONF)
+    FIRST_SYSTEM_GID=$(sed -n "s/^[[:space:]]*FIRST_SYSTEM_GID[[:space:]]*=[[:space:]]*[\"']\?\([^\"']*\)[\"']\?/\1/p" $ADDUSERCONF)
+    LAST_SYSTEM_GID=$(sed -n "s/^[[:space:]]*LAST_SYSTEM_GID[[:space:]]*=[[:space:]]*[\"']\?\([^\"']*\)[\"']\?/\1/p" $ADDUSERCONF)
+fi
+
+if test -z "$FIRST_SYSTEM_UID"; then
+    FIRST_SYSTEM_UID=100
+fi
+if test -z "$LAST_SYSTEM_UID"; then
+    LAST_SYSTEM_UID=999
+fi
+if test -z "$FIRST_SYSTEM_GID"; then
+    FIRST_SYSTEM_GID=100
+fi
+if test -z "$LAST_SYSTEM_GID"; then
+    LAST_SYSTEM_GID=999
+fi
+
+if ! getent group | grep -q libuuid; then
+  groupadd -f -K GID_MIN=$FIRST_SYSTEM_GID -K GID_MAX=$LAST_SYSTEM_GID libuuid
+fi
+if ! getent passwd | grep -q libuuid; then
+   useradd -d /var/lib/libuuid -K UID_MIN=$FIRST_SYSTEM_UID -K UID_MAX=$LAST_SYSTEM_UID -g libuuid libuuid
+fi
+
+mkdir -p /var/lib/libuuid
+chown libuuid:libuuid /var/lib/libuuid
+chmod 2775 /var/lib/libuuid
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/libuuid1.postrm b/debian/libuuid1.postrm
new file mode 100644
index 00000000..8c286eea
--- /dev/null
+++ b/debian/libuuid1.postrm
@@ -0,0 +1,10 @@
+#!/bin/sh
+set -e
+if [ "$1" = purge ]
+then
+	rm -rf /var/lib/libuuid
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/libuuid1.symbols b/debian/libuuid1.symbols
new file mode 100644
index 00000000..03f8a616
--- /dev/null
+++ b/debian/libuuid1.symbols
@@ -0,0 +1,20 @@
+libuuid.so.1 libuuid1 #MINVER#
+ UUID_1.0@UUID_1.0 2.16-1
+ uuid__generate_random@UUID_1.0 2.16-1
+ uuid__generate_time@UUID_1.0 2.16-1
+ uuid_clear@UUID_1.0 2.16-1
+ uuid_compare@UUID_1.0 2.16-1
+ uuid_copy@UUID_1.0 2.16-1
+ uuid_generate@UUID_1.0 2.16-1
+ uuid_generate_random@UUID_1.0 2.16-1
+ uuid_generate_time@UUID_1.0 2.16-1
+ uuid_is_null@UUID_1.0 2.16-1
+ uuid_pack@UUID_1.0 2.16-1
+ uuid_parse@UUID_1.0 2.16-1
+ uuid_time@UUID_1.0 2.16-1
+ uuid_type@UUID_1.0 2.16-1
+ uuid_unpack@UUID_1.0 2.16-1
+ uuid_unparse@UUID_1.0 2.16-1
+ uuid_unparse_lower@UUID_1.0 2.16-1
+ uuid_unparse_upper@UUID_1.0 2.16-1
+ uuid_variant@UUID_1.0 2.16-1
diff --git a/debian/rules b/debian/rules
index c8239cd3..05808bd1 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,36 @@ 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
+	# copy blkid library and symlink into udeb
+	ln debian/libblkid1/lib/libblkid.so.1.* debian/libblkid1-udeb/lib/
+	ln debian/libblkid1/lib/libblkid.so.1   debian/libblkid1-udeb/lib/
+	ln debian/util-linux/sbin/blkid debian/util-linux-udeb/sbin/
+	# overwrite copyright
+	install -m 644 debian/libblkid.copyright debian/libblkid1/usr/share/doc/libblkid1/copyright
+	install -m 644 debian/libblkid.copyright debian/libblkid-dev/usr/share/doc/libblkid-dev/copyright
+	# copy uuid library and symlink into udeb
+	ln debian/libuuid1/lib/libuuid.so.1.* debian/libuuid1-udeb/lib/
+	ln debian/libuuid1/lib/libuuid.so.1   debian/libuuid1-udeb/lib/
+	# overwrite copyright
+	install -m 644 debian/libuuid.copyright debian/libuuid1/usr/share/doc/libuuid1/copyright
+	install -m 644 debian/libuuid.copyright debian/uuid-dev/usr/share/doc/uuid-dev/copyright
+	install -m 644 debian/libuuid.copyright debian/uuid-runtime/usr/share/doc/uuid-runtime/copyright
+	# dpkg symbol handling
+	for lib in libblkid1 libuuid1; \
+	do \
+		echo "Generating symbols for $$lib..."; \
+		dpkg-gensymbols -p$$lib -Pdebian/$$lib > debian/$$lib.tmp-patch; \
+		cat debian/$$lib.tmp-patch; \
+		patch debian/$$lib.symbols < debian/$$lib.tmp-patch; \
+		rm debian/$$lib.tmp-patch; \
+	done
+	#
 	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/shlibs.local b/debian/shlibs.local
index 26616108..fdebb4f6 100644
--- a/debian/shlibs.local
+++ b/debian/shlibs.local
@@ -1 +1,4 @@
 libblkid 1 libblkid1 (>=1.37-1)
+udeb: libblkid 1 libblkid1-udeb
+libuuid 1 libuuid1 (> 1.40.3-1)
+udeb: libuuid 1 libuuid1-udeb
diff --git a/debian/util-linux-udeb.dirs b/debian/util-linux-udeb.dirs
new file mode 100644
index 00000000..e1ae85e0
--- /dev/null
+++ b/debian/util-linux-udeb.dirs
@@ -0,0 +1 @@
+sbin
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#
diff --git a/debian/uuid-dev.README.Debian b/debian/uuid-dev.README.Debian
new file mode 100644
index 00000000..3d8cc89c
--- /dev/null
+++ b/debian/uuid-dev.README.Debian
@@ -0,0 +1,23 @@
+
+In order to santize e2fsprogs to be DFSG free, the file
+draft-leach-uuids-guids-01.txt has been removed.  It can be obtained
+by downloading e2fsprogs from the upstream sources.  It may also be
+available from other sites on the network, if you do a quick web
+search for the string "draft-leach-uuids-guids-01".
+
+Note that debian/rules is set up to include the file on Ubuntu
+systems, so for people trying to build e2fsprogs on Ubuntu systems,
+they should start from the upstream sources, and not the
+Debian-expurgated sources found in the Debian repository.  (n.b., for
+WIP releases the command "./util/gen-tarball ubuntu" will help create
+tar file which is appropriately named to make life easier for
+dpkg-buildpackage.)  Since Ubuntu doesn't have the DFSG restrictions,
+the documentation which has been removed for Debian's DFSG license
+purity shouldn't be denied to Ubuntu users.
+
+					Theodore Ts'o
+					Ocotober 3, 2006
+
+
+
+
diff --git a/debian/uuid-dev.files b/debian/uuid-dev.files
new file mode 100644
index 00000000..966eed36
--- /dev/null
+++ b/debian/uuid-dev.files
@@ -0,0 +1,4 @@
+usr/lib/libuuid.*
+usr/include/uuid
+usr/share/man/man3/uuid*
+usr/lib/pkgconfig/uuid.pc
diff --git a/debian/uuid-runtime.files b/debian/uuid-runtime.files
new file mode 100644
index 00000000..ff8d87ad
--- /dev/null
+++ b/debian/uuid-runtime.files
@@ -0,0 +1,4 @@
+usr/bin/uuidgen
+usr/sbin/uuidd
+usr/share/man/man8/uuidd.*
+usr/share/man/man1/uuidgen.*
diff --git a/debian/uuid-runtime.lintian-overrides b/debian/uuid-runtime.lintian-overrides
new file mode 100644
index 00000000..4642d30b
--- /dev/null
+++ b/debian/uuid-runtime.lintian-overrides
@@ -0,0 +1 @@
+uuid-runtime: command-with-path-in-maintainer-script prerm:5 /usr/sbin/uuidd
diff --git a/debian/uuid-runtime.postinst b/debian/uuid-runtime.postinst
new file mode 100644
index 00000000..3c1adb63
--- /dev/null
+++ b/debian/uuid-runtime.postinst
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+if ! getent group | grep -q libuuid; then
+groupadd -f -K GID_MIN=1 -K GID_MAX=999 libuuid
+fi
+if ! getent passwd | grep -q libuuid; then
+   useradd -d /var/lib/libuuid -K UID_MIN=1 -K UID_MAX=499 -g libuuid libuuid
+fi
+chown libuuid:libuuid /usr/sbin/uuidd
+chmod 6755 /usr/sbin/uuidd
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/uuid-runtime.postrm b/debian/uuid-runtime.postrm
new file mode 100644
index 00000000..f0770011
--- /dev/null
+++ b/debian/uuid-runtime.postrm
@@ -0,0 +1,10 @@
+#!/bin/sh
+set -e
+if [ "$1" = purge ]
+then
+	rm -rf /var/run/uuidd
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/uuid-runtime.prerm b/debian/uuid-runtime.prerm
new file mode 100644
index 00000000..904e1616
--- /dev/null
+++ b/debian/uuid-runtime.prerm
@@ -0,0 +1,10 @@
+#! /bin/sh
+set -e
+if [ -x /usr/sbin/uuidd ]
+then
+	/usr/sbin/uuidd -k || true
+fi
+
+#DEBHELPER#
+
+exit 0