[oe-commits] org.oe.dev opie-dasher, opie-sh, opie-theme: Fix packaging.

[pfalcon commit]

opie-dasher, opie-sh, opie-theme: Fix packaging.
* Don't override PACKAGES, just append.
* Based on Henry von Tresckow's changes, fixes #2123.

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 01b1bd82cc3bb520359e6a17f2c8fafca56c2d71
ViewMTN: http://monotone.openembedded.org/revision.psp?id=01b1bd82cc3bb520359e6a17f2c8fafca56c2d71
Files:
1
packages/opie-dasher/opie-dasher.inc
packages/opie-dasher/opie-dasher_1.2.2.bb
packages/opie-dasher/opie-dasher_cvs.bb
packages/opie-sh/opie-sh.inc
packages/opie-theme/opie-theme.inc
packages/opie-theme/opie-theme_1.2.2.bb
packages/opie-theme/opie-theme_cvs.bb
Diffs:

#
# mt diff -rf29270c937226612fda51e2908d2fa5bf146c30f -r01b1bd82cc3bb520359e6a17f2c8fafca56c2d71
#
# 
# 
# patch "packages/opie-dasher/opie-dasher.inc"
#  from [8f462efc871765542fa2dbba88233c1f787b49c1]
#    to [e3024048f8e64a6525b631e96c4336e1f9dcd541]
# 
# patch "packages/opie-dasher/opie-dasher_1.2.2.bb"
#  from [c350369b00827750b0702dcfdf228922900d8c9d]
#    to [d56cdcb4b5d4898eedea4a4a38f9647b1f41cb4b]
# 
# patch "packages/opie-dasher/opie-dasher_cvs.bb"
#  from [6ad41f11d8ed17a68eab855ca652ec48ed6216c4]
#    to [7b1c035e148fbb68456f31739857779fb441d305]
# 
# patch "packages/opie-sh/opie-sh.inc"
#  from [a00037561083031c27bedf2ca17566788f43b72e]
#    to [ceee21679328e700543006d980e668f4be36b556]
# 
# patch "packages/opie-theme/opie-theme.inc"
#  from [ea9ab1f962cf1685ea655e263fce674359d522a9]
#    to [defedbeb26efc72f59a98e556db557b877c00709]
# 
# patch "packages/opie-theme/opie-theme_1.2.2.bb"
#  from [ab94de0b2ae09cd4944e5ef3e5d75d1130fc7b11]
#    to [251047959a50d135d04ce1e516ba1349ce19fe30]
# 
# patch "packages/opie-theme/opie-theme_cvs.bb"
#  from [50804840c21a565665e1bb96b0db21425fc435de]
#    to [f1e571aeb6b702a6490bfcac0e650a8a80bcfc3f]
# 
============================================================
--- packages/opie-dasher/opie-dasher.inc	8f462efc871765542fa2dbba88233c1f787b49c1
+++ packages/opie-dasher/opie-dasher.inc	e3024048f8e64a6525b631e96c4336e1f9dcd541
@@ -38,7 +38,7 @@ do_install() {
 	done
 }
 
-PACKAGES = " opie-dasher-english opie-dasher "
+PACKAGES += " opie-dasher-english "
 
 FILES_opie-dasher = "${palmtopdir}/plugins/inputmethods/libqdasher.so*"
 FILES_opie-dasher-english = "${palmtopdir}/share/dasher/training_english_GB.txt"
============================================================
--- packages/opie-dasher/opie-dasher_1.2.2.bb	c350369b00827750b0702dcfdf228922900d8c9d
+++ packages/opie-dasher/opie-dasher_1.2.2.bb	d56cdcb4b5d4898eedea4a4a38f9647b1f41cb4b
@@ -1,6 +1,6 @@ require ${PN}.inc
 require ${PN}.inc
+PR = "r1"
 
 
-
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/dasher \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/share "
============================================================
--- packages/opie-dasher/opie-dasher_cvs.bb	6ad41f11d8ed17a68eab855ca652ec48ed6216c4
+++ packages/opie-dasher/opie-dasher_cvs.bb	7b1c035e148fbb68456f31739857779fb441d305
@@ -1,4 +1,5 @@ require ${PN}.inc
 require ${PN}.inc
+PR = "r1"
 
 PV = "${OPIE_CVS_PV}"
 
============================================================
--- packages/opie-sh/opie-sh.inc	a00037561083031c27bedf2ca17566788f43b72e
+++ packages/opie-sh/opie-sh.inc	ceee21679328e700543006d980e668f4be36b556
@@ -1,10 +1,10 @@ APPTYPE = "binary"
 DESCRIPTION = "A QDialog shell frontend"
 SECTION = "opie/shell"
 PRIORITY = "optional"
 LICENSE = "GPL"
 APPNAME = "opie-sh"
 APPTYPE = "binary"
-PR = "r1"
+PR = "r2"
 
 S = "${WORKDIR}/${APPNAME}"
 
@@ -27,10 +27,10 @@ do_install() {
 	install -m 0644 ${WORKDIR}/share/config/*.cfg  ${D}${palmtopdir}/share/config/
 }
 
-PACKAGES = " opie-sh-microkbd opie-sh-diskfree opie-sh-fsmounter opie-sh-hostlist \
+PACKAGES += " opie-sh-microkbd opie-sh-diskfree opie-sh-fsmounter opie-sh-hostlist \
 opie-sh-killproc opie-sh-launcher-refresh opie-sh-logviewer opie-sh-rsynchelper \
 opie-sh-servicemanager opie-sh-ssh-askpass opie-sh-stowawayctrl opie-sh-usbnetctrl \
-opie-sh-wavelanchooser ${PN}"
+opie-sh-wavelanchooser "
 
 RDEPENDS_opie-sh-microkbd = "opie-sh"
 RDEPENDS_opie-sh-diskfree = "opie-sh"
============================================================
--- packages/opie-theme/opie-theme.inc	ea9ab1f962cf1685ea655e263fce674359d522a9
+++ packages/opie-theme/opie-theme.inc	defedbeb26efc72f59a98e556db557b877c00709
@@ -33,7 +33,8 @@ do_install() {
 	done
 }
 
-PACKAGES = " opie-theme-cleannsimple opie-theme-grade8 opie-theme-ixpe opie-theme-lumonmarble opie-theme-lumonwave opie-theme-luna opie-theme "
+PACKAGES += " opie-theme-cleannsimple opie-theme-grade8 opie-theme-ixpe opie-theme-lumonmarble \
+              opie-theme-lumonwave opie-theme-luna "
 
 FILES_opie-theme = " ${palmtopdir}/plugins/styles/libtheme.so*"
 FILES_opie-theme-cleannsimple = " ${palmtopdir}/plugins/styles/themes/cleannsimple.themerc ${palmtopdir}/plugins/styles/pixmaps/cleannsimple/*.png"
============================================================
--- packages/opie-theme/opie-theme_1.2.2.bb	ab94de0b2ae09cd4944e5ef3e5d75d1130fc7b11
+++ packages/opie-theme/opie-theme_1.2.2.bb	251047959a50d135d04ce1e516ba1349ce19fe30
@@ -1,6 +1,6 @@ require ${PN}.inc
 require ${PN}.inc
+PR = "r1"
 
 
-
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/theme \
 	${HANDHELDS_CVS};tag=${TAG};module=opie/plugins/styles "
============================================================
--- packages/opie-theme/opie-theme_cvs.bb	50804840c21a565665e1bb96b0db21425fc435de
+++ packages/opie-theme/opie-theme_cvs.bb	f1e571aeb6b702a6490bfcac0e650a8a80bcfc3f
@@ -1,4 +1,5 @@ require ${PN}.inc
 require ${PN}.inc
+PR = "r1"
 
 PV = "${OPIE_CVS_PV}"