Subject: Debian patches for psi
Author: Jan Niehusmann <jan@debian.org>

Aggregated debian patches for psi.
As the psi package is maintained in Git, additionally maintaining patches
in separate files would be a lot of effort without significant gain.

--- psi-1.3.orig/configure
+++ psi-1.3/configure
@@ -2145,7 +2145,7 @@ public:
 
 	QString checkString() const
 	{
-		return "Generating .prl files ...";
+		return "Generating .prl files ...!";
 	}
 
 	QString resultString() const
@@ -2162,6 +2162,7 @@ public:
 
 		if(!writeConf())
 		{
+			printf("writeConf failed");
 			success = false;
 			return false;
 		}
@@ -2173,6 +2174,7 @@ public:
 		args += fi.dir().filePath(qc_getenv("QC_PROFILE"));
 		if(conf->doCommand(conf->qmake_path, args) != 0)
 		{
+			printf("Error running %s\n",qPrintable(conf->qmake_path));
 			success = false;
 			return false;
 		}
--- psi-1.3.orig/iris/common.pri
+++ psi-1.3/iris/common.pri
@@ -20,3 +20,8 @@ greaterThan(QT_MAJOR_VERSION, 4) {
 	# don't build iris, app will include iris.pri
 	#CONFIG += iris_bundle
 }
+
+QMAKE_CXXFLAGS += $(Q_CXXFLAGS)
+QMAKE_CFLAGS_DEBUG += $(Q_CFLAGS)
+QMAKE_CFLAGS_RELEASE += $(Q_CFLAGS)
+QMAKE_LFLAGS += $(Q_LDFLAGS)
--- psi-1.3.orig/qcm/recursiveprl.qcm
+++ psi-1.3/qcm/recursiveprl.qcm
@@ -18,7 +18,7 @@ public:
 
 	QString checkString() const
 	{
-		return "Generating .prl files ...";
+		return "Generating .prl files ...11";
 	}
 
 	QString resultString() const
@@ -26,7 +26,7 @@ public:
 		if(success)
 			return "ok";
 		else
-			return "fail";
+			return "fail :-(";
 	}
 
 	bool exec()
@@ -35,6 +35,7 @@ public:
 
 		if(!writeConf())
 		{
+			printf("writeConf failed");
 			success = false;
 			return false;
 		}
@@ -46,6 +47,7 @@ public:
 		args += fi.dir().filePath(qc_getenv("QC_PROFILE"));
 		if(conf->doCommand(conf->qmake_path, args) != 0)
 		{
+                        printf("Error running %s",qPrintable(conf->qmake_path));
 			success = false;
 			return false;
 		}
--- psi-1.3.orig/src/accountmanagedlg.cpp
+++ psi-1.3/src/accountmanagedlg.cpp
@@ -28,6 +28,7 @@
 #include <QTimer>
 #include <QHeaderView>
 #include <QDropEvent>
+#include <QButtonGroup>
 
 #include "psicon.h"
 #include "psiaccount.h"
--- psi-1.3.orig/src/src.pro
+++ psi-1.3/src/src.pro
@@ -161,6 +161,13 @@ QMAKE_CLEAN += $$OPTIONS_TRANSLATIONS_FI
 RESOURCES += ../psi.qrc ../iconsets.qrc
 
 # Platform specifics
+unix:!mac {
+	QMAKE_POST_LINK = rm -f ../psi ; ln -s src/psi ../psi
+	QMAKE_CXXFLAGS += $(Q_CXXFLAGS)
+	QMAKE_CFLAGS_DEBUG += $(Q_CFLAGS)
+	QMAKE_CFLAGS_RELEASE += $(Q_CFLAGS)
+	QMAKE_LFLAGS += $(Q_LDFLAGS)
+}
 windows {
     RC_ICONS = ../win32/app.ico
 	VERSION = $$PSI_VERSION
