diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-01-06 19:14:24 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-01-06 19:14:24 +0000 |
| commit | a736d896a6e8a88f2bae4e380b33f6542aeff19a (patch) | |
| tree | 5bb4b864a58824f7e88fc9969755d57d783fe31f | |
| parent | 251cfde50ccdbb5a9de20c068f403504316c6dc3 (diff) | |
| parent | 6a64faa7f6e5d5714394ab55938724e9d7cb1fe3 (diff) | |
merge of 'b06b77d4eeabec06bad99d46e7c868660031cd5c'
and 'e6ed01ee2bd6e85b33c2e7aa5570f532a768af2e'
| -rw-r--r-- | packages/opie-pics/opie-pics.inc | 10 | ||||
| -rw-r--r-- | packages/qte/qte-common_2.3.10.inc | 3 |
2 files changed, 6 insertions, 7 deletions
diff --git a/packages/opie-pics/opie-pics.inc b/packages/opie-pics/opie-pics.inc index 26c0bd04c7..78747b9147 100644 --- a/packages/opie-pics/opie-pics.inc +++ b/packages/opie-pics/opie-pics.inc @@ -2,15 +2,13 @@ DESCRIPTION = "Common Opie pictures usable from all applications" SECTION = "opie/base" PRIORITY = "optional" LICENSE = "GPL" +PR = "r1" S = "${WORKDIR}" SHIP_INLINE_PICS = "yes" -INLINE_PICS = "pics/inline" -INLINE_PICS_tosa = "pics-hires/inline" -INLINE_PICS_c7x0 = "pics-hires/inline" -INLINE_PICS_spitz = "pics-hires/inline" -INLINE_PICS_akita = "pics-hires/inline" +INLINE_PICS_smallscreen = "pics/inline" +INLINE_PICS_bigscreen = "pics-hires/inline" do_install() { install -d ${D}${palmtopdir}/pics/addressbook/ @@ -22,7 +20,7 @@ do_install() { install -m 0664 pics/todo/*.png ${D}${palmtopdir}/pics/todo/ if [ "${SHIP_INLINE_PICS}" == "yes" ]; then - install -m 0664 ${INLINE_PICS}/*.png ${D}${palmtopdir}/pics/ + install -m 0664 ${INLINE_PICS_${GUI_MACHINE_CLASS}}/*.png ${D}${palmtopdir}/pics/ fi } diff --git a/packages/qte/qte-common_2.3.10.inc b/packages/qte/qte-common_2.3.10.inc index 35f8df60c8..df00cbf85e 100644 --- a/packages/qte/qte-common_2.3.10.inc +++ b/packages/qte/qte-common_2.3.10.inc @@ -120,7 +120,8 @@ EXTRA_DEFINES_h5000 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_h6300 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_hx2000 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_hx4700 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" -EXTRA_DEFINES_a716 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" +EXTRA_DEFINES_asus716 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" +EXTRA_DEFINES_asus730 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_jornada56x = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_jornada6xx = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_jornada7xx = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" |