From: LaMont Jones Date: Wed, 8 Aug 2007 19:22:37 +0000 (-0600) Subject: Merge branch 'master' into ubuntu-v2.13 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b73e43510174cd96535b284c73d0bbc099702acf;p=util-linux Merge branch 'master' into ubuntu-v2.13 Conflicts: debian/changelog --- b73e43510174cd96535b284c73d0bbc099702acf diff --cc debian/changelog index d3095bfe,d3ee318a..2679578f --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,9 +1,27 @@@ ++util-linux (2.13~rc3-2ubuntu1) gutsy; urgency=low ++ ++ * New debian version. 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 Wed, 8 Aug 2007 13:22:04 -0600 ++ + util-linux (2.13~rc3-2) unstable; urgency=low + + * mount should Suggest nfs-common, not Recommend it. + + -- LaMont Jones Wed, 8 Aug 2007 13:17:42 -0600 + +util-linux (2.13~rc3-1ubuntu1) gutsy; urgency=low + + * Merge ubuntu changes into a new Debian version. Remaining: + - Add udev rule for calling /sbin/hwclock --hctosys dynamically: + + debian/hwclock.rules, debian/hwclock.udev: Rule and script. + + debian/rules: Install those. + + -- LaMont Jones Wed, 8 Aug 2007 11:57:03 -0600 + util-linux (2.13~rc3-1) unstable; urgency=low * New upstream version