[oe-commits] org.oe.dev merge of '1bf5b0badb102f7bb3da330b7e7a24077d2dd3b2'

[oe commit]

merge of '1bf5b0badb102f7bb3da330b7e7a24077d2dd3b2'
     and 'bfd97eeef754278ceda2ed7f140fb611e080e1f7'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: b8c94c1c7e4e954282242a572696bac945730a94
ViewMTN: http://monotone.openembedded.org/revision/info/b8c94c1c7e4e954282242a572696bac945730a94
Files:
1
packages/opkg/opkg-native_svn.bb
packages/opkg/opkg-sdk_svn.bb
packages/opie-cardapplet
packages/opie-cardapplet/opie-cardapplet.inc
packages/opie-cardapplet/opie-cardapplet_cvs.bb
Diffs:

#
# mt diff -r1bf5b0badb102f7bb3da330b7e7a24077d2dd3b2 -rb8c94c1c7e4e954282242a572696bac945730a94
#
#
#
# patch "packages/opkg/opkg-native_svn.bb"
#  from [e527ac2860974b35fe26ef814c8e63f878fe6187]
#    to [7ec178fa2741f4880831408c2c1c976c71054742]
# 
# patch "packages/opkg/opkg-sdk_svn.bb"
#  from [38e13d0db11312ba3b893f891d63aad2c68e1ed0]
#    to [156b8718e5e00225d312dbd09f391d28045acc65]
#
============================================================
--- packages/opkg/opkg-native_svn.bb	e527ac2860974b35fe26ef814c8e63f878fe6187
+++ packages/opkg/opkg-native_svn.bb	7ec178fa2741f4880831408c2c1c976c71054742
@@ -1,10 +1,10 @@ DEPENDS = "curl-native"
 require opkg.inc
 
 DEPENDS = "curl-native"
-PR = "r1"
+PR = "r2"
 
 target_libdir := "${libdir}"
 
 inherit native
 
+EXTRA_OECONF += "--with-opkglibdir=${target_libdir} --disable-gpg"
-EXTRA_OECONF += "--with-opkglibdir=${target_libdir} -disable-gpg"
============================================================
--- packages/opkg/opkg-sdk_svn.bb	38e13d0db11312ba3b893f891d63aad2c68e1ed0
+++ packages/opkg/opkg-sdk_svn.bb	156b8718e5e00225d312dbd09f391d28045acc65
@@ -1,7 +1,8 @@ DEPENDS = "curl-sdk"
 require opkg.inc
 
 DEPENDS = "curl-sdk"
+PR = "r1"
 
 inherit sdk
 
+EXTRA_OECONF += "--with-opkglibdir=${target_libdir}/opkg --disable-gpg"
-EXTRA_OECONF += "--with-opkglibdir=${target_libdir}/opkg -disable-gpg"


#
# mt diff -rbfd97eeef754278ceda2ed7f140fb611e080e1f7 -rb8c94c1c7e4e954282242a572696bac945730a94
#
#
#
# add_dir "packages/opie-cardapplet"
# 
# add_file "packages/opie-cardapplet/opie-cardapplet.inc"
#  content [9240884399aaf3543308f448c175b9f2342b0de0]
# 
# add_file "packages/opie-cardapplet/opie-cardapplet_cvs.bb"
#  content [f4fb523c94ef9219862e119ef945ba0b0468ec96]
#
============================================================
--- packages/opie-cardapplet/opie-cardapplet.inc	9240884399aaf3543308f448c175b9f2342b0de0
+++ packages/opie-cardapplet/opie-cardapplet.inc	9240884399aaf3543308f448c175b9f2342b0de0
@@ -0,0 +1,34 @@
+DESCRIPTION = "CF/SD/PCMCIA Card Monitor applet"
+SECTION = "opie/applets"
+PRIORITY = "optional"
+LICENSE = "GPL"
+APPNAME = "cardapplet"
+I18N_FILES = "libcardapplet.ts"
+
+
+S = "${WORKDIR}/cardapplet"
+
+inherit opie
+
+pkg_postinst() {
+#!/bin/sh
+if pidof -s qpe >/dev/null; then
+  /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+fi
+ if [ -n "$D" ]; then false; fi
+}
+
+pkg_postrm() {
+#!/bin/sh
+/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+ if [ -n "$D" ]; then false; fi
+}
+
+# FILES plugins/applets/libcardapplet.so* pics/cardmon/*.png sounds/cardmon/*.wav
+do_install() {
+        install -d ${D}${palmtopdir}/pics/cardmon/
+        install -d ${D}${palmtopdir}/sounds/cardmon/
+        install -m 0644 ${WORKDIR}/pics/cardmon/*.png ${D}${palmtopdir}/pics/cardmon/
+        install -m 0644 ${WORKDIR}/sounds/cardmon/*.wav ${D}${palmtopdir}/sounds/cardmon/
+}
+
============================================================
--- packages/opie-cardapplet/opie-cardapplet_cvs.bb	f4fb523c94ef9219862e119ef945ba0b0468ec96
+++ packages/opie-cardapplet/opie-cardapplet_cvs.bb	f4fb523c94ef9219862e119ef945ba0b0468ec96
@@ -0,0 +1,8 @@
+require ${PN}.inc
+
+PV = "${OPIE_CVS_PV}"
+
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/cardapplet \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/sounds \
+           ${HANDHELDS_CVS};module=opie/apps"