aboutsummaryrefslogtreecommitdiffstats
path: root/libopieobex
diff options
context:
space:
mode:
authorHolger Freyther <zecke@selfish.org>2004-11-13 20:11:32 +0000
committerHolger Freyther <zecke@selfish.org>2004-11-13 20:11:32 +0000
commitbadb3eafc9060609d6a484f1cc2e19925b5825c4 (patch)
tree24d23afd39a315ba7a5d0dae36d5d1c8d2579aaa /libopieobex
parent3d5519e88c30876da6f211f62e226e23a98d3215 (diff)
downloadopenembedded-badb3eafc9060609d6a484f1cc2e19925b5825c4.tar.gz
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
Diffstat (limited to 'libopieobex')
-rw-r--r--libopieobex/libopieobex0_1.1.6.oe23
-rw-r--r--libopieobex/libopieobex0_1.1.7.oe0
2 files changed, 0 insertions, 23 deletions
diff --git a/libopieobex/libopieobex0_1.1.6.oe b/libopieobex/libopieobex0_1.1.6.oe
deleted file mode 100644
index dd8c915b7c..0000000000
--- a/libopieobex/libopieobex0_1.1.6.oe
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "IrDA obex support library"
-SECTION = "opie/libs"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "LGPL"
-DEPENDS = "opie-taskbar"
-RDEPENDS = "openobex-apps"
-APPNAME = "obex"
-
-TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/core/obex \
- cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/pics"
-S = "${WORKDIR}/obex"
-
-inherit opie
-
-do_install() {
- install -d ${D}${palmtopdir}/pics/${APPNAME}/ ${D}${palmtopdir}/plugins/obex/
- install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
- oe_libinstall -so libopieobex ${D}${palmtopdir}/plugins/obex/
-}
-
-FILES_${PN} = "${palmtopdir}/plugins/obex/ ${palmtopdir}/pics/obex/"
diff --git a/libopieobex/libopieobex0_1.1.7.oe b/libopieobex/libopieobex0_1.1.7.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/libopieobex/libopieobex0_1.1.7.oe