diff -u signon-8.56+14.04.20140307/debian/changelog signon-8.56+14.04.20140307/debian/changelog
--- signon-8.56+14.04.20140307/debian/changelog
+++ signon-8.56+14.04.20140307/debian/changelog
@@ -1,3 +1,9 @@
+signon (8.56+14.04.20140307-0ubuntu2) trusty; urgency=medium
+
+  * In debian/rules move qt4 cmake files to not clash with qt5 cmake files
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 16 Mar 2014 19:35:02 +0000
+
 signon (8.56+14.04.20140307-0ubuntu1) trusty; urgency=medium
 
   [ Alberto Mardegan ]
diff -u signon-8.56+14.04.20140307/debian/libsignon-qt-dev.install signon-8.56+14.04.20140307/debian/libsignon-qt-dev.install
--- signon-8.56+14.04.20140307/debian/libsignon-qt-dev.install
+++ signon-8.56+14.04.20140307/debian/libsignon-qt-dev.install
@@ -1,4 +1,4 @@
-usr/lib/cmake
+usr/lib/cmake/SignOnQt4/
 usr/lib/libsignon-qt.so
 usr/lib/pkgconfig/libsignon-qt.pc
 usr/include/signon-qt/SignOn/*
diff -u signon-8.56+14.04.20140307/debian/libsignon-qt5-dev.install signon-8.56+14.04.20140307/debian/libsignon-qt5-dev.install
--- signon-8.56+14.04.20140307/debian/libsignon-qt5-dev.install
+++ signon-8.56+14.04.20140307/debian/libsignon-qt5-dev.install
@@ -1,4 +1,4 @@
-usr/lib/cmake
+usr/lib/cmake/SignOnQt/
 usr/lib/libsignon-qt5.so
 usr/lib/pkgconfig/libsignon-qt5.pc
 usr/include/signon-qt5/SignOn/*
diff -u signon-8.56+14.04.20140307/debian/rules signon-8.56+14.04.20140307/debian/rules
--- signon-8.56+14.04.20140307/debian/rules
+++ signon-8.56+14.04.20140307/debian/rules
@@ -32,6 +32,9 @@
 override_dh_auto_install:
 	dh_auto_install -Bbuild/qt4 -plibsignon-qt1
 	dh_auto_install -Bbuild/qt4 -plibsignon-qt-dev
+	mv debian/tmp/usr/lib/cmake/SignOnQt debian/tmp/usr/lib/cmake/SignOnQt4
+	mv debian/tmp/usr/lib/cmake/SignOnQt4/SignOnQtConfig.cmake debian/tmp/usr/lib/cmake/SignOnQt4/SignOnQt4Config.cmake
+	mv debian/tmp/usr/lib/cmake/SignOnQt4/SignOnQtConfigVersion.cmake debian/tmp/usr/lib/cmake/SignOnQt4/SignOnQt4ConfigVersion.cmake
 	dh_auto_install -Bbuild/qt5
 
 override_dh_install:
only in patch2:
unchanged:
--- signon-8.56+14.04.20140307.orig/src/signond/backupifadaptor.cpp
+++ signon-8.56+14.04.20140307/src/signond/backupifadaptor.cpp
@@ -0,0 +1,67 @@
+/*
+ * This file was generated by qdbusxml2cpp version 0.8
+ * Command line was: qdbusxml2cpp -c BackupIfAdaptor -a backupifadaptor.h:backupifadaptor.cpp ../../lib/signond/com.nokia.SingleSignOn.Backup.xml
+ *
+ * qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+ *
+ * This is an auto-generated file.
+ * Do not edit! All changes made to it will be lost.
+ */
+
+#include "backupifadaptor.h"
+#include <QtCore/QMetaObject>
+#include <QtCore/QByteArray>
+#include <QtCore/QList>
+#include <QtCore/QMap>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QVariant>
+
+/*
+ * Implementation of adaptor class BackupIfAdaptor
+ */
+
+BackupIfAdaptor::BackupIfAdaptor(QObject *parent)
+    : QDBusAbstractAdaptor(parent)
+{
+    // constructor
+    setAutoRelaySignals(true);
+}
+
+BackupIfAdaptor::~BackupIfAdaptor()
+{
+    // destructor
+}
+
+uchar BackupIfAdaptor::backupFinished()
+{
+    // handle method call com.nokia.backupclient.backupFinished
+    uchar out0;
+    QMetaObject::invokeMethod(parent(), "backupFinished", Q_RETURN_ARG(uchar, out0));
+    return out0;
+}
+
+uchar BackupIfAdaptor::backupStarts()
+{
+    // handle method call com.nokia.backupclient.backupStarts
+    uchar out0;
+    QMetaObject::invokeMethod(parent(), "backupStarts", Q_RETURN_ARG(uchar, out0));
+    return out0;
+}
+
+uchar BackupIfAdaptor::restoreFinished()
+{
+    // handle method call com.nokia.backupclient.restoreFinished
+    uchar out0;
+    QMetaObject::invokeMethod(parent(), "restoreFinished", Q_RETURN_ARG(uchar, out0));
+    return out0;
+}
+
+uchar BackupIfAdaptor::restoreStarts()
+{
+    // handle method call com.nokia.backupclient.restoreStarts
+    uchar out0;
+    QMetaObject::invokeMethod(parent(), "restoreStarts", Q_RETURN_ARG(uchar, out0));
+    return out0;
+}
+
only in patch2:
unchanged:
--- signon-8.56+14.04.20140307.orig/src/signond/backupifadaptor.h
+++ signon-8.56+14.04.20140307/src/signond/backupifadaptor.h
@@ -0,0 +1,62 @@
+/*
+ * This file was generated by qdbusxml2cpp version 0.8
+ * Command line was: qdbusxml2cpp -c BackupIfAdaptor -a backupifadaptor.h:backupifadaptor.cpp ../../lib/signond/com.nokia.SingleSignOn.Backup.xml
+ *
+ * qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+ *
+ * This is an auto-generated file.
+ * This file may have been hand-edited. Look for HAND-EDIT comments
+ * before re-generating it.
+ */
+
+#ifndef BACKUPIFADAPTOR_H_1394988953
+#define BACKUPIFADAPTOR_H_1394988953
+
+#include <QtCore/QObject>
+#include <QtDBus/QtDBus>
+QT_BEGIN_NAMESPACE
+class QByteArray;
+template<class T> class QList;
+template<class Key, class Value> class QMap;
+class QString;
+class QStringList;
+class QVariant;
+QT_END_NAMESPACE
+
+/*
+ * Adaptor class for interface com.nokia.backupclient
+ */
+class BackupIfAdaptor: public QDBusAbstractAdaptor
+{
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", "com.nokia.backupclient")
+    Q_CLASSINFO("D-Bus Introspection", ""
+"  <interface name=\"com.nokia.backupclient\">\n"
+"    <method name=\"backupStarts\">\n"
+"      <arg direction=\"out\" type=\"y\"/>\n"
+"    </method>\n"
+"    <method name=\"backupFinished\">\n"
+"      <arg direction=\"out\" type=\"y\"/>\n"
+"    </method>\n"
+"    <method name=\"restoreStarts\">\n"
+"      <arg direction=\"out\" type=\"y\"/>\n"
+"    </method>\n"
+"    <method name=\"restoreFinished\">\n"
+"      <arg direction=\"out\" type=\"y\"/>\n"
+"    </method>\n"
+"  </interface>\n"
+        "")
+public:
+    BackupIfAdaptor(QObject *parent);
+    virtual ~BackupIfAdaptor();
+
+public: // PROPERTIES
+public Q_SLOTS: // METHODS
+    uchar backupFinished();
+    uchar backupStarts();
+    uchar restoreFinished();
+    uchar restoreStarts();
+Q_SIGNALS: // SIGNALS
+};
+
+#endif