diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2006-01-09 19:49:29 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-09 19:49:29 +0000 |
| commit | f3630ccede2047ba388d7b930f40c1c2d840cf4c (patch) | |
| tree | 78a86b0c45cde64c1fa232479994e118b267a5a0 | |
| parent | 1bcc930ec17ed96e7c55aa925af6dfa367ebc2c0 (diff) | |
| parent | 9d2c0ba54d5651f689f912e5fa38a6db863fa198 (diff) | |
merge of 3a0a7021e4d48fa98ec14249578b13b3e3cc4489
and a1193f39f1f86aa55534e0c45b3dd46b8756d8be
| -rw-r--r-- | packages/meta/meta-opie.bb | 5 | ||||
| -rw-r--r-- | packages/opie-security/opie-security.inc | 2 | ||||
| -rw-r--r-- | packages/opie-security/opie-security_1.2.1.bb | 4 | ||||
| -rw-r--r-- | packages/opie-security/opie-security_cvs.bb | 3 |
4 files changed, 7 insertions, 7 deletions
diff --git a/packages/meta/meta-opie.bb b/packages/meta/meta-opie.bb index a6af4fce16..a2bc99e67e 100644 --- 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 d3f6c00e35..d207399fee 100644 --- 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 732c6c472e..7ebe6cf5a0 100644 --- 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 ed20b1b68e..4aa9a1f255 100644 --- 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 \ |