diff -pruN 0.2.37-1/debian/changelog 0.2.37-1ubuntu1/debian/changelog
--- 0.2.37-1/debian/changelog	2010-10-20 17:46:46.000000000 +0100
+++ 0.2.37-1ubuntu1/debian/changelog	2010-10-20 17:11:52.000000000 +0100
@@ -1,3 +1,10 @@
+ktimetrace (0.2.37-1ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable.  Remaining changes:
+    - debian/rules: Build without aRts support.
+
+ -- Artur Rona <ari-tczew@ubuntu.com>  Tue, 19 Oct 2010 20:32:17 +0200
+
 ktimetrace (0.2.37-1) unstable; urgency=low
 
   * adopted the package. Closes: #503536
@@ -10,6 +17,21 @@ ktimetrace (0.2.37-1) unstable; urgency=
 
  -- Georges Khaznadar <georgesk@ofset.org>  Sat, 14 Aug 2010 20:31:48 +0200
 
+ktimetrace (0.2.36-5ubuntu2) jaunty; urgency=low
+
+  * Remove build-depends on arts. (LP: #320915)
+    - Patch configure; remove the checks for mcopidl as well as
+      artsc-config. Inline patch.
+
+ -- Andreas Wenning <awen@awen.dk>  Wed, 25 Feb 2009 16:23:13 +0100
+
+ktimetrace (0.2.36-5ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable (LP: #328534):
+    - Build-Depends on libarts1-dev to fix FTBFS.
+
+ -- Alessio Treglia <quadrispro@ubuntu.com>  Sun, 15 Feb 2009 01:38:28 +0100
+
 ktimetrace (0.2.36-5) unstable; urgency=low
 
   * QA upload.
@@ -29,6 +51,12 @@ ktimetrace (0.2.36-5) unstable; urgency=
 
  -- Barry deFreese <bdefreese@debian.org>  Mon, 02 Feb 2009 14:44:40 -0500
 
+ktimetrace (0.2.36-4.1build1) dapper; urgency=low
+
+  * Rebuild KDE universe for libstdc++ transition
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 17 Dec 2005 16:24:50 +0000
+
 ktimetrace (0.2.36-4.1) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -36,6 +64,13 @@ ktimetrace (0.2.36-4.1) unstable; urgenc
 
  -- Luk Claes <luk@debian.org>  Fri, 30 Sep 2005 13:14:25 +0200
 
+ktimetrace (0.2.36-4build1) breezy; urgency=low
+
+
+  * Rebuild for new C++ ABI
+
+ -- Matthias Klose < doko@ubuntu.com>  Mon,  6 Jun 2005 16:38:16 +0000
+
 ktimetrace (0.2.36-4) unstable; urgency=low
 
   * Change section to kde.
diff -pruN 0.2.37-1/debian/control 0.2.37-1ubuntu1/debian/control
--- 0.2.37-1/debian/control	2010-10-20 17:46:46.000000000 +0100
+++ 0.2.37-1ubuntu1/debian/control	2010-10-20 17:11:52.000000000 +0100
@@ -1,7 +1,8 @@
 Source: ktimetrace
 Section: kde
 Priority: extra
-Maintainer: Georges Khaznadar <georgesk@ofset.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Georges Khaznadar <georgesk@ofset.org>
 Build-Depends: debhelper (>> 5.0.0), autotools-dev, libcomedi-dev (>= 0.7.16-1.1), kdelibs4-dev, zlib1g-dev, automake1.9
 Standards-Version: 3.9.1
 Homepage: http://ktimetrace.sourceforge.net/
diff -pruN 0.2.37-1/debian/rules 0.2.37-1ubuntu1/debian/rules
--- 0.2.37-1/debian/rules	2010-10-20 17:46:46.000000000 +0100
+++ 0.2.37-1ubuntu1/debian/rules	2010-10-20 17:11:52.000000000 +0100
@@ -36,7 +36,8 @@ configure-stamp:
 		--prefix=/usr \
 		--mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info \
-		--disable-rpath
+		--disable-rpath \
+		--without-arts
 
 	touch configure-stamp