merge of 464cb51e4f1333becda8dfa1ccf4f9bbcea5514f

     and b3735f13f3bb7c2565ab1e628c79b04596773c15

16 files changed, 82 insertions, 181 deletions

diff --git a/packages/opie-securityplugins/opie-securityplugin-blueping.inc b/packages/opie-securityplugins/opie-securityplugin-blueping.inc
new file mode 100644
index 0000000000..35f972ef9a
--- /dev/null
+++ b/packages/opie-securityplugins/opie-securityplugin-blueping.inc
@@ -0,0 +1,15 @@
+DESCRIPTION = "Blueping plugin for opie-security authentication. \
+This is a bluetooth-based authentication plugin (you need \
+to have another Bluetooth device around to use it)."
+RDEPENDS += "bluez-utils"
+APPNAME = "multiauthbluepingplugin"
+
+include opie-securityplugin.inc
+
+S = "${WORKDIR}/blueping"
+
+do_install() {
+        install -d ${D}${palmtopdir}/pics/security/
+        install -m 0644 ${WORKDIR}/pics/security/bluepingplugin.png ${D}${palmtopdir}/pics/security/
+}
+
diff --git a/packages/opie-securityplugins/opie-securityplugin-blueping_1.2.1.bb b/packages/opie-securityplugins/opie-securityplugin-blueping_1.2.1.bb
index 85127240ab..65de7b78ec 100644
--- a/packages/opie-securityplugins/opie-securityplugin-blueping_1.2.1.bb
+++ b/packages/opie-securityplugins/opie-securityplugin-blueping_1.2.1.bb
@@ -1,26 +1,5 @@
-DESCRIPTION = "Blueping plugin for opie-security authentication. \
-This is a bluetooth-based authentication plugin (you need \
-to have another Bluetooth device around to use it)."
-SECTION = "opie/security"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-I18N_FILES = "libmultiauthbluepingplugin.ts"
-RDEPENDS = "opie-security bluez-utils"
-
-APPNAME = "multiauthbluepingplugin"
-
+include opie-securityplugin-blueping.inc
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/securityplugins/blueping \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics "
 
-S = "${WORKDIR}/blueping"
-
-inherit opie
-
-# FILES plugins/security/libmultiauthbluepingplugin.so* pics/security/bluepingplugin.png root/etc/suspend-scripts/S50bluetooth
-do_install() {
-        install -d ${D}${palmtopdir}/pics/security/
-        install -m 0644 ${WORKDIR}/pics/security/bluepingplugin.png ${D}${palmtopdir}/pics/security/
-}
-
diff --git a/packages/opie-securityplugins/opie-securityplugin-blueping_cvs.bb b/packages/opie-securityplugins/opie-securityplugin-blueping_cvs.bb
index 3d78f3757d..52bcbe6d16 100644
--- a/packages/opie-securityplugins/opie-securityplugin-blueping_cvs.bb
+++ b/packages/opie-securityplugins/opie-securityplugin-blueping_cvs.bb
@@ -1,25 +1,7 @@
-DESCRIPTION = "Blueping plugin for opie-security authentication. \
-This is a bluetooth-based authentication plugin (you need \
-to have another Bluetooth device around to use it)."
-SECTION = "opie/security"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-I18N_FILES = "libmultiauthbluepingplugin.ts"
-RDEPENDS = "opie-security bluez-utils"
-PV = "1.2.1+cvs${SRCDATE}"
-APPNAME = "multiauthbluepingplugin"
+include opie-securityplugin-blueping.inc
+
+PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/securityplugins/blueping \
            ${HANDHELDS_CVS};module=opie/pics "
 
-S = "${WORKDIR}/blueping"
-
-inherit opie
-
-# FILES plugins/security/libmultiauthbluepingplugin.so* pics/security/bluepingplugin.png root/etc/suspend-scripts/S50bluetooth
-do_install() {
-        install -d ${D}${palmtopdir}/pics/security/
-        install -m 0644 ${WORKDIR}/pics/security/bluepingplugin.png ${D}${palmtopdir}/pics/security/
-}
-
diff --git a/packages/opie-securityplugins/opie-securityplugin-dummy.inc b/packages/opie-securityplugins/opie-securityplugin-dummy.inc
new file mode 100644
index 0000000000..bb0a9b962b
--- /dev/null
+++ b/packages/opie-securityplugins/opie-securityplugin-dummy.inc
@@ -0,0 +1,14 @@
+DESCRIPTION = "Dummy plugin for opie-security authentication. \
+This is a very simple authentication plugin (you just have \
+to press a button basically), for demonstration purpose."
+APPNAME = "multiauthdummyplugin"
+
+include opie-securityplugin.inc
+
+S = "${WORKDIR}/dummy"
+
+do_install() {
+        install -d ${D}${palmtopdir}/pics/security
+        install -m 0644 ${WORKDIR}/pics/security/dummyplugin.png ${D}${palmtopdir}/pics/security/
+}
+
diff --git a/packages/opie-securityplugins/opie-securityplugin-dummy_1.2.1.bb b/packages/opie-securityplugins/opie-securityplugin-dummy_1.2.1.bb
index 825c14ea53..4a5bc3c2e0 100644
--- a/packages/opie-securityplugins/opie-securityplugin-dummy_1.2.1.bb
+++ b/packages/opie-securityplugins/opie-securityplugin-dummy_1.2.1.bb
@@ -1,26 +1,5 @@
-DESCRIPTION = "Dummy plugin for opie-security authentication. \
-This is a very simple authentication plugin (you just have \
-to press a button basically), for demonstration purpose."
-SECTION = "opie/security"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-I18N_FILES = "libmultiauthdummyplugin.ts"
-RDEPENDS = "opie-security"
-
-APPNAME = "multiauthdummyplugin"
-
+include opie-securityplugin-dummy.inc
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/securityplugins/dummy \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics "
 
-S = "${WORKDIR}/dummy"
-
-inherit opie
-
-# FILES plugins/security/libmultiauthdummyplugin.so* pics/security/dummyplugin.png
-do_install() {
-        install -d ${D}${palmtopdir}/pics/security
-        install -m 0644 ${WORKDIR}/pics/security/dummyplugin.png ${D}${palmtopdir}/pics/security/
-}
-
diff --git a/packages/opie-securityplugins/opie-securityplugin-dummy_cvs.bb b/packages/opie-securityplugins/opie-securityplugin-dummy_cvs.bb
index 93cf6ac712..b0d1e8d49e 100644
--- a/packages/opie-securityplugins/opie-securityplugin-dummy_cvs.bb
+++ b/packages/opie-securityplugins/opie-securityplugin-dummy_cvs.bb
@@ -1,25 +1,7 @@
-DESCRIPTION = "Dummy plugin for opie-security authentication. \
-This is a very simple authentication plugin (you just have \
-to press a button basically), for demonstration purpose."
-SECTION = "opie/security"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-I18N_FILES = "libmultiauthdummyplugin.ts"
-RDEPENDS = "opie-security"
-PV = "1.2.1+cvs${SRCDATE}"
-APPNAME = "multiauthdummyplugin"
+include opie-securityplugin-dummy.inc
+
+PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/securityplugins/dummy \
            ${HANDHELDS_CVS};module=opie/pics "
 
-S = "${WORKDIR}/dummy"
-
-inherit opie
-
-# FILES plugins/security/libmultiauthdummyplugin.so* pics/security/dummyplugin.png
-do_install() {
-        install -d ${D}${palmtopdir}/pics/security
-        install -m 0644 ${WORKDIR}/pics/security/dummyplugin.png ${D}${palmtopdir}/pics/security/
-}
-
diff --git a/packages/opie-securityplugins/opie-securityplugin-notice.inc b/packages/opie-securityplugins/opie-securityplugin-notice.inc
new file mode 100644
index 0000000000..09a4025760
--- /dev/null
+++ b/packages/opie-securityplugins/opie-securityplugin-notice.inc
@@ -0,0 +1,13 @@
+DESCRIPTION = "Notice plugin for opie-security authentication. \
+It allows you to display, for example, a notice from your legal departement."
+APPNAME = "multiauthnoticeplugin"
+
+include opie-securityplugin.inc
+
+S = "${WORKDIR}/notice"
+
+do_install() {
+        install -d ${D}${palmtopdir}/pics/security/
+        install -m 0644 ${WORKDIR}/pics/security/noticeplugin*.png ${D}${palmtopdir}/pics/security/
+}
+
diff --git a/packages/opie-securityplugins/opie-securityplugin-notice_1.2.1.bb b/packages/opie-securityplugins/opie-securityplugin-notice_1.2.1.bb
index b1f11bcf6a..08bd1b13c0 100644
--- a/packages/opie-securityplugins/opie-securityplugin-notice_1.2.1.bb
+++ b/packages/opie-securityplugins/opie-securityplugin-notice_1.2.1.bb
@@ -1,25 +1,5 @@
-DESCRIPTION = "Notice plugin for opie-security authentication. \
-It allows you to display, for example, a notice from your legal departement."
-SECTION = "opie/security"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-I18N_FILES = "libmultiauthnoticeplugin.ts"
-RDEPENDS = "opie-security"
-
-APPNAME = "multiauthnoticeplugin"
-
+include opie-securityplugin-notice.inc
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/securityplugins/notice \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics "
 
-S = "${WORKDIR}/notice"
-
-inherit opie
-
-# FILES plugins/security/libmultiauthnoticeplugin.so* pics/security/noticeplugin.png pics/security/noticeplugin_small.png
-do_install() {
-        install -d ${D}${palmtopdir}/pics/security/
-        install -m 0644 ${WORKDIR}/pics/security/noticeplugin*.png ${D}${palmtopdir}/pics/security/
-}
-
diff --git a/packages/opie-securityplugins/opie-securityplugin-notice_cvs.bb b/packages/opie-securityplugins/opie-securityplugin-notice_cvs.bb
index 34e79d78b5..5223edbaf8 100644
--- a/packages/opie-securityplugins/opie-securityplugin-notice_cvs.bb
+++ b/packages/opie-securityplugins/opie-securityplugin-notice_cvs.bb
@@ -1,24 +1,7 @@
-DESCRIPTION = "Notice plugin for opie-security authentication. \
-It allows you to display, for example, a notice from your legal departement."
-SECTION = "opie/security"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-I18N_FILES = "libmultiauthnoticeplugin.ts"
-RDEPENDS = "opie-security"
-PV = "1.2.1+cvs${SRCDATE}"
-APPNAME = "multiauthnoticeplugin"
+include opie-securityplugin-notice.inc
+
+PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/securityplugins/notice \
            ${HANDHELDS_CVS};module=opie/pics "
 
-S = "${WORKDIR}/notice"
-
-inherit opie
-
-# FILES plugins/security/libmultiauthnoticeplugin.so* pics/security/noticeplugin.png pics/security/noticeplugin_small.png
-do_install() {
-        install -d ${D}${palmtopdir}/pics/security/
-        install -m 0644 ${WORKDIR}/pics/security/noticeplugin*.png ${D}${palmtopdir}/pics/security/
-}
-
diff --git a/packages/opie-securityplugins/opie-securityplugin-pin.inc b/packages/opie-securityplugins/opie-securityplugin-pin.inc
new file mode 100644
index 0000000000..6286d8abcf
--- /dev/null
+++ b/packages/opie-securityplugins/opie-securityplugin-pin.inc
@@ -0,0 +1,15 @@
+DESCRIPTION = "PIN plugin for opie-security authentication. \
+It implements the same kind of widgets as opie-security package, \
+but this implementation can be used along with other authentication \
+methods in the Opie Multi-Authentication Framework."
+APPNAME = "multiauthpinplugin"
+
+include opie-securityplugin.inc
+
+S = "${WORKDIR}/pin"
+
+do_install() {
+        install -d ${D}${palmtopdir}/pics/security/
+        install -m 0644 ${WORKDIR}/pics/security/pinplugin.png ${D}${palmtopdir}/pics/security/
+}
+
diff --git a/packages/opie-securityplugins/opie-securityplugin-pin_1.2.1.bb b/packages/opie-securityplugins/opie-securityplugin-pin_1.2.1.bb
index 5a2d03f6d5..c5ccde6b5c 100644
--- a/packages/opie-securityplugins/opie-securityplugin-pin_1.2.1.bb
+++ b/packages/opie-securityplugins/opie-securityplugin-pin_1.2.1.bb
@@ -1,27 +1,5 @@
-DESCRIPTION = "PIN plugin for opie-security authentication. \
-It implements the same kind of widgets as opie-security package, \
-but this implementation can be used along with other authentication \
-methods in the Opie Multi-Authentication Framework."
-SECTION = "opie/security"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-I18N_FILES = "libmultiauthpinplugin.ts"
-RDEPENDS = "opie-security"
-
-APPNAME = "multiauthpinplugin"
-
+include opie-securityplugin-pin.inc
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/securityplugins/pin \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics "
-
-S = "${WORKDIR}/pin"
-
-inherit opie
-
-# FILES plugins/security/libmultiauthpinplugin.so* pics/security/pinplugin.png
-do_install() {
-        install -d ${D}${palmtopdir}/pics/security/
-        install -m 0644 ${WORKDIR}/pics/security/pinplugin.png ${D}${palmtopdir}/pics/security/
-}
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
 
diff --git a/packages/opie-securityplugins/opie-securityplugin-pin_cvs.bb b/packages/opie-securityplugins/opie-securityplugin-pin_cvs.bb
index b85132b5e2..bf2a607650 100644
--- a/packages/opie-securityplugins/opie-securityplugin-pin_cvs.bb
+++ b/packages/opie-securityplugins/opie-securityplugin-pin_cvs.bb
@@ -1,26 +1,7 @@
-DESCRIPTION = "PIN plugin for opie-security authentication. \
-It implements the same kind of widgets as opie-security package, \
-but this implementation can be used along with other authentication \
-methods in the Opie Multi-Authentication Framework."
-SECTION = "opie/security"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-I18N_FILES = "libmultiauthpinplugin.ts"
-RDEPENDS = "opie-security"
-PV = "1.2.1+cvs${SRCDATE}"
-APPNAME = "multiauthpinplugin"
+include opie-securityplugin-pin.inc
+
+PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/securityplugins/pin \
            ${HANDHELDS_CVS};module=opie/pics "
 
-S = "${WORKDIR}/pin"
-
-inherit opie
-
-# FILES plugins/security/libmultiauthpinplugin.so* pics/security/pinplugin.png
-do_install() {
-        install -d ${D}${palmtopdir}/pics/security/
-        install -m 0644 ${WORKDIR}/pics/security/pinplugin.png ${D}${palmtopdir}/pics/security/
-}
-
diff --git a/packages/opie-securityplugins/opie-securityplugin.inc b/packages/opie-securityplugins/opie-securityplugin.inc
new file mode 100644
index 0000000000..855a610f6d
--- /dev/null
+++ b/packages/opie-securityplugins/opie-securityplugin.inc
@@ -0,0 +1,8 @@
+SECTION = "opie/security"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+RDEPENDS = "opie-security"
+I18N_FILES = "lib${APPNAME}.ts"
+
+inherit opie
diff --git a/packages/opie-securityplugins/opie-securityplugins.inc b/packages/opie-securityplugins/opie-securityplugins.inc
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/opie-securityplugins/opie-securityplugins.inc
+++ /dev/null
diff --git a/packages/opie-securityplugins/opie-securityplugins_1.2.1.bb b/packages/opie-securityplugins/opie-securityplugins_1.2.1.bb
deleted file mode 100644
index c541bc78ed..0000000000
--- a/packages/opie-securityplugins/opie-securityplugins_1.2.1.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-include ${PN}.inc
-    
- 
-
diff --git a/packages/opie-securityplugins/opie-securityplugins_cvs.bb b/packages/opie-securityplugins/opie-securityplugins_cvs.bb
deleted file mode 100644
index f8c47a5c4f..0000000000
--- a/packages/opie-securityplugins/opie-securityplugins_cvs.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-include ${PN}.inc
-    
-PV = "1.2.1+cvs${SRCDATE}"
-