← Back to branch summary

~ubuntu-branches/ubuntu/wily/psi/wily-proposed

« back to all changes in this revision

Viewing changes to debian/patches/debian-changes

  • Committer: Package Import Robot
  • Author(s): Jan Niehusmann
  • Date: 2012-04-06 18:21:48 UTC
  • mfrom: (6.1.6 sid)
  • Revision ID: package-import@ubuntu.com-20120406182148-pe5yvcbs7403tzlu
Tags: 0.14-3
http://bugs.debian.org/666161
http://bugs.debian.org/667332
http://bugs.debian.org/571657
http://bugs.debian.org/602335
http://bugs.debian.org/666161
* Fixed clean target (Closes: Bug#666161)
* Add missing include to fix build with gcc 4.7 (Closes: Bug#667332)
* Build-depend on libenchant-dev (Closes: Bug#571657)
* Updated manual page (new man page generated with help2man)
  (Closes: Bug#602335)
* Switch to dh build tool
* Fix clean target (Closes: Bug#666161)
* Set Standards-Version to 3.9.3

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/debian-changes
 
1
Subject: Debian patches for psi
 
2
Author: Jan Niehusmann <jan@debian.org>
 
3
 
 
4
Aggregated debian patches for psi.
 
5
As the psi package is maintained in Git, additionally maintaining patches
 
6
in separate files would be a lot of effort without significant gain.
 
7
 
 
8
--- psi-0.14.orig/iris/src/irisnet/corelib/netinterface_unix.cpp
 
9
+++ psi-0.14/iris/src/irisnet/corelib/netinterface_unix.cpp
 
10
@@ -33,6 +33,7 @@
 
11
 #include <net/route.h>
 
12
 #include <netinet/in.h>
 
13
 #include <errno.h>
 
14
+#include <unistd.h>
 
15
 
 
16
 // for solaris
 
17
 #ifndef SIOCGIFCONF
 
18
--- psi-0.14.orig/src/src.pro
 
19
+++ psi-0.14/src/src.pro
 
20
@@ -139,6 +139,7 @@ RESOURCES += ../psi.qrc ../iconsets.qrc
 
21
 
 
22
 # Platform specifics
 
23
 unix:!mac {
 
24
+       QMAKE_LFLAGS += -Wl,--as-needed
 
25
        QMAKE_POST_LINK = rm -f ../psi ; ln -s src/psi ../psi
 
26
 }
 
27
 win32 {
 
28
--- psi-0.14.orig/src/Certificates/CertificateDisplay.ui
 
29
+++ psi-0.14/src/Certificates/CertificateDisplay.ui
 
30
@@ -1,105 +1,118 @@
 
31
-<ui version="4.0" >
 
32
+<?xml version="1.0" encoding="UTF-8"?>
 
33
+<ui version="4.0">
 
34
  <class>CertificateDisplay</class>
 
35
- <widget class="QDialog" name="CertificateDisplay" >
 
36
-  <property name="geometry" >
 
37
+ <widget class="QDialog" name="CertificateDisplay">
 
38
+  <property name="geometry">
 
39
    <rect>
 
40
     <x>0</x>
 
41
     <y>0</y>
 
42
-    <width>518</width>
 
43
+    <width>525</width>
 
44
     <height>369</height>
 
45
    </rect>
 
46
   </property>
 
47
-  <property name="windowTitle" >
 
48
+  <property name="windowTitle">
 
49
    <string>Certificate Information</string>
 
50
   </property>
 
51
-  <layout class="QVBoxLayout" >
 
52
-   <property name="margin" >
 
53
-    <number>11</number>
 
54
-   </property>
 
55
-   <property name="spacing" >
 
56
+  <layout class="QVBoxLayout">
 
57
+   <property name="spacing">
 
58
     <number>6</number>
 
59
    </property>
 
60
+   <property name="margin">
 
61
+    <number>11</number>
 
62
+   </property>
 
63
    <item>
 
64
-    <layout class="QHBoxLayout" >
 
65
-     <property name="margin" >
 
66
-      <number>0</number>
 
67
-     </property>
 
68
-     <property name="spacing" >
 
69
+    <layout class="QHBoxLayout">
 
70
+     <property name="spacing">
 
71
       <number>6</number>
 
72
      </property>
 
73
+     <property name="margin">
 
74
+      <number>0</number>
 
75
+     </property>
 
76
      <item>
 
77
-      <layout class="QVBoxLayout" >
 
78
-       <property name="margin" >
 
79
-        <number>0</number>
 
80
-       </property>
 
81
-       <property name="spacing" >
 
82
+      <layout class="QVBoxLayout">
 
83
+       <property name="spacing">
 
84
         <number>6</number>
 
85
        </property>
 
86
+       <property name="margin">
 
87
+        <number>0</number>
 
88
+       </property>
 
89
        <item>
 
90
-        <widget class="QLabel" name="textLabel4" >
 
91
-         <property name="text" >
 
92
+        <widget class="QLabel" name="textLabel4">
 
93
+         <property name="text">
 
94
           <string>Certificate Validation:</string>
 
95
          </property>
 
96
         </widget>
 
97
        </item>
 
98
        <item>
 
99
-        <widget class="QLabel" name="lb_valid" >
 
100
-         <property name="text" >
 
101
+        <widget class="QLabel" name="lb_valid">
 
102
+         <property name="text">
 
103
           <string/>
 
104
          </property>
 
105
+         <property name="textFormat">
 
106
+          <enum>Qt::PlainText</enum>
 
107
+         </property>
 
108
         </widget>
 
109
        </item>
 
110
        <item>
 
111
-        <widget class="QLabel" name="textLabel2" >
 
112
-         <property name="text" >
 
113
+        <widget class="QLabel" name="textLabel2">
 
114
+         <property name="text">
 
115
           <string>Valid From:</string>
 
116
          </property>
 
117
         </widget>
 
118
        </item>
 
119
        <item>
 
120
-        <widget class="QLabel" name="lb_notBefore" >
 
121
-         <property name="text" >
 
122
+        <widget class="QLabel" name="lb_notBefore">
 
123
+         <property name="text">
 
124
           <string/>
 
125
          </property>
 
126
+         <property name="textFormat">
 
127
+          <enum>Qt::PlainText</enum>
 
128
+         </property>
 
129
         </widget>
 
130
        </item>
 
131
        <item>
 
132
-        <widget class="QLabel" name="textLabel3" >
 
133
-         <property name="text" >
 
134
+        <widget class="QLabel" name="textLabel3">
 
135
+         <property name="text">
 
136
           <string>Valid Until:</string>
 
137
          </property>
 
138
         </widget>
 
139
        </item>
 
140
        <item>
 
141
-        <widget class="QLabel" name="lb_notAfter" >
 
142
-         <property name="text" >
 
143
+        <widget class="QLabel" name="lb_notAfter">
 
144
+         <property name="text">
 
145
           <string/>
 
146
          </property>
 
147
+         <property name="textFormat">
 
148
+          <enum>Qt::PlainText</enum>
 
149
+         </property>
 
150
         </widget>
 
151
        </item>
 
152
        <item>
 
153
-        <widget class="QLabel" name="textLabel1" >
 
154
-         <property name="text" >
 
155
+        <widget class="QLabel" name="textLabel1">
 
156
+         <property name="text">
 
157
           <string>Serial Number:</string>
 
158
          </property>
 
159
         </widget>
 
160
        </item>
 
161
        <item>
 
162
-        <widget class="QLabel" name="lb_sn" >
 
163
-         <property name="text" >
 
164
+        <widget class="QLabel" name="lb_sn">
 
165
+         <property name="text">
 
166
           <string/>
 
167
          </property>
 
168
+         <property name="textFormat">
 
169
+          <enum>Qt::PlainText</enum>
 
170
+         </property>
 
171
         </widget>
 
172
        </item>
 
173
        <item>
 
174
         <spacer>
 
175
-         <property name="orientation" >
 
176
+         <property name="orientation">
 
177
           <enum>Qt::Vertical</enum>
 
178
          </property>
 
179
-         <property name="sizeType" >
 
180
+         <property name="sizeType">
 
181
           <enum>QSizePolicy::Expanding</enum>
 
182
          </property>
 
183
-         <property name="sizeHint" >
 
184
+         <property name="sizeHint" stdset="0">
 
185
           <size>
 
186
            <width>20</width>
 
187
            <height>106</height>
 
188
@@ -110,14 +123,14 @@
 
189
       </layout>
 
190
      </item>
 
191
      <item>
 
192
-      <widget class="QTextBrowser" name="tb_cert" >
 
193
-       <property name="minimumSize" >
 
194
+      <widget class="QTextBrowser" name="tb_cert">
 
195
+       <property name="minimumSize">
 
196
         <size>
 
197
          <width>350</width>
 
198
          <height>300</height>
 
199
         </size>
 
200
        </property>
 
201
-       <property name="horizontalScrollBarPolicy" >
 
202
+       <property name="horizontalScrollBarPolicy">
 
203
         <enum>Qt::ScrollBarAlwaysOff</enum>
 
204
        </property>
 
205
       </widget>
 
206
@@ -125,35 +138,35 @@
 
207
     </layout>
 
208
    </item>
 
209
    <item>
 
210
-    <widget class="Line" name="line1" >
 
211
-     <property name="frameShape" >
 
212
+    <widget class="Line" name="line1">
 
213
+     <property name="frameShape">
 
214
       <enum>QFrame::HLine</enum>
 
215
      </property>
 
216
-     <property name="frameShadow" >
 
217
+     <property name="frameShadow">
 
218
       <enum>QFrame::Sunken</enum>
 
219
      </property>
 
220
-     <property name="orientation" >
 
221
+     <property name="orientation">
 
222
       <enum>Qt::Horizontal</enum>
 
223
      </property>
 
224
     </widget>
 
225
    </item>
 
226
    <item>
 
227
-    <layout class="QHBoxLayout" >
 
228
-     <property name="margin" >
 
229
-      <number>0</number>
 
230
-     </property>
 
231
-     <property name="spacing" >
 
232
+    <layout class="QHBoxLayout">
 
233
+     <property name="spacing">
 
234
       <number>6</number>
 
235
      </property>
 
236
+     <property name="margin">
 
237
+      <number>0</number>
 
238
+     </property>
 
239
      <item>
 
240
       <spacer>
 
241
-       <property name="orientation" >
 
242
+       <property name="orientation">
 
243
         <enum>Qt::Horizontal</enum>
 
244
        </property>
 
245
-       <property name="sizeType" >
 
246
+       <property name="sizeType">
 
247
         <enum>QSizePolicy::Expanding</enum>
 
248
        </property>
 
249
-       <property name="sizeHint" >
 
250
+       <property name="sizeHint" stdset="0">
 
251
         <size>
 
252
          <width>421</width>
 
253
          <height>20</height>
 
254
@@ -162,11 +175,11 @@
 
255
       </spacer>
 
256
      </item>
 
257
      <item>
 
258
-      <widget class="QPushButton" native="1" name="pb_close">
 
259
-           <property name="text">
 
260
-                 <string>Close</string>
 
261
-               </property>
 
262
-         </widget>
 
263
+      <widget class="QPushButton" name="pb_close">
 
264
+       <property name="text">
 
265
+        <string>Close</string>
 
266
+       </property>
 
267
+      </widget>
 
268
      </item>
 
269
     </layout>
 
270
    </item>