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-0.14.orig/iris/src/irisnet/corelib/netinterface_unix.cpp
+++ psi-0.14/iris/src/irisnet/corelib/netinterface_unix.cpp
@@ -33,6 +33,7 @@
 #include <net/route.h>
 #include <netinet/in.h>
 #include <errno.h>
+#include <unistd.h>
 
 // for solaris
 #ifndef SIOCGIFCONF
--- psi-0.14.orig/src/src.pro
+++ psi-0.14/src/src.pro
@@ -139,6 +139,7 @@ RESOURCES += ../psi.qrc ../iconsets.qrc
 
 # Platform specifics
 unix:!mac {
+	QMAKE_LFLAGS += -Wl,--as-needed
 	QMAKE_POST_LINK = rm -f ../psi ; ln -s src/psi ../psi
 }
 win32 {
--- psi-0.14.orig/src/Certificates/CertificateDisplay.ui
+++ psi-0.14/src/Certificates/CertificateDisplay.ui
@@ -1,105 +1,118 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>CertificateDisplay</class>
- <widget class="QDialog" name="CertificateDisplay" >
-  <property name="geometry" >
+ <widget class="QDialog" name="CertificateDisplay">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>518</width>
+    <width>525</width>
     <height>369</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Certificate Information</string>
   </property>
-  <layout class="QVBoxLayout" >
-   <property name="margin" >
-    <number>11</number>
-   </property>
-   <property name="spacing" >
+  <layout class="QVBoxLayout">
+   <property name="spacing">
     <number>6</number>
    </property>
+   <property name="margin">
+    <number>11</number>
+   </property>
    <item>
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
-     </property>
-     <property name="spacing" >
+    <layout class="QHBoxLayout">
+     <property name="spacing">
       <number>6</number>
      </property>
+     <property name="margin">
+      <number>0</number>
+     </property>
      <item>
-      <layout class="QVBoxLayout" >
-       <property name="margin" >
-        <number>0</number>
-       </property>
-       <property name="spacing" >
+      <layout class="QVBoxLayout">
+       <property name="spacing">
         <number>6</number>
        </property>
+       <property name="margin">
+        <number>0</number>
+       </property>
        <item>
-        <widget class="QLabel" name="textLabel4" >
-         <property name="text" >
+        <widget class="QLabel" name="textLabel4">
+         <property name="text">
           <string>Certificate Validation:</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QLabel" name="lb_valid" >
-         <property name="text" >
+        <widget class="QLabel" name="lb_valid">
+         <property name="text">
           <string/>
          </property>
+         <property name="textFormat">
+          <enum>Qt::PlainText</enum>
+         </property>
         </widget>
        </item>
        <item>
-        <widget class="QLabel" name="textLabel2" >
-         <property name="text" >
+        <widget class="QLabel" name="textLabel2">
+         <property name="text">
           <string>Valid From:</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QLabel" name="lb_notBefore" >
-         <property name="text" >
+        <widget class="QLabel" name="lb_notBefore">
+         <property name="text">
           <string/>
          </property>
+         <property name="textFormat">
+          <enum>Qt::PlainText</enum>
+         </property>
         </widget>
        </item>
        <item>
-        <widget class="QLabel" name="textLabel3" >
-         <property name="text" >
+        <widget class="QLabel" name="textLabel3">
+         <property name="text">
           <string>Valid Until:</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QLabel" name="lb_notAfter" >
-         <property name="text" >
+        <widget class="QLabel" name="lb_notAfter">
+         <property name="text">
           <string/>
          </property>
+         <property name="textFormat">
+          <enum>Qt::PlainText</enum>
+         </property>
         </widget>
        </item>
        <item>
-        <widget class="QLabel" name="textLabel1" >
-         <property name="text" >
+        <widget class="QLabel" name="textLabel1">
+         <property name="text">
           <string>Serial Number:</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QLabel" name="lb_sn" >
-         <property name="text" >
+        <widget class="QLabel" name="lb_sn">
+         <property name="text">
           <string/>
          </property>
+         <property name="textFormat">
+          <enum>Qt::PlainText</enum>
+         </property>
         </widget>
        </item>
        <item>
         <spacer>
-         <property name="orientation" >
+         <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
-         <property name="sizeType" >
+         <property name="sizeType">
           <enum>QSizePolicy::Expanding</enum>
          </property>
-         <property name="sizeHint" >
+         <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>106</height>
@@ -110,14 +123,14 @@
       </layout>
      </item>
      <item>
-      <widget class="QTextBrowser" name="tb_cert" >
-       <property name="minimumSize" >
+      <widget class="QTextBrowser" name="tb_cert">
+       <property name="minimumSize">
         <size>
          <width>350</width>
          <height>300</height>
         </size>
        </property>
-       <property name="horizontalScrollBarPolicy" >
+       <property name="horizontalScrollBarPolicy">
         <enum>Qt::ScrollBarAlwaysOff</enum>
        </property>
       </widget>
@@ -125,35 +138,35 @@
     </layout>
    </item>
    <item>
-    <widget class="Line" name="line1" >
-     <property name="frameShape" >
+    <widget class="Line" name="line1">
+     <property name="frameShape">
       <enum>QFrame::HLine</enum>
      </property>
-     <property name="frameShadow" >
+     <property name="frameShadow">
       <enum>QFrame::Sunken</enum>
      </property>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
     </widget>
    </item>
    <item>
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
-     </property>
-     <property name="spacing" >
+    <layout class="QHBoxLayout">
+     <property name="spacing">
       <number>6</number>
      </property>
+     <property name="margin">
+      <number>0</number>
+     </property>
      <item>
       <spacer>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeType" >
+       <property name="sizeType">
         <enum>QSizePolicy::Expanding</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>421</width>
          <height>20</height>
@@ -162,11 +175,11 @@
       </spacer>
      </item>
      <item>
-      <widget class="QPushButton" native="1" name="pb_close">
-	    <property name="text">
-		  <string>Close</string>
-		</property>
-	  </widget>
+      <widget class="QPushButton" name="pb_close">
+       <property name="text">
+        <string>Close</string>
+       </property>
+      </widget>
      </item>
     </layout>
    </item>
