Branches for Trusty

Author: Felix Geyer
Revision Date: 2011-01-08 15:59:51 UTC

* Merge from Debian unstable, remaining changes:
  - debian/patches/alternative_shell_fixes.patch Patch guidedog.cpp with
    quilt to work with non *sh shells
  - Fix FTBFS:
    + debian/rules: regenerate ./configure prior to calling it
    + for this, add build dependencies on autoconf and automake
    + optional_arts.patch: patch build system to support --without-arts
      argument to ./configure
    + call ./configure with --without-arts
    + recommended_macros.patch: add macros to admin/configure.in.min