diff -u psi-0.12/debian/changelog psi-0.12/debian/changelog
--- psi-0.12/debian/changelog
+++ psi-0.12/debian/changelog
@@ -1,3 +1,9 @@
+psi (0.12-2ubuntu1) jaunty; urgency=low
+
+  * Fix psi to work with QT 4.5 (patch from mainstream) 
+
+ -- Krzysztof Klimonda <kklimonda@syntaxhighlighted.com>  Fri, 17 Apr 2009 16:48:00 +0200
+
 psi (0.12-2) unstable; urgency=low
 
   * Uploading to unstable (Closes: Bug#494352)
diff -u psi-0.12/debian/control psi-0.12/debian/control
--- psi-0.12/debian/control
+++ psi-0.12/debian/control
@@ -1,7 +1,8 @@
 Source: psi
 Section: net
 Priority: optional
-Maintainer: Jan Niehusmann <jan@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Jan Niehusmann <jan@debian.org>
 Build-Depends: debhelper (>= 5.0.51), libqt4-dev (>= 4.2.3), libqca2-dev (>= 2.0.0), libxss-dev, libaspell-dev, zlib1g-dev, libsm-dev
 Build-Conflicts: libqt4-dev (= 4.4.0~rc1-3)
 Standards-Version: 3.8.0
only in patch2:
unchanged:
--- psi-0.12.orig/src/main.cpp
+++ psi-0.12/src/main.cpp
@@ -274,9 +274,9 @@
 
 int main(int argc, char *argv[])
 {
+	PsiApplication app(argc, argv);
 	// it must be initialized first in order for ApplicationInfo::resourcesDir() to work
 	QCA::Initializer init;
-	PsiApplication app(argc, argv);
 	QApplication::addLibraryPath(ApplicationInfo::resourcesDir());
 	QApplication::addLibraryPath(ApplicationInfo::homeDir());
 	QApplication::setQuitOnLastWindowClosed(false);
only in patch2:
unchanged:
--- psi-0.12.orig/src/options/ui_options.ui
+++ psi-0.12/src/options/ui_options.ui
@@ -77,25 +77,8 @@
         </widget>
        </item>
        <item>
-        <widget class="Q3WidgetStack" name="ws_tabs" >
-         <property name="sizePolicy" >
-          <sizepolicy>
-           <hsizetype>7</hsizetype>
-           <vsizetype>3</vsizetype>
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <widget class="QWidget" name="WStackPage" >
-          <property name="geometry" >
-           <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>268</width>
-            <height>201</height>
-           </rect>
-          </property>
-         </widget>
+        <widget class="QStackedWidget" name="ws_tabs">
+         <widget class="QWidget" name="WStackPage"/>
         </widget>
        </item>
       </layout>
@@ -177,9 +160,6 @@
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
   <customwidget>
-   <class>Q3WidgetStack</class>
-   <extends>Q3WidgetStack</extends>
-   <header>q3widgetstack.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
only in patch2:
unchanged:
--- psi-0.12.orig/src/options/optionsdlg.cpp
+++ psi-0.12/src/options/optionsdlg.cpp
@@ -466,7 +466,7 @@
 		}
 	}
 
-	dlg->ws_tabs->raiseWidget( tab );
+	dlg->ws_tabs->setCurrentWidget( tab );
 
 	// and select item in lv_tabs...
 	Q3ListViewItemIterator it( dlg->lv_tabs );
only in patch2:
unchanged:
--- psi-0.12.orig/.pc/.version
+++ psi-0.12/.pc/.version
@@ -0,0 +1 @@
+2
only in patch2:
unchanged:
--- psi-0.12.orig/debian/patches/20_qt4.5_chat_hang.patch
+++ psi-0.12/debian/patches/20_qt4.5_chat_hang.patch
@@ -0,0 +1,64 @@
+--- psi-0.12.orig/src/main.cpp
++++ psi-0.12/src/main.cpp
+@@ -274,9 +274,9 @@
+ 
+ int main(int argc, char *argv[])
+ {
++	PsiApplication app(argc, argv);
+ 	// it must be initialized first in order for ApplicationInfo::resourcesDir() to work
+ 	QCA::Initializer init;
+-	PsiApplication app(argc, argv);
+ 	QApplication::addLibraryPath(ApplicationInfo::resourcesDir());
+ 	QApplication::addLibraryPath(ApplicationInfo::homeDir());
+ 	QApplication::setQuitOnLastWindowClosed(false);
+--- psi-0.12.orig/src/options/optionsdlg.cpp
++++ psi-0.12/src/options/optionsdlg.cpp
+@@ -466,7 +466,7 @@
+ 		}
+ 	}
+ 
+-	dlg->ws_tabs->raiseWidget( tab );
++	dlg->ws_tabs->setCurrentWidget( tab );
+ 
+ 	// and select item in lv_tabs...
+ 	Q3ListViewItemIterator it( dlg->lv_tabs );
+--- psi-0.12.orig/src/options/ui_options.ui
++++ psi-0.12/src/options/ui_options.ui
+@@ -77,25 +77,8 @@
+         </widget>
+        </item>
+        <item>
+-        <widget class="Q3WidgetStack" name="ws_tabs" >
+-         <property name="sizePolicy" >
+-          <sizepolicy>
+-           <hsizetype>7</hsizetype>
+-           <vsizetype>3</vsizetype>
+-           <horstretch>0</horstretch>
+-           <verstretch>0</verstretch>
+-          </sizepolicy>
+-         </property>
+-         <widget class="QWidget" name="WStackPage" >
+-          <property name="geometry" >
+-           <rect>
+-            <x>0</x>
+-            <y>0</y>
+-            <width>268</width>
+-            <height>201</height>
+-           </rect>
+-          </property>
+-         </widget>
++        <widget class="QStackedWidget" name="ws_tabs">
++         <widget class="QWidget" name="WStackPage"/>
+         </widget>
+        </item>
+       </layout>
+@@ -177,9 +160,6 @@
+  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+  <customwidgets>
+   <customwidget>
+-   <class>Q3WidgetStack</class>
+-   <extends>Q3WidgetStack</extends>
+-   <header>q3widgetstack.h</header>
+    <container>1</container>
+   </customwidget>
+   <customwidget>
only in patch2:
unchanged:
--- psi-0.12.orig/debian/patches/series
+++ psi-0.12/debian/patches/series
@@ -0,0 +1 @@
+20_qt4.5_chat_hang.patch