From: LaMont Jones Date: Wed, 8 Aug 2007 19:46:38 +0000 (-0600) Subject: Merge branch 'master' into ubuntu-v2.13 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a3d14378d2d4e50a4cda90f3216887d0f90c5c0;p=util-linux Merge branch 'master' into ubuntu-v2.13 fix hurd-i386 build-depends Conflicts: debian/control --- 0a3d14378d2d4e50a4cda90f3216887d0f90c5c0 diff --cc debian/changelog index 2679578f,abac3791..3a5fe1f1 --- a/debian/changelog +++ b/debian/changelog @@@ -10,18 -1,10 +10,19 @@@ util-linux (2.13~rc3-2ubuntu1) gutsy; u util-linux (2.13~rc3-2) unstable; urgency=low * mount should Suggest nfs-common, not Recommend it. + * Fix build-depends for hurd-i386. Closes: #333147 - -- LaMont Jones Wed, 8 Aug 2007 13:17:42 -0600 + -- LaMont Jones Wed, 8 Aug 2007 13:34: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 diff --cc debian/control index 0eb13308,9691855b..297969c7 --- a/debian/control +++ b/debian/control @@@ -1,9 -1,8 +1,9 @@@ Source: util-linux Section: base Priority: required - Build-Depends: libncurses5-dev, libslang2-dev (>=2.0.4-1), gettext, zlib1g-dev, libvolume-id-dev (>= 093-0ubuntu11), uuid-dev, dpkg-dev (>=1.13.12), libselinux1-dev [!kfreebsd-i386 !kfreebsd-amd64] -Build-Depends: libncurses5-dev, libslang2-dev (>=2.0.4-1), gettext, zlib1g-dev, libvolume-id-dev (>=0.113-2), uuid-dev, dpkg-dev (>=1.13.12), libselinux1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386] -Maintainer: LaMont Jones ++Build-Depends: libncurses5-dev, libslang2-dev (>=2.0.4-1), gettext, zlib1g-dev, libvolume-id-dev (>= 113), uuid-dev, dpkg-dev (>=1.13.12), libselinux1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386] +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: LaMont Jones Standards-Version: 3.7.2.0 Package: util-linux