diff options
| author | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2008-08-23 13:23:05 +0000 |
|---|---|---|
| committer | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2008-08-23 13:23:05 +0000 |
| commit | 548b4dda4ac765a278976c9face5d815b0c0e732 (patch) | |
| tree | c8db1f08efad7d4563cf65439f643cf1c176c3b1 /packages | |
| parent | 85d5a47a22f6b65960cc1f341a43102bf1f74a66 (diff) | |
| parent | a0729f86dbe321f193a772066b257213655356cd (diff) | |
merge of '10e6bf1f992b208b919b4fc707871e1e1ae7e91e'
and 'aeb148ecdb7be061e0dc9a58ffebbeca28f2e26d'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/kdepimpi/kdepimpi-base.inc | 2 | ||||
| -rw-r--r-- | packages/kdepimpi/kdepimpi-qte.inc | 2 | ||||
| -rw-r--r-- | packages/kdepimpi/kdepimpi-x11.inc | 2 | ||||
| -rw-r--r-- | packages/kdepimpi/kdepimpi-x11_2.2.3.bb | 2 | ||||
| -rw-r--r-- | packages/kdepimpi/kdepimpi_2.2.7.bb | 2 |
5 files changed, 6 insertions, 4 deletions
diff --git a/packages/kdepimpi/kdepimpi-base.inc b/packages/kdepimpi/kdepimpi-base.inc index 250cab0614..d031a52900 100644 --- a/packages/kdepimpi/kdepimpi-base.inc +++ b/packages/kdepimpi/kdepimpi-base.inc @@ -150,7 +150,7 @@ do_install() { } -PACKAGES = "${PN}-dbg libmicrokcal libmicrokabc kopi-applet kopi kapi libmicrokdelibs kammu libmicrokammu" +PACKAGES = "${PN}-dbg libmicrokcal libmicrokabc kopi-applet kopi kapi libmicrokdelibs kammu libmicrokammu ${PN}" FILES_kopi = "${bindir}/kopi ${palmtopdir}/apps/1Pim/korganizer.desktop ${palmtopdir}/pics/kdepim/korganizer/* " FILES_kapi = "${bindir}/kapi ${palmtopdir}/apps/1Pim/kaddressbook.desktop ${palmtopdir}/pics/kdepim/kaddressbook/* ${palmtopdir}/lib/libmicrokabc_* ${palmtopdir}/lib/libmicrokabcformat_binary*" diff --git a/packages/kdepimpi/kdepimpi-qte.inc b/packages/kdepimpi/kdepimpi-qte.inc index 3fa8781658..da7f011eda 100644 --- a/packages/kdepimpi/kdepimpi-qte.inc +++ b/packages/kdepimpi/kdepimpi-qte.inc @@ -151,7 +151,7 @@ do_install() { } -PACKAGES = "libmicrokcal libmicrokabc kopi-applet kopi kapi libmicrokdelibs kammu libmicrokammu" +PACKAGES = "libmicrokcal libmicrokabc kopi-applet kopi kapi libmicrokdelibs kammu libmicrokammu ${PN}" FILES_kopi = "${palmtopdir}/bin/kopi ${palmtopdir}/apps/1Pim/korganizer.desktop ${palmtopdir}/pics/kdepim/korganizer/* " FILES_kapi = "${palmtopdir}/bin/kapi ${palmtopdir}/apps/1Pim/kaddressbook.desktop ${palmtopdir}/pics/kdepim/kaddressbook/* ${palmtopdir}/lib/libmicrokabc_* ${palmtopdir}/lib/libmicrokabcformat_binary*" diff --git a/packages/kdepimpi/kdepimpi-x11.inc b/packages/kdepimpi/kdepimpi-x11.inc index 80c246ad7c..6cf0d3863d 100644 --- a/packages/kdepimpi/kdepimpi-x11.inc +++ b/packages/kdepimpi/kdepimpi-x11.inc @@ -58,7 +58,7 @@ do_install-broken() { done } -PACKAGES = "libmicrokcal-x11 libmicrokabc-x11 kopi-applet-x11 kopi-x11 kapi-x11 libmicrokdelibs-x11 kammu-x11 libmicrokammu-x11" +PACKAGES = "libmicrokcal-x11 libmicrokabc-x11 kopi-applet-x11 kopi-x11 kapi-x11 libmicrokdelibs-x11 kammu-x11 libmicrokammu-x11 ${PN}" FILES_kopi-x11 = "${palmtopdir}/bin/kopi ${palmtopdir}/apps/1Pim/korganizer.desktop ${palmtopdir}/pics/kdepim/korganizer/* " FILES_kapi-x11 = "${palmtopdir}/bin/kapi ${palmtopdir}/apps/1Pim/kaddressbook.desktop ${palmtopdir}/pics/kdepim/kaddressbook/* ${palmtopdir}/lib/libmicrokabc_* ${palmtopdir}/lib/libmicrokabcformat_binary*" diff --git a/packages/kdepimpi/kdepimpi-x11_2.2.3.bb b/packages/kdepimpi/kdepimpi-x11_2.2.3.bb index 6c48baf266..b44471e9d6 100644 --- a/packages/kdepimpi/kdepimpi-x11_2.2.3.bb +++ b/packages/kdepimpi/kdepimpi-x11_2.2.3.bb @@ -8,3 +8,5 @@ file://nomail.patch;patch=1 \ include kdepimpi-base.inc include kdepimpi-x11.inc + +PR = "r1" diff --git a/packages/kdepimpi/kdepimpi_2.2.7.bb b/packages/kdepimpi/kdepimpi_2.2.7.bb index b8e4345b46..f21aebb4f3 100644 --- a/packages/kdepimpi/kdepimpi_2.2.7.bb +++ b/packages/kdepimpi/kdepimpi_2.2.7.bb @@ -5,4 +5,4 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimpi/kdepimpi-${PV}.tar.gz \ require kdepimpi-base.inc -PR = "r2" +PR = "r3" |