From: Joerg Jaspert <joerg@debian.org>
Date: Fri, 13 Mar 2009 15:11:17 +0000 (+0100)
Subject: Merge branch 'merge'
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=04dc27ae10c3dc9bb001544c297ae089256c3ef1;p=dak.git

Merge branch 'merge'

* merge:
  new arch specific contents files; get override type id from database instead of hardcoded
  make p-u use the new utils.temp_dirname() method
  don't import tempfile in contents.py
  move mkdtmp to utils.temp_directory
  Revert "Revert "Merge commit 'stew/content_generation' into merge""
  fixing Binary.reject.  adding better logging when we get an error in contents insertion
  back to ./ for tarballs
  get contents branch working with etch era pacakges
---

04dc27ae10c3dc9bb001544c297ae089256c3ef1