Merge branch 'master' into msfl

diff --git a/config/debian/lintian.tags b/config/debian/lintian.tags
index a2fa607dad13c57b38c9675ab3aa016524f49582..6a11a9ecd8a36ef19846b2a38338fa27b6f9b27f 100644 (file)
--- a/config/debian/lintian.tags
+++ b/config/debian/lintian.tags
@@ -11,11 +11,26 @@ lintian:
     - usr-share-doc-symlink-without-dependency
     - mknod-in-maintainer-script
     - package-contains-info-dir-file
-    - copyright-lists-upstream-authors-with-dh_make-boilerplate
+    - binary-or-shlib-defines-rpath
+    - non-etc-file-marked-as-conffile
+    - embedded-zlib
+    - no-shlibs-control-file
+    - copyright-contains-dh_make-todo-boilerplate
+    - preinst-interpreter-without-predepends
+    - control-interpreter-without-depends
   fatal:
+    - debian-control-file-uses-obsolete-national-encoding
+    - malformed-deb-archive
+    - bad-package-name
+    - no-architecture-field
+    - package-contains-ancient-file
+    - forbidden-postrm-interpreter
+    - control-interpreter-in-usr-local
+    - package-uses-local-diversion
     - wrong-file-owner-uid-or-gid
     - bad-relation
     - FSSTND-dir-in-usr
+    - FSSTND-dir-in-var
     - binary-in-etc
     - missing-dependency-on-perlapi
     - section-is-dh_make-template

diff --git a/dak/dakdb/update23.py b/dak/dakdb/update23.py
old mode 100644 (file)
new mode 100755 (executable)
index 8cc7ec4..48abf01
--- a/dak/dakdb/update23.py
+++ b/dak/dakdb/update23.py
@@ -54,9 +54,9 @@ CREATE VIEW srcfiles_suite_component AS
     JOIN location ON files.location = location.id;
            """)
 
-       print "Committing"
-       c.execute("UPDATE config SET value = '23' WHERE name = 'db_revision'")
-       self.db.commit()
+        print "Committing"
+        c.execute("UPDATE config SET value = '23' WHERE name = 'db_revision'")
+        self.db.commit()
 
     except psycopg2.InternalError, msg:
         self.db.rollback()