diff -Nru keepassx-0.4.3/debian/changelog keepassx-0.4.3/debian/changelog
--- keepassx-0.4.3/debian/changelog	2012-04-07 17:17:45.000000000 +0100
+++ keepassx-0.4.3/debian/changelog	2012-12-30 17:58:25.000000000 +0000
@@ -1,3 +1,11 @@
+keepassx (0.4.3-2ubuntu1) raring; urgency=low
+
+  * Merge from Debian unstable. (LP: #1094568) Remaining changes:
+    - Add check_systray_available.diff
+    - Disable the tray icon when running on Unity. (LP: #842224)
+
+ -- Alessandro Losavio <alessandro.losavio@yahoo.com>  Sun, 30 Dec 2012 09:39:20 +0000
+
 keepassx (0.4.3-2) unstable; urgency=low
 
   * Fix FTBFS with gcc 4.7. (Closes: #667224)
@@ -13,6 +21,30 @@
 
  -- Felix Geyer <debfx-pkg@fobos.de>  Thu, 05 Apr 2012 13:10:22 +0200
 
+keepassx (0.4.3-1ubuntu3) quantal; urgency=low
+
+  * import fix_ftbfs_gcc47.diff from debian
+
+ -- Julian Taylor <jtaylor@ubuntu.com>  Fri, 14 Sep 2012 20:00:08 +0200
+
+keepassx (0.4.3-1ubuntu2) precise; urgency=low
+
+  * Build-depend on libmagickcore-extra instead of librsvg2-bin so imagemagick
+    correctly renders svg images. (LP: #979340)
+  * Disable the tray icon when running on Unity. (LP: #842224)
+
+ -- Felix Geyer <debfx@ubuntu.com>  Mon, 16 Apr 2012 12:14:22 +0200
+
+keepassx (0.4.3-1ubuntu1) natty; urgency=low
+
+  * Install application icon in various resolutions. (LP: #501966)
+    - Add debian/keepassx.svg
+    - Build-depend on imagemagick and librsvg2-bin.
+  * Check if the systray is available before using it.
+    - Add check_systray_available.diff
+
+ -- Felix Geyer <debfx-pkg@fobos.de>  Sat, 23 Apr 2011 00:31:42 +0200
+
 keepassx (0.4.3-1) unstable; urgency=low
 
   * New upstream release. (Closes: #572614)
diff -Nru keepassx-0.4.3/debian/control keepassx-0.4.3/debian/control
--- keepassx-0.4.3/debian/control	2012-04-07 17:14:51.000000000 +0100
+++ keepassx-0.4.3/debian/control	2012-12-30 10:23:18.000000000 +0000
@@ -1,7 +1,8 @@
 Source: keepassx
 Section: utils
 Priority: optional
-Maintainer: Reinhard Tartler <siretart@tauware.de>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Reinhard Tartler <siretart@tauware.de>
 Uploaders: David Valot <ptitdav69@gmail.com>,
            Felix Geyer <debfx-pkg@fobos.de>
 Build-Depends: debhelper (>= 9),
diff -Nru keepassx-0.4.3/debian/patches/check_systray_available.diff keepassx-0.4.3/debian/patches/check_systray_available.diff
--- keepassx-0.4.3/debian/patches/check_systray_available.diff	1970-01-01 01:00:00.000000000 +0100
+++ keepassx-0.4.3/debian/patches/check_systray_available.diff	2012-04-15 21:18:03.000000000 +0100
@@ -0,0 +1,40 @@
+Description: Check if the systray is available before using it.
+Author: Felix Geyer <debfx-pkg@fobos.de>
+
+--- keepassx-0.4.3.orig/src/KpxConfig.h
++++ keepassx-0.4.3/src/KpxConfig.h
+@@ -35,6 +35,8 @@
+ #	define DEFAULT_MOUNT_DIR QString()
+ #endif
+ 
++#include <QSystemTrayIcon>
++
+ class KpxConfig{
+ public:
+ 	friend class KpxBookmarks;
+@@ -98,7 +100,11 @@ public:
+ 	bool lockOnInactivity(){return settings.value("Options/LockOnInactivity",false).toBool();}
+ 	int lockAfterSec(){return settings.value("Options/LockAfterSec",30).toInt();}
+ 	bool showStatusbar(){return settings.value("UI/ShowStatusbar",true).toBool();}
+-	bool showSysTrayIcon(){return settings.value("Options/ShowSysTrayIcon",false).toBool();}
++	bool showSysTrayIcon(){
++		return QSystemTrayIcon::isSystemTrayAvailable() &&
++		qgetenv("XDG_CURRENT_DESKTOP") != "Unity" &&
++		settings.value("Options/ShowSysTrayIcon",false).toBool();
++	}
+ 	bool showToolbar(){return settings.value("UI/ShowToolbar",true).toBool();}
+ 	int toolbarIconSize(){return settings.value("UI/ToolbarIconSize",16).toInt();}
+ 	QString urlCmd(){return settings.value("Options/UrlCmd").toString();}
+--- keepassx-0.4.3.orig/src/dialogs/SettingsDlg.cpp
++++ keepassx-0.4.3/src/dialogs/SettingsDlg.cpp
+@@ -79,6 +79,10 @@ CSettingsDlg::CSettingsDlg(QWidget* pare
+ 	connect(this,SIGNAL(rejected()),SLOT(resetGlobalShortcut()));
+ #endif
+ 	
++	if (!QSystemTrayIcon::isSystemTrayAvailable() || qgetenv("XDG_CURRENT_DESKTOP") == "Unity") {
++		CheckBox_ShowSysTrayIcon->setEnabled(false);
++	}
++	
+ 	listWidget->setCurrentRow(0);
+ 
+ 	//General (1)
diff -Nru keepassx-0.4.3/debian/patches/series keepassx-0.4.3/debian/patches/series
--- keepassx-0.4.3/debian/patches/series	2012-04-07 17:14:51.000000000 +0100
+++ keepassx-0.4.3/debian/patches/series	2012-12-30 09:34:02.000000000 +0000
@@ -1 +1,2 @@
+check_systray_available.diff
 fix_ftbfs_gcc47.diff