]>
Commit | Line | Data |
---|---|---|
7c2c9caa JB |
1 | --- dnssec-tools-1.14/validator/apps/dnssec-check/mainwindow.cpp.orig 2012-06-21 22:10:13.000000000 +0200 |
2 | +++ dnssec-tools-1.14/validator/apps/dnssec-check/mainwindow.cpp 2012-06-25 21:15:43.352058436 +0200 | |
2c9b260d JB |
3 | @@ -372,7 +372,6 @@ |
4 | } | |
5 | ||
6 | accessURL.addQueryItem("locationDescription", locationDescription); | |
7c2c9caa | 7 | - accessURL.addQueryItem("1.14"); |
2c9b260d JB |
8 | |
9 | if (!m_manager) { | |
10 | m_manager = new QNetworkAccessManager(); | |
11 | --- dnssec-tools-1.13/validator/apps/dnssec-check/qmlapplicationviewer/qmlapplicationviewer.pri.orig 2012-02-04 01:50:50.000000000 +0100 | |
12 | +++ dnssec-tools-1.13/validator/apps/dnssec-check/qmlapplicationviewer/qmlapplicationviewer.pri 2012-06-27 19:03:22.065139970 +0200 | |
13 | @@ -113,7 +113,7 @@ | |
14 | QMAKE_EXTRA_TARGETS += first copydeploymentfolders | |
15 | } | |
16 | } | |
17 | - installPrefix = /opt/$${TARGET} | |
18 | + installPrefix = /usr | |
19 | for(deploymentfolder, DEPLOYMENTFOLDERS) { | |
20 | item = item$${deploymentfolder} | |
21 | itemfiles = $${item}.files | |
7c2c9caa JB |
22 | --- dnssec-tools-1.14/validator/apps/dnssec-nodes/dnssec-nodes.pro.orig 2012-10-11 22:53:36.000000000 +0200 |
23 | +++ dnssec-tools-1.14/validator/apps/dnssec-nodes/dnssec-nodes.pro 2012-10-18 20:46:17.519926918 +0200 | |
2c9b260d JB |
24 | @@ -1,3 +1,4 @@ |
25 | +PREFIX=/usr | |
26 | HEADERS += \ | |
27 | edge.h \ | |
28 | node.h \ | |
7c2c9caa | 29 | @@ -61,7 +62,7 @@ |
2c9b260d | 30 | isEmpty(ANDROID_PLATFORM) { |
7c2c9caa JB |
31 | QMAKE_LIBDIR += ../../libval/.libs |
32 | QMAKE_LIBDIR += ../../libsres/.libs | |
2c9b260d | 33 | - LIBS += -lval-threads -lsres -lnsl -lcrypto -lpthread |
7c2c9caa | 34 | + LIBS += -lval-threads -lsres -lcrypto -lpthread |
2c9b260d JB |
35 | maemo5 { |
36 | INCLUDEPATH += /opt/maemo/usr/include/ | |
37 | } | |
7c2c9caa | 38 | @@ -75,8 +76,6 @@ |
2c9b260d JB |
39 | # path to the harmattan libraries |
40 | contains(MEEGO_EDITION,harmattan): { | |
41 | LIBS += -L/scratchbox/users/hardaker/targets/HARMATTAN_ARMEL/usr/lib | |
42 | -} else { | |
43 | - LIBS += -L/usr/local/lib | |
44 | } | |
45 | ||
46 | QT += network | |
47 | --- dnssec-tools-1.13/validator/apps/dnssec-system-tray/dnssec-system-tray.pro.orig 2011-10-25 22:45:08.000000000 +0200 | |
48 | +++ dnssec-tools-1.13/validator/apps/dnssec-system-tray/dnssec-system-tray.pro 2012-06-30 12:17:05.175285379 +0200 | |
49 | @@ -1,3 +1,4 @@ | |
50 | +PREFIX=/usr | |
51 | TARGET=dnssec-system-tray | |
52 | ||
53 | HEADERS = dnssec-system-tray.h \ | |
54 | --- dnssec-tools-1.13/validator/apps/lookup/src/src.pro.orig 2012-06-21 22:02:39.000000000 +0200 | |
55 | +++ dnssec-tools-1.13/validator/apps/lookup/src/src.pro 2012-06-26 18:43:52.315481592 +0200 | |
56 | @@ -11,7 +11,7 @@ | |
57 | INCLUDEPATH += /home/hardaker/src/dnssec/dnssec-tools.git/dnssec-tools/validator/include | |
58 | ||
59 | isEmpty(ANDROID_PLATFORM) { | |
60 | - LIBS += -lval-threads -lsres -lnsl -lcrypto -lpthread | |
61 | + LIBS += -L../../../libval/.libs -L../../../libsres/.libs -lval-threads -lsres -lcrypto -lpthread | |
62 | } else { | |
63 | LIBS += -L/opt/android-external-openssl/lib/ | |
64 | LIBS += -L/root/necessitas/android-ndk-r5c/platforms/android-4/arch-arm/usr/lib/ | |
65 | @@ -63,7 +63,7 @@ | |
66 | unix { | |
67 | #VARIABLES | |
68 | isEmpty(PREFIX) { | |
69 | - PREFIX = /usr/local | |
70 | + PREFIX = /usr | |
71 | } | |
72 | ||
73 | BINDIR = $$PREFIX/bin | |
74 | @@ -77,13 +77,13 @@ | |
75 | ||
76 | target.path =$$BINDIR | |
77 | ||
78 | - desktop.path = $$DATADIR/applications/hildon | |
79 | + desktop.path = $$DATADIR/applications | |
80 | desktop.files += $${TARGET}.desktop | |
81 | ||
82 | service.path = $$DATADIR/dbus-1/services | |
83 | service.files += $${TARGET}.service | |
84 | ||
85 | - iconxpm.path = $$DATADIR/pixmap | |
86 | + iconxpm.path = $$DATADIR/pixmaps | |
87 | iconxpm.files += ../data/maemo/$${TARGET}.xpm | |
88 | ||
89 | icon26.path = $$DATADIR/icons/hicolor/26x26/apps |