From 349ef2310fa3e6bb660fdf74de60e2935c3379e8 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 11 Mar 2005 12:01:21 +0000 Subject: 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 --- packages/kdepimpi/files/opie-fontselector-copy.patch | 0 packages/kdepimpi/kdepimpi-base.inc | 2 +- packages/kdepimpi/kdepimpi_2.0.14.bb | 4 ---- packages/kdepimpi/kdepimpi_2.0.15.bb | 0 packages/kdepimpi/pwmpi_2.0.14.bb | 0 packages/kdepimpi/pwmpi_2.0.15.bb | 0 6 files changed, 1 insertion(+), 5 deletions(-) create mode 100644 packages/kdepimpi/files/opie-fontselector-copy.patch delete mode 100644 packages/kdepimpi/kdepimpi_2.0.14.bb create mode 100644 packages/kdepimpi/kdepimpi_2.0.15.bb delete mode 100644 packages/kdepimpi/pwmpi_2.0.14.bb create mode 100644 packages/kdepimpi/pwmpi_2.0.15.bb (limited to 'packages/kdepimpi') diff --git a/packages/kdepimpi/files/opie-fontselector-copy.patch b/packages/kdepimpi/files/opie-fontselector-copy.patch new file mode 100644 index 0000000000..e69de29bb2 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 diff --git a/packages/kdepimpi/pwmpi_2.0.14.bb b/packages/kdepimpi/pwmpi_2.0.14.bb deleted file mode 100644 index e69de29bb2..0000000000 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 -- cgit v1.2.3