diff -u vala-0.7.4/debian/changelog vala-0.7.4/debian/changelog
--- vala-0.7.4/debian/changelog
+++ vala-0.7.4/debian/changelog
@@ -1,9 +1,26 @@
+vala (0.7.4-1ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes: LP: #398141
+    - debian/rules:
+      + Make test-suite failures fatal.
+  * Fix LP: #323943
+
+ -- Bhavani Shankar <right2bhavi@gmail.com>  Sat, 11 Jul 2009 18:02:28 +0530
+
 vala (0.7.4-1) unstable; urgency=low
 
   * New upstream version.
 
  -- Marc-Andre Lureau <marcandre.lureau@gmail.com>  Fri, 03 Jul 2009 01:08:04 +0300
 
+vala (0.7.3-1ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - debian/rules:
+      + Make test-suite failures fatal.
+
+ -- Krzysztof Klimonda <kklimonda@syntaxhighlighted.com>  Fri, 05 Jun 2009 04:56:11 +0200
+
 vala (0.7.3-1) unstable; urgency=low
 
   * debian/control:
@@ -12,6 +29,16 @@
 
  -- Marc-Andre Lureau <marcandre.lureau@gmail.com>  Tue, 26 May 2009 21:48:16 +0300
 
+vala (0.7.2-1ubuntu1) karmic; urgency=low
+
+  * debian/control:
+    - Build-depends on dbus-x11. dbus-launch is needed for part of the
+      test-suite.
+  * debian/rules:
+    - Make test-suite failures fatal.
+
+ -- Chris Coulson <chrisccoulson@googlemail.com>  Wed, 13 May 2009 00:06:59 +0100
+
 vala (0.7.2-1) unstable; urgency=low
 
   * New upstream version.
@@ -405 +431,0 @@
-
diff -u vala-0.7.4/debian/control vala-0.7.4/debian/control
--- vala-0.7.4/debian/control
+++ vala-0.7.4/debian/control
@@ -1,7 +1,8 @@
 Source: vala
 Section: devel
 Priority: optional
-Maintainer: Maintainers of Vala packages <pkg-vala-maintainers@lists.alioth.debian.org>
+Maintainer: Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Maintainers of Vala packages <pkg-vala-maintainers@lists.alioth.debian.org>
 Uploaders: Marc-Andre Lureau <marcandre.lureau@gmail.com>, Loic Minier <lool@dooz.org>, Mathias Hasselmann <mathias.hasselmann@gmx.de>, Sebastian Dröge <slomo@debian.org>
 Build-Depends: debhelper (>= 5.0),
                cdbs (>= 0.4),
diff -u vala-0.7.4/debian/rules vala-0.7.4/debian/rules
--- vala-0.7.4/debian/rules
+++ vala-0.7.4/debian/rules
@@ -16,3 +16,3 @@
 
-DEB_MAKE_CHECK_TARGET = check || true
+DEB_MAKE_CHECK_TARGET := check
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed