From: LaMont Jones Date: Thu, 19 Jul 2007 02:57:43 +0000 (-0600) Subject: 2.12r-17ubuntu2 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=edf6ccc92e7216c968e65780d48adb8689ef68b9;p=util-linux 2.12r-17ubuntu2 --- edf6ccc92e7216c968e65780d48adb8689ef68b9 diff --cc debian/changelog index 87425e8a,b38132ea..0617420d --- a/debian/changelog +++ b/debian/changelog @@@ -1,15 -1,57 +1,99 @@@ ++util-linux (2.12r-17ubuntu2) feisty; urgency=low ++ ++ * debian/control: Update maintainer fields according to debian- ++ maintainer-field spec. ++ ++ -- Martin Pitt Mon, 12 Mar 2007 14:58:14 +0000 ++ ++util-linux (2.12r-17ubuntu1) feisty; urgency=low ++ ++ * Merge from Debian unstable. Remaining changes: ++ - libvolume_id support patch from SuSE ++ - single ubuntuized hwclock script ++ ++ -- LaMont Jones Fri, 2 Feb 2007 11:14:19 -0700 ++ + util-linux (2.12r-17) unstable; urgency=low + + * Userspace software suspend fix. Closes: #409365 + * armel support. Closes: #408816 + + -- LaMont Jones Fri, 2 Feb 2007 11:08:04 -0700 + + util-linux (2.12r-16) unstable; urgency=low + + * actually apply 30swsusp-resume. And support userspace sw susp too. + Closes: #406204 + * Fix off-by-one issue in agetty -I. Closes: #392445 + * Drop extraneous "again" from hwclock.sh and remove references to + hwclockfirst.sh. Closes: #396755 + * Drop PAGE_SIZE usage completely, use sysconf(_SC_PAGESIZE). + * Make intr the default for NFS v2 & v3 mounts in addition to being the + default for NFS v4. Thanks to Tollef Fog Heen for the idea. + + -- LaMont Jones Wed, 17 Jan 2007 11:57:35 -0700 + ++util-linux (2.12r-15ubuntu1) feisty; urgency=low ++ ++ * Merge from debian unstable, remaining changes: ++ - libvolume_id support patch from SuSE ++ - Drop PAGE_SIZE usage complete, and switch to sysconf(_SC_PAGESIZE). ++ - single hwclock script ++ ++ -- Scott James Remnant Mon, 27 Nov 2006 12:22:16 +0000 ++ + util-linux (2.12r-15) unstable; urgency=low + + * New amd64 rdev patch. Closes: #396842 + + -- LaMont Jones Fri, 3 Nov 2006 20:44:05 -0700 + + util-linux (2.12r-14) unstable; urgency=low + + * Make that 11 for hwclock.sh, since we need / to be writable for the + adjfile. + + -- LaMont Jones Tue, 31 Oct 2006 15:01:01 -0700 + + util-linux (2.12r-13) unstable; urgency=low + + * NFS seems to not like 127.0.0.1 as a client ID for everyone. + Closes: #394941 + - 30nfs4-setclientid.dpatch by Steinar H. Gunderson + * Move hwclock.sh to 8 since localtime is now a file, not a symlink. + Adds Depends: tzdata (>=2006c-2) + Closes: #342887 + * ship rdev on amd64. Closes: #297789 + + -- LaMont Jones Tue, 31 Oct 2006 13:51:50 -0700 + + util-linux (2.12r-12) unstable; urgency=low + + * drop hwclockfirst.sh, and put hwclock.sh back at 50. See #50572 and + Closes: #342887 + * Deal with _syscall5 going away. Patch imported from Ubuntu. + Closes: #392236 + + -- LaMont Jones Thu, 19 Oct 2006 19:01:33 -0600 + ++util-linux (2.12r-11ubuntu3) feisty; urgency=low ++ ++ * Change libvolumeid-dev build-dep to libvolume-id-dev. ++ ++ -- Scott James Remnant Thu, 23 Nov 2006 11:03:21 +0000 ++ +util-linux (2.12r-11ubuntu2) edgy; urgency=low + + * Drop PAGE_SIZE usage complete, and switch to sysconf(_SC_PAGESIZE). + + -- Adam Conrad Fri, 13 Oct 2006 00:07:40 +1000 + +util-linux (2.12r-11ubuntu1) edgy; urgency=low + + * Merge NFS fix from Debian. + + -- LaMont Jones Tue, 19 Sep 2006 14:04:00 -0600 + util-linux (2.12r-11) unstable; urgency=low * typos in NFSv4 (GSSDLCK didn't have .pid, and the latest diff --cc debian/control index 1d92f44b,fb20d1b2..84d5b479 --- a/debian/control +++ b/debian/control @@@ -1,9 -1,9 +1,10 @@@ Source: util-linux Section: base Priority: required - Build-Depends: libncurses5-dev, libslang2-dev (>=2.0.4-1), gettext, zlib1g-dev, libvolumeid-dev (>= 093-0ubuntu11), uuid-dev, dpatch, dpkg-dev (>=1.13.12) -Build-Depends: libncurses5-dev, libslang2-dev (>=2.0.4-1), gettext, zlib1g-dev, libblkid-dev, uuid-dev, dpatch, dpkg-dev (>=1.13.12) --Maintainer: LaMont Jones - Standards-Version: 3.6.2.0 ++Build-Depends: libncurses5-dev, libslang2-dev (>=2.0.4-1), gettext, zlib1g-dev, libvolume-id-dev (>= 093-0ubuntu11), uuid-dev, dpatch, dpkg-dev (>=1.13.12) ++Maintainer: Ubuntu Core Developers ++XSBC-Original-Maintainer: LaMont Jones + Standards-Version: 3.7.2.0 Package: util-linux Architecture: any diff --cc debian/patches/00list index 8afacf27,ebf9130a..e7006410 --- a/debian/patches/00list +++ b/debian/patches/00list @@@ -16,5 -20,4 +20,5 @@@ #50hurd 60_opt_O1 65_llseek-syscall + 65page_size +70libvolume_id-support - 99page_size diff --cc debian/patches/10agetty.dpatch index c0fe283e,e40ef9a2..e40ef9a2 mode 100644,100755..100644 --- a/debian/patches/10agetty.dpatch +++ b/debian/patches/10agetty.dpatch diff --cc debian/rules index 00a565a1,b67d70b9..74a868fb --- a/debian/rules +++ b/debian/rules @@@ -225,15 -226,9 +226,15 @@@ endi install -m 644 debian/mime.$(PACKAGE) debian/tmp/usr/lib/mime/packages/$(PACKAGE) install -m 644 debian/copyright debian/tmp/usr/share/doc/$(PACKAGE)/copyright install debian/{preinst,postinst,prerm,postrm} debian/tmp/DEBIAN/ - ifeq ($(DEB_HOST_GNU_SYSTEM),linux-gnu) + ifeq ($(DEB_HOST_ARCH_OS),linux) ifneq ($(arch),$(nohwclock)) install -m 644 debian/conffiles debian/tmp/DEBIAN/ + + install -d -m 755 debian/tmp/lib/udev + install -m 755 debian/hwclock.udev debian/tmp/lib/udev/set_hwclock + + install -d -m 755 debian/tmp/etc/udev/rules.d + install -m 644 debian/hwclock.rules debian/tmp/etc/udev/rules.d/85-hwclock.rules endif endif ls debian/tmp/{bin,sbin,usr/{bin,sbin}}/* | xargs dpkg-shlibdeps -putil-linux