Merge bash-completion 1:1.2-2 (main) from Debian unstable (main)

Please provide a Debian -> Ubuntu debdiff and resubscribe ubuntu-sponsors.

In the debdiff are two additional patches that are not applied (bash-completion-wget-o-fix and fix-multiple-known_hosts). Either remove them or apply them.

You should indent the remaining changes in debian/copyright to make clear what remains and what you additional did.

Please resubscribe ubuntu-sponsors once you have addressed these points.

bash-completion (1:1.2-2ubuntu1) maverick; urgency=low

  * Merge from Debian (LP: #612862). Remaining changes:
    + debian/patches/disable-avahi-browse.diff:
      Disable avahi-browse since it scales poorly in the current
      form. (LP: #510591)

  * Dropped patches (fixed upstream)
    - debian/patches/support_multiple_hosts_files.diff:
      Fix external ssh known_hosts files (LP: #483499)
    - debian/patches/bash-completion-wget-o-fix:
      Fix directory escaping for wget -O (LP: #435055)

 -- Mikhail Turov <email address hidden> Fri, 06 Aug 2010 01:34:59 +0100

This bug was fixed in the package bash-completion - 1:1.2-2ubuntu1

---------------
bash-completion (1:1.2-2ubuntu1) maverick; urgency=low

  * Merge from Debian (LP: #612862). Remaining changes:
    + debian/patches/disable-avahi-browse.diff:
      Disable avahi-browse since it scales poorly in the current
      form. (LP: #510591)
  * Dropped patches (fixed upstream)
    - debian/patches/support_multiple_hosts_files.diff:
      Fix external ssh known_hosts files (LP: #483499)
    - debian/patches/bash-completion-wget-o-fix:
      Fix directory escaping for wget -O (LP: #435055)

bash-completion (1:1.2-2) unstable; urgency=low

  * debian/patches/:
    - 00-fix_586210.patch added, fixes a weird error while loading
      service(8) completions. Thanks to John Hedges (Closes: #586210)
  * debian/control:
    - added Replaces: cryptsetup (Closes: #586161)

bash-completion (1:1.2-1) unstable; urgency=low

  * New upstream release
    - contrib/munin-node fixed (Closes: #550943)
    - contrib/dpkg fixed -W and --show completing on .?(u)deb's
      (Closes: #552109)
    - added munindoc completion to contrib/munin-node, thanks to Tom
      Feiner (Closes: #553371)
    - contrib/cpio: added missing completions for -?, --help, --license,
      --usage, --version and (-p) --to-stdout (Closes: #557436)
    - added .okular completion to okular (Closes: #545530)
    - refreshed reportbug completion, added --from-buildd (Closes: #579471)
    - special-case "apt-get source" (Closes: #572000)
    - added lintian completion (Closes: #547361)
    - protect various completions from unusual user input by not embedding the
      input in external command arguments (Closes: #552631)
    - awk and sed usage portability fixes (Closes: #501479)
    - fix completion of usernames (Closes: #511788)
    - fix mount handling of escapes (LP: #219971, Closes: #511149)
    - update find completion (LP: #570113)
  * debian/patches/* removed, merged upstream
  * debian/control:
    - add Conflicts/Replaces on xen-tools (<= 4.1-1) (Closes: #550590)
    - Standards-Version bumped to 3.8.4, no changes needed
  * debian/links: remove dangling symlink in /usr/share/doc/bash
    (Closes: #565447)
  * debian/watch: fix regex to avoid old timestamp-based releases
  * debian/preinst: definitely remove anything in /usr/share/doc/bash/
  * debian/source/format: using 3.0 (quilt)
  * debin/rules made minimal
 -- Mikhail Turov <email address hidden> Fri, 06 Aug 2010 01:34:59 +0100