hw-detect: new changes from Debian require merging

[Merge-o-Matic]

New changes from Debian require merging into Ubuntu.

Some, if not all, of this work has been done automatically;
however the changes should be reviewed before signing and
uploading.

The new source package, along with various patches to aid
your review are available at:

        http://people.ubuntu.com/~scott/ongoing-merge/hw-detect/

In particular see the REPORT file for details.

If this is the first time you have received one of these
bugs, or are just unsure what to do, see:

        http://people.ubuntu.com/~scott/ongoing-merge/README

 -- Your friendly neighbourhood Merge-O-Matic.

[Merge-o-Matic (mom-ubuntu)]

This is a reminder, further changes have occurred in Debian
since this report was filed. The URL above has been updated
with the new source package.

[Colin Watson (cjwatson)]

hw-detect (1.32ubuntu1) dapper; urgency=low

  * Resynchronise with Debian.
  * Drop casper symlinks, no longer required following casper's
    reimplementation as initramfs hooks.

 -- Colin Watson <email address hidden> Wed, 18 Jan 2006 01:06:30 +0000

hw-detect (1.32) unstable; urgency=low

  * I observed a scsi disk that required three seconds from the end of
    hw-detect until the kernel brought it up. (This may have involved udev,
    not sure). Try to deal with this kind of race slightly better in
    disk-detect by probing a few times with short pauses before concluding
    that there is no disk.

  [ Updated translations ]
  * Catalan (ca.po) by Guillem Jover
  * Greek, Modern (1453-) (el.po) by quad-nrg.net
  * Finnish (fi.po) by Tapio Lehtonen
  * Swedish (sv.po) by Daniel Nylander
  * Vietnamese (vi.po) by Clytie Siddall

 -- Joey Hess <email address hidden> Mon, 2 Jan 2006 21:15:56 -0500

hw-detect (1.31) unstable; urgency=low

  * If d-i is using pcmciautils-udeb instead of pcmcia-cs-udeb (needed on
    2.6.13 kernels), then install pcmciautils as well as pcmcia-cs.
  * The new update-dev that handles udev has been around for a while, so
    drop old calls to udevstart/udevsynthesize.
  * Install discover1 in /target even if d-i is using udev, since X's
    maintainer scripts need discover.

  [ Updated translations ]
  * Galician (gl.po) by Jacobo Tarrio
  * Malagasy (mg.po) by Jaonary Rabarisoa
  * Slovenian (sl.po) by Jure Čuhalev

 -- Colin Watson <email address hidden> Sun, 25 Dec 2005 15:12:11 +0000

hw-detect (1.30) unstable; urgency=low

  * udebs are not allowed to have ORed deps (and it was adding cruft to the
    build) so remove the discover/udev deps entirely. It would be better to
    use a depends on something provided by both packages, but these deps are
    not really needed since both hw-detect and one or the other is part of the
    d-i base system.

 -- Joey Hess <email address hidden> Sat, 3 Dec 2005 12:55:10 -0500