From: Joerg Jaspert <joerg@debian.org>
Date: Sat, 9 Jan 2010 23:48:16 +0000 (+0100)
Subject: Merge remote branch 'stew/contents' into merge
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=c7339c8b863cd7c66e5289af818aef278b833f51;hp=--cc;p=dak.git

Merge remote branch 'stew/contents' into merge

* stew/contents:
  add update30 to fix 'bin_contents' trigger
  dak.py
  dbconn
  Missing ,
  Is schema 30 now

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

c7339c8b863cd7c66e5289af818aef278b833f51
diff --cc dak/update_db.py
index 2d962dcb,e6db97a6..a241bc35
--- a/dak/update_db.py
+++ b/dak/update_db.py
@@@ -45,7 -45,7 +45,7 @@@ from daklib.dak_exceptions import DBUpd
  ################################################################################
  
  Cnf = None
- required_database_schema = 28
 -required_database_schema = 29
++required_database_schema = 30
  
  ################################################################################