From: Joerg Jaspert <joerg@debian.org>
Date: Sun, 1 Jul 2012 12:14:35 +0000 (+0200)
Subject: Merge remote-tracking branch 'ansgar/pu/multiarchive-1' into merge
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=e25f01f71e72a281571081c3d3052219ee6efb18;hp=e25f01f71e72a281571081c3d3052219ee6efb18;p=dak.git

Merge remote-tracking branch 'ansgar/pu/multiarchive-1' into merge

* ansgar/pu/multiarchive-1:
  config.py: Add __contains__ method
  fstransactions.py: allow mode to be a string
  fstransactions.py: also use mode for directories
  tests: add a few packages for testing dak
  utils.py: add mail_addresses_for_upload function
  gpg_get_key_addresses: return a list instead of a set
  textutils.py: don't try to convert unicode strings again
  Add regexp to match .changes files.
  Correctly match version part of source tarballs
  dominate: convert to str
  Remove no longer used templates.
  Remove unused functions.

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---