Branches for Hardy

Author: Morten Kjeldgaard
Revision Date: 2008-03-31 19:12:04 UTC

* Merge from Debian unstable (LP: #188086). Remaining Ubuntu changes:
* debian/xtide.conf: add /usr/share/xtide-wvs1 to specify where
  to find optional shoreline data.
* debian/control:
  - versioned build-depends on debhelper >= 5.0.51~ due to the use
    of dh_icons in debian/rules.
  - ubuntu maintainer mangling.
  - add suggests: xtide-wvs1-data, the Ubuntu package containing the
    shoreline data.
* debian/copyright: add icon copyright info.
* debian/changelog: carry along notes on old Ubuntu changes. All
  except the here mentioned are now part of the Debian version.