Merge the conflict

2004/11/13 21:06:11+01:00 handhelds.org!zecke
Opie 1.1.7:
	Remove CVSDATE and PR from the package files

2004/11/13 20:52:18+01:00 handhelds.org!zecke
Update packaging of 1.1.7 to match the 'cvs' version of the Opie versions

2004/11/13 20:36:08+01:00 handhelds.org!zecke
Upgrade all Opie 1.1.6 files to Opie 1.1.7 in preparation
of the next OpenZaurus/Familiar release.

Remove all occurrences of Opie1.1.6 in the files

BKrev: 41966a744AeMTtlPuskXFPg512ykqQ

8 files changed, 0 insertions, 108 deletions

diff --git a/opie-securityplugins/opie-securityplugin-blueping_1.1.6.oe b/opie-securityplugins/opie-securityplugin-blueping_1.1.6.oe
deleted file mode 100644
index 1ae44834b5..0000000000
--- a/opie-securityplugins/opie-securityplugin-blueping_1.1.6.oe
+++ /dev/null
@@ -1,27 +0,0 @@
-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/settings"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-I18N_FILES = "libmultiauthbluepingplugin.ts"
-RDEPENDS = "opie-security bluez-utils"
-PR = "r1"
-
-APPNAME = "multiauthbluepingplugin"
-
-TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/noncore/securityplugins/blueping \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/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/opie-securityplugins/opie-securityplugin-blueping_1.1.7.oe b/opie-securityplugins/opie-securityplugin-blueping_1.1.7.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/opie-securityplugins/opie-securityplugin-blueping_1.1.7.oe
diff --git a/opie-securityplugins/opie-securityplugin-dummy_1.1.6.oe b/opie-securityplugins/opie-securityplugin-dummy_1.1.6.oe
deleted file mode 100644
index 3d69929ab6..0000000000
--- a/opie-securityplugins/opie-securityplugin-dummy_1.1.6.oe
+++ /dev/null
@@ -1,27 +0,0 @@
-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/settings"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-I18N_FILES = "libmultiauthdummyplugin.ts"
-RDEPENDS = "opie-security"
-PR = "r1"
-
-APPNAME = "multiauthdummyplugin"
-
-TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/noncore/securityplugins/dummy \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/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/opie-securityplugins/opie-securityplugin-dummy_1.1.7.oe b/opie-securityplugins/opie-securityplugin-dummy_1.1.7.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/opie-securityplugins/opie-securityplugin-dummy_1.1.7.oe
diff --git a/opie-securityplugins/opie-securityplugin-notice_1.1.6.oe b/opie-securityplugins/opie-securityplugin-notice_1.1.6.oe
deleted file mode 100644
index 64c12b11c0..0000000000
--- a/opie-securityplugins/opie-securityplugin-notice_1.1.6.oe
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION = "Notice plugin for opie-security authentication. \
-It allows you to display, for example, a notice from your legal departement."
-SECTION = "opie/settings"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-I18N_FILES = "libmultiauthnoticeplugin.ts"
-RDEPENDS = "opie-security"
-PR = "r1"
-
-APPNAME = "multiauthnoticeplugin"
-
-TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/noncore/securityplugins/notice \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/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/opie-securityplugins/opie-securityplugin-notice_1.1.7.oe b/opie-securityplugins/opie-securityplugin-notice_1.1.7.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/opie-securityplugins/opie-securityplugin-notice_1.1.7.oe
diff --git a/opie-securityplugins/opie-securityplugin-pin_1.1.6.oe b/opie-securityplugins/opie-securityplugin-pin_1.1.6.oe
deleted file mode 100644
index aa023b278e..0000000000
--- a/opie-securityplugins/opie-securityplugin-pin_1.1.6.oe
+++ /dev/null
@@ -1,28 +0,0 @@
-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/settings"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-I18N_FILES = "libmultiauthpinplugin.ts"
-RDEPENDS = "opie-security"
-PR = "r1"
-
-APPNAME = "multiauthpinplugin"
-
-TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/noncore/securityplugins/pin \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/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/
-}
-
diff --git a/opie-securityplugins/opie-securityplugin-pin_1.1.7.oe b/opie-securityplugins/opie-securityplugin-pin_1.1.7.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/opie-securityplugins/opie-securityplugin-pin_1.1.7.oe