diff -Nur /tmp/tmp.QYffADwetU/sentinella-0.6.2-1/debian/changelog /tmp/tmp.QYffADwetU/sentinella-0.6.2-1ubuntu1/debian/changelog
--- sentinella-0.6.2-1/debian/changelog	2010-06-20 16:04:50.000000000 +0200
+++ sentinella-0.6.2-1ubuntu1/debian/changelog	2010-06-28 11:22:40.357163617 +0200
@@ -1,3 +1,11 @@
+sentinella (0.6.2-1ubuntu1) maverick; urgency=low
+
+  * Merge from debian unstable (LP: #599270). New changes:
+    - Do not build xpm icon since Ubuntu's imagemagick fails to handle
+      it. (See bug #599248 on Launchpad).
+
+ -- Niels Thykier <niels@thykier.net>  Mon, 28 Jun 2010 10:38:27 +0200
+
 sentinella (0.6.2-1) unstable; urgency=low
 
   * New upstream release.
diff -Nur /tmp/tmp.QYffADwetU/sentinella-0.6.2-1/debian/control /tmp/tmp.QYffADwetU/sentinella-0.6.2-1ubuntu1/debian/control
--- sentinella-0.6.2-1/debian/control	2010-06-18 16:25:25.000000000 +0200
+++ sentinella-0.6.2-1ubuntu1/debian/control	2010-06-28 10:40:09.148951468 +0200
@@ -1,15 +1,14 @@
 Source: sentinella
 Section: kde
 Priority: optional
-Maintainer: Niels Thykier <niels@thykier.net>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Niels Thykier <niels@thykier.net>
 Build-Depends: cmake,
                debhelper (>= 7.0.50~),
                help2man,
-               imagemagick,
                kdebase-workspace-dev (>= 4:4.4),
                kdelibs-bin (>= 4:4.4),
                kdelibs5-dev (>= 4:4.4),
-               librsvg2-bin,
                libsysactivity-dev
 Standards-Version: 3.8.4
 Homepage: http://sourceforge.net/projects/sentinella/
diff -Nur /tmp/tmp.QYffADwetU/sentinella-0.6.2-1/debian/rules /tmp/tmp.QYffADwetU/sentinella-0.6.2-1ubuntu1/debian/rules
--- sentinella-0.6.2-1/debian/rules	2010-06-18 16:25:25.000000000 +0200
+++ sentinella-0.6.2-1ubuntu1/debian/rules	2010-06-28 10:38:07.364950890 +0200
@@ -12,7 +12,8 @@
 				-DCMAKE_EXE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \
 				-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
 				-DCMAKE_SKIP_RPATH:BOOL=ON
-	convert images/hisc-app-Sentinella.svgz -resize 32x32 sentinella.xpm
+	# Does not work on Ubuntu (See LP: #599248)
+	#convert images/hisc-app-Sentinella.svgz -resize 32x32 sentinella.xpm
 
 override_dh_install:
 	dh_install
diff -Nur /tmp/tmp.QYffADwetU/sentinella-0.6.2-1/debian/sentinella.install /tmp/tmp.QYffADwetU/sentinella-0.6.2-1ubuntu1/debian/sentinella.install
--- sentinella-0.6.2-1/debian/sentinella.install	2010-06-18 16:25:25.000000000 +0200
+++ sentinella-0.6.2-1ubuntu1/debian/sentinella.install	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-sentinella.xpm usr/share/pixmaps
diff -Nur /tmp/tmp.QYffADwetU/sentinella-0.6.2-1/debian/sentinella.menu /tmp/tmp.QYffADwetU/sentinella-0.6.2-1ubuntu1/debian/sentinella.menu
--- sentinella-0.6.2-1/debian/sentinella.menu	2010-06-18 16:25:26.000000000 +0200
+++ sentinella-0.6.2-1ubuntu1/debian/sentinella.menu	2010-06-28 10:38:18.396950387 +0200
@@ -1 +1 @@
-?package(sentinella):needs="X11" title="Sentinella" command="sentinella" section="Applications/System/Monitoring" icon="sentinella.xpm"
+?package(sentinella):needs="X11" title="Sentinella" command="sentinella" section="Applications/System/Monitoring"