summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openembedded.org>2005-03-11 12:01:21 +0000
committerMarcin Juszkiewicz <hrw@openembedded.org>2005-03-11 12:01:21 +0000
commit349ef2310fa3e6bb660fdf74de60e2935c3379e8 (patch)
treefec48b33ecde4eb696e56b0e55ba7491b95facc2
parent373491b8bd18db5663c3600e99e5d976ab52454a (diff)
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into marcinj.local:/home/hrw/zaurus/bb/openembedded 2005/03/11 13:00:43+01:00 local!hrw updated kdepimpi to 2.0.15 2005/03/11 12:59:30+01:00 local!hrw qpe-vexed changes proposed by Vitaliy Pronkin: - switched to correct format of Vexed levels - start maximized - made level numbers in status string begin from 1 instead of 0 BKrev: 423188919rv-Wf_tNs-hi0dwxNOlZg
-rw-r--r--packages/kdepimpi/files/opie-fontselector-copy.patch (renamed from packages/kdepimpi/pwmpi_2.0.14.bb)0
-rw-r--r--packages/kdepimpi/kdepimpi-base.inc2
-rw-r--r--packages/kdepimpi/kdepimpi_2.0.14.bb4
-rw-r--r--packages/kdepimpi/kdepimpi_2.0.15.bb0
-rw-r--r--packages/kdepimpi/pwmpi_2.0.15.bb0
-rw-r--r--packages/qpe-vexed/files/vit.patch0
-rw-r--r--packages/qpe-vexed/qpe-vexed-levels_2.1Beta1.bb11
-rw-r--r--packages/qpe-vexed/qpe-vexed_1.3.bb6
8 files changed, 10 insertions, 13 deletions
diff --git a/packages/kdepimpi/pwmpi_2.0.14.bb b/packages/kdepimpi/files/opie-fontselector-copy.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/kdepimpi/pwmpi_2.0.14.bb
+++ b/packages/kdepimpi/files/opie-fontselector-copy.patch
diff --git a/packages/kdepimpi/kdepimpi-base.inc b/packages/kdepimpi/kdepimpi-base.inc
index a97826bdcb..e18219eca7 100644
--- a/packages/kdepimpi/kdepimpi-base.inc
+++ b/packages/kdepimpi/kdepimpi-base.inc
@@ -19,8 +19,8 @@ HOMEPAGE = "http://www.pi-sync.net/ http://sf.net/projects/kdepimpi/"
# kabc/plugins/ldap - wants ldap libs (?)
# kabc/plugins/opie - wants libopie1 (we don't plan to have it in OE)
# kmicromail - conflict with OE libetpan, libmailwrapper/OPIE
-# pwmanager - needs stdc++ and some patching
+SRC_URI_append = "file://opie-fontselector-copy.patch;patch=1"
PARALLEL_MAKE = ""
S = "${WORKDIR}/kdepim"
diff --git a/packages/kdepimpi/kdepimpi_2.0.14.bb b/packages/kdepimpi/kdepimpi_2.0.14.bb
deleted file mode 100644
index 10f4f51568..0000000000
--- a/packages/kdepimpi/kdepimpi_2.0.14.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-PR = "r1"
-SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimpi/kdepimpi-${PV}.tar.gz "
-
-include kdepimpi-base.inc
diff --git a/packages/kdepimpi/kdepimpi_2.0.15.bb b/packages/kdepimpi/kdepimpi_2.0.15.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/kdepimpi/kdepimpi_2.0.15.bb
diff --git a/packages/kdepimpi/pwmpi_2.0.15.bb b/packages/kdepimpi/pwmpi_2.0.15.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/kdepimpi/pwmpi_2.0.15.bb
diff --git a/packages/qpe-vexed/files/vit.patch b/packages/qpe-vexed/files/vit.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qpe-vexed/files/vit.patch
diff --git a/packages/qpe-vexed/qpe-vexed-levels_2.1Beta1.bb b/packages/qpe-vexed/qpe-vexed-levels_2.1Beta1.bb
index 9351377a31..f38c29f096 100644
--- a/packages/qpe-vexed/qpe-vexed-levels_2.1Beta1.bb
+++ b/packages/qpe-vexed/qpe-vexed-levels_2.1Beta1.bb
@@ -5,21 +5,20 @@ MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
LICENSE = "GPL"
AUTHOR = "The Vexed Development Team"
HOMEPAGE = "http://vexed.sourceforge.net/"
+PACKAGE_ARCH = "all"
+PR = "r1"
-SRC_URI = "${SOURCEFORGE_MIRROR}/vexed/vexed21Beta1.zip"
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/vexed/;module=vexed/levelpacks"
S = "${WORKDIR}"
do_install () {
install -d ${D}${palmtopdir}/etc/qpe-vexed
- cd ${WORKDIR}
- for level in *.pdb
+ for level in ${WORKDIR}/levelpacks/*.ini;
do
- cp "$level" "`basename "$level" .pdb`.lvl"
+ install -m 0664 "$level" "${D}${palmtopdir}/etc/qpe-vexed/`basename "$level" .ini`.lvl";
done
-
- install -m 0644 ${WORKDIR}/*.lvl ${D}${palmtopdir}/etc/qpe-vexed/
}
FILES_${PN} = "${palmtopdir}/etc/qpe-vexed/*.lvl"
diff --git a/packages/qpe-vexed/qpe-vexed_1.3.bb b/packages/qpe-vexed/qpe-vexed_1.3.bb
index 8f013cee21..c6920756a1 100644
--- a/packages/qpe-vexed/qpe-vexed_1.3.bb
+++ b/packages/qpe-vexed/qpe-vexed_1.3.bb
@@ -10,9 +10,11 @@ RDEPENDS = "qpe-vexed-levels"
APPNAME = "qpe-vexed"
APPTYPE = "binary"
APPDESKTOP = "${S}"
-PR = "r1"
+PR = "r2"
-SRC_URI = "http://wwwcip.informatik.uni-erlangen.de/~sialhaus/qpe-vexed_1.3_src.tar.gz"
+SRC_URI = "http://wwwcip.informatik.uni-erlangen.de/~sialhaus/qpe-vexed_1.3_src.tar.gz \
+file://vit.patch;patch=1 \
+"
S = "${WORKDIR}/qpe-vexed_arm/"