diff -pruN 0.5-3/debian/changelog 0.5-3ubuntu2/debian/changelog
--- 0.5-3/debian/changelog	2009-04-18 01:32:09.000000000 +0100
+++ 0.5-3ubuntu2/debian/changelog	2009-04-18 01:25:34.000000000 +0100
@@ -1,3 +1,18 @@
+kguitar (0.5-3ubuntu2) jaunty; urgency=low
+
+  * debian/rules: added --without-arts parameter to configure script call to
+    rebuild without arts support (LP: #320915)
+
+ -- Fabrice Coutadeur <fabricesp@ubuntu.com>  Fri, 17 Apr 2009 19:47:53 +0000
+
+kguitar (0.5-3ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Used dh_icons instead of dh_iconcache
+    (LP #228381)
+
+ -- Richard Birnie <Arbyuk@googlemail.com>  Thu, 21 Feb 2008 09:50:31 +0000
+
 kguitar (0.5-3) unstable; urgency=low
 
   * QA upload.
@@ -15,6 +30,13 @@ kguitar (0.5-3) unstable; urgency=low
 
  -- Barry deFreese <bddebian@comcast.net>  Wed, 13 Feb 2008 10:40:22 -0500
 
+kguitar (0.5-2ubuntu1) gutsy; urgency=low
+
+  * Merge with Debian, remaining changes:
+   - Use dh_iconcache
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 16 Jul 2007 10:29:14 +0100
+
 kguitar (0.5-2) unstable; urgency=low
 
   * debian/control: typos corrected in long description. Closes: #345302
@@ -27,3 +49,28 @@ kguitar (0.5-1) unstable; urgency=low
 
  -- Tommaso Moroni <moronito@debian.org>  Tue, 22 Nov 2005 20:13:06 +0100
 
+kguitar (0.5-0ubuntu4) edgy; urgency=low
+
+  * Rebuild so it doesnt depend on libgamin0
+
+ -- Sarah Hobbs <hobbsee@ubuntu.com>  Tue, 25 Jul 2006 02:50:12 +1000
+
+kguitar (0.5-0ubuntu3) dapper; urgency=low
+
+  * debian/rules:
+    + Use dh_iconcache .
+
+ -- Zak B. Elep <zakame@ubuntu.com>  Fri,  5 May 2006 09:59:47 -0400
+
+kguitar (0.5-0ubuntu2) dapper; urgency=low
+
+  * Rebuild KDE universe for libstdc++ transition
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 17 Dec 2005 16:46:02 +0000
+
+kguitar (0.5-0ubuntu1) breezy; urgency=low
+
+  * Initial release.
+
+ -- Loic Pefferkorn <loic@dev.erodia.net>  Fri, 19 Aug 2005 15:22:41 +0200
+
diff -pruN 0.5-3/debian/control 0.5-3ubuntu2/debian/control
--- 0.5-3/debian/control	2009-04-18 01:32:09.000000000 +0100
+++ 0.5-3ubuntu2/debian/control	2009-04-18 01:25:34.000000000 +0100
@@ -1,7 +1,8 @@
 Source: kguitar
 Section: kde
 Priority: optional
-Maintainer: Debian QA Group <packages@qa.debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian QA Group <packages@qa.debian.org>
 Build-Depends: debhelper (>= 5.0.0), kdelibs4-dev, libtse3-dev
 Standards-Version: 3.7.3
 
diff -pruN 0.5-3/debian/rules 0.5-3ubuntu2/debian/rules
--- 0.5-3/debian/rules	2009-04-18 01:32:09.000000000 +0100
+++ 0.5-3ubuntu2/debian/rules	2009-04-18 01:25:34.000000000 +0100
@@ -34,7 +34,7 @@ debian/debiandirs: admin/debianrules
 
 config.status: configure
 	dh_testdir
-	CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde)
+	CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --without-arts
 
 
 build: build-stamp
@@ -77,6 +77,7 @@ binary-arch: build install
 	dh_installdocs
 	dh_installmenu
 	dh_installman debian/kguitar.1
+	dh_icons
 	dh_link
 	dh_strip
 	dh_compress -X.docbook