Branches for Natty

Author: Chris Halse Rogers
Revision Date: 2011-02-21 22:31:09 UTC

* Pre-sync from Debian git. All Ubuntu changes are now upstream.
* It came from the deep! New upstream release
* debian/rules:
  - Now 100% dfsg-free; drop get-orig-source logic
  - Drop autoreconf-ing; we no longer need to patch the build system.
  - Add “--with” quilt to actually apply the patches.
  - Delete *.addin.xml files on clean; these are autogenerated files which
    shouldn't be in the tarball, and they clutter the debian diff.
  - Upstream buildsystem no longer fails without unused mautil. Drop it from
    configure.
* debian/patches/00_debian_default_plugins.patch:
  - Refresh for new upstream version.
* debian/patches/02_fix_firefox_icon.patch:
  - Drop; fixed in more generality upstream.
* debian/control:
  - Bump runtime and build-depends on gnome-do to 0.8.4.
  - Add libdbus1.0-cil-dev and libdbus-glib1.0-cil-dev to Build-Depends for
    Empathy plugin.
  - Bump Standards-Version; no changes required.
  - Transition VCS-* fields to git
* debian/patches/02_gdata_1.7_compatibility.diff:
  - Drop address field from the GMail contacts plugin; this API changed in
    gdata .NET 1.7, and needs fixing upstream