opie-security: removed dependency loop

- moved opie-securityplugin-pin from opie-security to meta-opie/task-opie-settings

diff --git a/packages/meta/meta-opie.bb b/packages/meta/meta-opie.bb
index a6af4fc..a2bc99e 100644 (file)
--- a/packages/meta/meta-opie.bb
+++ b/packages/meta/meta-opie.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Meta-package for Opie"
 SECTION = "opie/base"
 ALLOW_EMPTY = 1
-PR = "r32"
+PR = "r33"
 PACKAGE_ARCH = "all"
 LICENSE = "MIT"
 
@@ -71,7 +71,8 @@ task-opie-base-apps = "opie-console opie-clock opie-citytime opie-backup opie-sy
 
 task-opie-base-settings = "opie-packagemanager opie-light-and-power opie-appearance \
                            opie-systemtime opie-networksettings opie-button-settings \
-                           opie-icon-reload opie-launcher-settings opie-security"
+                           opie-icon-reload opie-launcher-settings opie-security \
+                           opie-securityplugin-pin"
 
 #
 # That settings can be removed and device will be still usable

diff --git a/packages/opie-security/opie-security.inc b/packages/opie-security/opie-security.inc
index d3f6c00..d207399 100644 (file)
--- a/packages/opie-security/opie-security.inc
+++ b/packages/opie-security/opie-security.inc
@@ -3,10 +3,8 @@ SECTION = "opie/settings"
 PRIORITY = "optional"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
-RRECOMMENDS = "opie-securityplugin-pin"
 APPNAME = "security"
 
-
 S = "${WORKDIR}/${APPNAME}"
 
 inherit opie

diff --git a/packages/opie-security/opie-security_1.2.1.bb b/packages/opie-security/opie-security_1.2.1.bb
index 732c6c4..7ebe6cf 100644 (file)
--- a/packages/opie-security/opie-security_1.2.1.bb
+++ b/packages/opie-security/opie-security_1.2.1.bb
@@ -1,6 +1,6 @@
 include ${PN}.inc
-    
- 
+
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/settings/security \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \

diff --git a/packages/opie-security/opie-security_cvs.bb b/packages/opie-security/opie-security_cvs.bb
index ed20b1b..4aa9a1f 100644 (file)
--- a/packages/opie-security/opie-security_cvs.bb
+++ b/packages/opie-security/opie-security_cvs.bb
@@ -1,6 +1,7 @@
 include ${PN}.inc
-    
+
 PV = "1.2.1+cvs${SRCDATE}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/settings/security \
            ${HANDHELDS_CVS};module=opie/pics \