diff -Nru taskjuggler-2.4.3/debian/changelog taskjuggler-2.4.3/debian/changelog
--- taskjuggler-2.4.3/debian/changelog	2010-06-23 15:52:50.000000000 +0200
+++ taskjuggler-2.4.3/debian/changelog	2010-06-23 15:50:55.000000000 +0200
@@ -1,3 +1,19 @@
+taskjuggler (2.4.3-2ubuntu1) maverick; urgency=low
+
+  * Merge from debian testing (LP: #597698). Remaining changes:
+    - debian/rules: added --without-arts flag to configure call to fix FTBFS, as
+      libarts support has been dropped from Ubuntu.
+
+ -- Angel Abad <angelabad@gmail.com>  Thu, 28 Jan 2010 06:21:49 +0000
+
+taskjuggler (2.4.3-2) unstable; urgency=low
+
+  * Remove Timezone.tjp from Testsuite to fix FTBFS. (Closes: #552679)
+  * Add locales-all | locales build dependency.
+  * Switch to dpkg-source 3.0 (quilt) format.
+
+ -- Fathi Boudra <fabo@debian.org>  Sun, 17 Jan 2010 00:53:27 +0100
+
 taskjuggler (2.4.3-1ubuntu2) karmic; urgency=low
 
   * debian/rules: added a clean rule that deletes Timezone.tjp
diff -Nru taskjuggler-2.4.3/debian/control taskjuggler-2.4.3/debian/control
--- taskjuggler-2.4.3/debian/control	2010-06-23 15:52:50.000000000 +0200
+++ taskjuggler-2.4.3/debian/control	2010-01-28 07:21:49.000000000 +0100
@@ -4,10 +4,10 @@
 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Mark Purcell <msp@debian.org>, Fathi Boudra <fabo@debian.org>
-Build-Depends: debhelper (>= 7), quilt, automake, kdelibs4-dev,
+Build-Depends: debhelper (>= 7.4), locales-all | locales, automake, kdelibs4-dev,
  poster, docbook2x, docbook-to-man, docbook-utils,
  docbook-xml, openjade, xsltproc
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 Homepage: http://www.taskjuggler.org
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/taskjuggler/trunk
 Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/taskjuggler/trunk
diff -Nru taskjuggler-2.4.3/debian/rules taskjuggler-2.4.3/debian/rules
--- taskjuggler-2.4.3/debian/rules	2010-06-23 15:52:50.000000000 +0200
+++ taskjuggler-2.4.3/debian/rules	2010-06-23 15:44:24.000000000 +0200
@@ -6,9 +6,6 @@
 
 export kde_confdir = /etc/kde3
 
-clean:
-	dh_clean $(CURDIR)/TestSuite/Syntax/Errors/Timezone.tjp
-
 DEB_CONFIGURE_EXTRA_FLAGS := \
 	--disable-rpath \
 	--with-xinerama \
@@ -18,13 +15,14 @@
 	--with-ical-support=no
 
 %:
-	dh --with quilt $@
+	dh $@
 
 override_dh_auto_configure:
+	rm TestSuite/Syntax/Errors/Timezone.tjp
 	dh_auto_configure -- $(DEB_CONFIGURE_EXTRA_FLAGS)
 
 override_dh_install:
-	dh_install --missing
+	dh_install --list-missing
 
 override_dh_compress:
 	dh_compress -X.dcl -X.docbook -X-license -X.tag -X.sty -X.el
diff -Nru taskjuggler-2.4.3/debian/source/format taskjuggler-2.4.3/debian/source/format
--- taskjuggler-2.4.3/debian/source/format	1970-01-01 01:00:00.000000000 +0100
+++ taskjuggler-2.4.3/debian/source/format	2010-01-28 07:21:39.000000000 +0100
@@ -0,0 +1 @@
+3.0 (quilt)