opie-dvorak: adjust post{inst,rm} and rpath to the new layout

diff --git a/packages/opie-dvorak/files/.mtn2git_empty b/packages/opie-dvorak/files/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/opie-dvorak/files/fix-rpath.patch b/packages/opie-dvorak/files/fix-rpath.patch
new file mode 100644 (file)
index 0000000..37e2e5a
--- /dev/null
+++ b/packages/opie-dvorak/files/fix-rpath.patch
@@ -0,0 +1,13 @@
+diff --git a/dvorak.pro b/dvorak.pro
+index b659ab5..c1cf861 100644
+--- a/dvorak.pro
++++ b/dvorak.pro
+@@ -9,7 +9,7 @@ DESTDIR                = ../../plugins/inputmethods
+ INCLUDEPATH += $(OPIEDIR)/include
+ DEPENDPATH      +=  ../../launcher
+ LIBS            += -lqpe -L$(OPIEDIR)/plugins/inputmethods -lqpickboard
+-QMAKE_LFLAGS  += -Wl,-rpath,/opt/QtPalmtop/plugins/inputmethods
++QMAKE_LFLAGS  += -Wl,-rpath,${palmtopdir}/plugins/inputmethods
+ VERSION               = 1.0.0
+ 
+ include( $(OPIEDIR)/include.pro )

diff --git a/packages/opie-dvorak/opie-dvorak.inc b/packages/opie-dvorak/opie-dvorak.inc
index 7e4445d..78ba4fc 100644 (file)
--- a/packages/opie-dvorak/opie-dvorak.inc
+++ b/packages/opie-dvorak/opie-dvorak.inc
@@ -14,7 +14,7 @@ pkg_postinst() {
 #!/bin/sh
 if [ -n "$D" ]; then exit 1; fi
 if pidof -s qpe >/dev/null; then
-  /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"
+  ${bindir}/qcop QPE/TaskBar "reloadInputMethods()"
 else
   exit 0
 fi
@@ -24,7 +24,7 @@ fi
 pkg_postrm() {
 #!/bin/sh
 if [ -n "$D" ]; then exit 1; fi
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"
+${bindir}/qcop QPE/TaskBar "reloadInputMethods()"
 }
 
 # FILES plugins/inputmethods/libqdvorak.so*

diff --git a/packages/opie-dvorak/opie-dvorak_cvs.bb b/packages/opie-dvorak/opie-dvorak_cvs.bb
index bf38334..54234dd 100644 (file)
--- a/packages/opie-dvorak/opie-dvorak_cvs.bb
+++ b/packages/opie-dvorak/opie-dvorak_cvs.bb
@@ -1,6 +1,8 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/dvorak \
-           ${HANDHELDS_CVS};module=opie/inputmethods/pickboard"
+           ${HANDHELDS_CVS};module=opie/inputmethods/pickboard \
+          file://fix-rpath.patch;patch=1 "