Merge branch 'master' of ssh://franck.debian.org/srv/ftp.debian.org/git/dak

* 'master' of ssh://franck.debian.org/srv/ftp.debian.org/git/dak:
  Seems to work with 0.6 too

diff --combined daklib/dbconn.py
index f8c537603aba6b9e259e50988ab2d3ccf52cc373,2ec1b60cdeaf7b5925ab73be15c1c4549afbb275..5a92dc8146c39e365b85f012b22a0a81717e1153
--- 1/daklib/dbconn.py
--- 2/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@@ -72,11 -72,11 +72,11 @@@ class DebVersion(sqltypes.Text)
          return "DEBVERSION"
  
  sa_major_version = sqlalchemy.__version__[0:3]
- if sa_major_version == "0.5":
+ if sa_major_version in ["0.5", "0.6"]:
      from sqlalchemy.databases import postgres
      postgres.ischema_names['debversion'] = DebVersion
  else:
-     raise Exception("dak isn't ported to SQLA versions != 0.5 yet.  See daklib/dbconn.py")
+     raise Exception("dak only ported to SQLA versions 0.5 and 0.6.  See daklib/dbconn.py")
  
  ################################################################################
  
@@@ -2483,6 -2483,7 +2483,6 @@@ SUITE_FIELDS = [ ('SuiteName', 'suite_n
                   ('Priority', 'priority'),
                   ('NotAutomatic', 'notautomatic'),
                   ('CopyChanges', 'copychanges'),
 -                 ('CommentsDir', 'commentsdir'),
                   ('OverrideSuite', 'overridesuite')]
  
  class Suite(object):