- release 2 (by relup.sh)

[packages/dnssec-tools.git] / dnssec-tools-qt.patch

--- dnssec-tools-1.13/validator/apps/dnssec-check/qmlapplicationviewer/qmlapplicationviewer.pri.orig	2012-02-04 01:50:50.000000000 +0100
+++ dnssec-tools-1.13/validator/apps/dnssec-check/qmlapplicationviewer/qmlapplicationviewer.pri	2012-06-27 19:03:22.065139970 +0200
@@ -113,7 +113,7 @@
             QMAKE_EXTRA_TARGETS += first copydeploymentfolders
         }
     }
-    installPrefix = /opt/$${TARGET}
+    installPrefix = /usr
     for(deploymentfolder, DEPLOYMENTFOLDERS) {
         item = item$${deploymentfolder}
         itemfiles = $${item}.files
--- dnssec-tools-1.14/validator/apps/dnssec-nodes/dnssec-nodes.pro.orig	2012-10-11 22:53:36.000000000 +0200
+++ dnssec-tools-1.14/validator/apps/dnssec-nodes/dnssec-nodes.pro	2012-10-18 20:46:17.519926918 +0200
@@ -1,3 +1,4 @@
+PREFIX=/usr
 HEADERS += \
         edge.h \
         node.h \
@@ -61,7 +62,7 @@
 isEmpty(ANDROID_PLATFORM) {
     QMAKE_LIBDIR     += ../../libval/.libs
     QMAKE_LIBDIR     += ../../libsres/.libs
-    LIBS        += -lval-threads -lsres -lnsl -lcrypto -lpthread
+    LIBS        += -lval-threads -lsres -lcrypto -lpthread
     maemo5 {
         INCLUDEPATH += /opt/maemo/usr/include/
     }
@@ -75,8 +76,6 @@
 # path to the harmattan libraries
 contains(MEEGO_EDITION,harmattan): {
     LIBS += -L/scratchbox/users/hardaker/targets/HARMATTAN_ARMEL/usr/lib
-} else {
-    LIBS += -L/usr/local/lib
 }
 
 QT += network
--- dnssec-tools-1.13/validator/apps/dnssec-system-tray/dnssec-system-tray.pro.orig	2011-10-25 22:45:08.000000000 +0200
+++ dnssec-tools-1.13/validator/apps/dnssec-system-tray/dnssec-system-tray.pro	2012-06-30 12:17:05.175285379 +0200
@@ -1,3 +1,4 @@
+PREFIX=/usr
 TARGET=dnssec-system-tray
 
 HEADERS       = dnssec-system-tray.h \
--- dnssec-tools-2.0/validator/apps/lookup/src/src.pro.orig	2013-02-20 23:33:14.000000000 +0100
+++ dnssec-tools-2.0/validator/apps/lookup/src/src.pro	2013-03-01 22:10:35.688684940 +0100
@@ -11,7 +11,7 @@
 INCLUDEPATH += /home/hardaker/src/dnssec/dnssec-tools.git/dnssec-tools/validator/include
 
 isEmpty(ANDROID_PLATFORM) {
-    LIBS        += -lval-threads -lsres -lnsl -lssl -lcrypto -lpthread
+    LIBS        += -L../../../libval/.libs -L../../../libsres/.libs -lval-threads -lsres -lcrypto -lpthread
 } else {
     LIBS        += -L/opt/android-external-openssl/lib/
     LIBS        += -L/root/necessitas/android-ndk-r5c/platforms/android-4/arch-arm/usr/lib/
@@ -63,7 +63,7 @@
 unix {
     #VARIABLES
     isEmpty(PREFIX) {
-        PREFIX = /usr/local
+        PREFIX = /usr
     }
 
 BINDIR = $$PREFIX/bin
@@ -77,13 +77,13 @@
 
   target.path =$$BINDIR
 
-  desktop.path = $$DATADIR/applications/hildon
+  desktop.path = $$DATADIR/applications
   desktop.files += $${TARGET}.desktop
 
   service.path = $$DATADIR/dbus-1/services
   service.files += $${TARGET}.service
 
-  iconxpm.path = $$DATADIR/pixmap
+  iconxpm.path = $$DATADIR/pixmaps
   iconxpm.files += ../data/maemo/$${TARGET}.xpm
 
   icon26.path = $$DATADIR/icons/hicolor/26x26/apps