From: LaMont Jones <lamont@mmjgroup.com>
Date: Thu, 9 Aug 2007 22:00:25 +0000 (-0600)
Subject: Merge branch 'master' into ubuntu-v2.13
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ba50c06400eb96a59b35802dd13d6dafed22106;p=util-linux

Merge branch 'master' into ubuntu-v2.13

Conflicts:

	debian/changelog
---

6ba50c06400eb96a59b35802dd13d6dafed22106
diff --cc debian/changelog
index 57f6076f,35d1853c..edece713
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,17 +1,27 @@@
++util-linux (2.13~rc3-4ubuntu1) gutsy-UNRELEASED; urgency=low
++
++  * Merge from Debian. (LP: #131367)
++  * Remaining Ubuntu changes:
++    - Add udev rule for calling /sbin/hwclock --hctosys dynamically:
++      + debian/hwclock.rules, debian/hwclock.udev: Rule and script.
++      + debian/rules: Install those.
++
++ -- LaMont Jones <lamont@ubuntu.com>  Thu,  9 Aug 2007 15:59:41 -0600
++
+ util-linux (2.13~rc3-4) unstable-UNRELEASED; urgency=low
+ 
+   * mount: make the error message a little more clear
+     when a helper program is missing.
+   * hwclock.sh: only report hwclock updated if we did that.  Closes: #436873
+ 
+  -- LaMont Jones <lamont@debian.org>  Thu,  9 Aug 2007 13:48:23 -0600
+ 
+ util-linux (2.13~rc3-3) unstable; urgency=low
+ 
+   * Merge lpia support from ubuntu.
+ 
+  -- LaMont Jones <lamont@debian.org>  Thu,  9 Aug 2007 08:50:42 -0600
+ 
  util-linux (2.13~rc3-2ubuntu2) gutsy; urgency=low
  
    * Add lpia support back in.  sorry.