diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-09-13 22:40:21 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-09-13 22:40:21 +0000 |
| commit | c65af0edd12140dbc9f3422c2054ba6f7e0bdea9 (patch) | |
| tree | c195dc1d36c2e620720aa5ff3483af76a265e2f8 /opie-taskbar | |
| parent | cbea85ebff006c7de640b412a8ef01c5f5d47094 (diff) | |
Merge openembedded@openembedded.bkbits.net:packages
into handhelds.org:/home/kergoth/code/oe/packages
2004/09/14 00:14:43+02:00 uni-frankfurt.de!mickeyl
Merge bk://openembedded@openembedded.bkbits.net/packages
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages
2004/09/14 00:14:24+02:00 uni-frankfurt.de!mickeyl
upgrade patcher to 20040913. patcher has a nifty new feature (based on my featurewish, thanks Holger). If you supply -R, it automatically refreshes a patch when line numbers changed (previously it only notified the user about that). The developer can then copy the patches back to the repository once in a while to ease upgrading or prevent unnecessary manual merges when upstream changes gradually.
2004/09/13 21:37:43+02:00 uni-frankfurt.de!mickeyl
enable a couple of extra modules in defconfig-tosa
BKrev: 414621d567thj7D0rCJV-paRni1fOQ
Diffstat (limited to 'opie-taskbar')
| -rw-r--r-- | opie-taskbar/opie-taskbar_cvs.oe | 37 |
1 files changed, 27 insertions, 10 deletions
diff --git a/opie-taskbar/opie-taskbar_cvs.oe b/opie-taskbar/opie-taskbar_cvs.oe index eccb32d31c..35e34a57ab 100644 --- a/opie-taskbar/opie-taskbar_cvs.oe +++ b/opie-taskbar/opie-taskbar_cvs.oe @@ -6,7 +6,7 @@ MAINTAINER = "Team Opie <opie@handhelds.org>" DEPENDS = "opie-libqrsync" PV = "1.1.5-cvs-${CVSDATE}" APPNAME = "qpe" -PR = "r12" +PR = "r13" SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/apps/calibrate \ cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/settings/mediummount \ @@ -23,12 +23,20 @@ SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/apps/cal S = "${WORKDIR}/launcher" # Caps/Numlock icons for devices with keyboard -EXTRA_QMAKEVARS_POST_append_collie = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" -EXTRA_QMAKEVARS_POST_append_poodle = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" -EXTRA_QMAKEVARS_POST_append_shepherd = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" -EXTRA_QMAKEVARS_POST_append_corgi = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" -EXTRA_QMAKEVARS_POST_append_husky = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" -EXTRA_QMAKEVARS_POST_append_tosa = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" +EXTRA_QMAKEVARS_POST_append_collie = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" +EXTRA_QMAKEVARS_POST_append_poodle = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" +EXTRA_QMAKEVARS_POST_append_shepherd = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" +EXTRA_QMAKEVARS_POST_append_corgi = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" +EXTRA_QMAKEVARS_POST_append_husky = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" +EXTRA_QMAKEVARS_POST_append_tosa = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" + +# Wallpaper and welcome splash +PIXMAP_SIZE = "" +PIXMAP_SIZE_shepherd = "-640x480" +PIXMAP_SIZE_corgi = "-640x480" +PIXMAP_SIZE_husky = "-640x480" +PIXMAP_SIZE_tosa = "-640x480" +PIXMAP_SIZE_simpad = "-800x600" inherit opie update-rc.d @@ -47,6 +55,7 @@ do_stage() { } SECTIONS = "1Pim Applications Examples Games Opie-SH Python Settings" +PICS = "opielogo32x32.png start_button.png new_wait.png opielogo16x16.png sidebar.png" do_install() { install -d ${D}/${palmtopdir}/bin @@ -65,16 +74,24 @@ do_install() { install -m 0755 ${WORKDIR}/opie-reorgfiles ${D}/${palmtopdir}/bin/ install -m 0644 ${WORKDIR}/apps/Settings/calibrate.desktop ${D}/${palmtopdir}/apps/Settings/ install -m 0644 ${WORKDIR}/apps/Settings/quit.desktop ${D}/${palmtopdir}/apps/Settings/ - install -m 0644 ${WORKDIR}/pics/launcher/*.* ${D}/${palmtopdir}/pics/launcher/ + + for p in ${PICS} + do + install -m 0644 ${WORKDIR}/pics/launcher/$p ${D}/${palmtopdir}/pics/launcher/$p + done + install -m 0644 ${WORKDIR}/pics/launcher/firstuse${PIXMAP_SIZE}.jpg ${D}/${palmtopdir}/pics/launcher/firstuse.jpg + install -m 0644 ${WORKDIR}/pics/launcher/opie-background${PIXMAP_SIZE}.jpg ${D}/${palmtopdir}/pics/launcher/opie-background.jpg + install -m 0644 ${WORKDIR}/pics/logo/*.* ${D}/${palmtopdir}/pics/logo/ + install -m 0644 ${WORKDIR}/etc/colors/*.scheme ${D}/${palmtopdir}/etc/colors/ install -m 0644 ${WORKDIR}/etc/mime.types ${D}/etc/ + install -m 0755 ${WORKDIR}/opie ${D}/etc/init.d/opie install -m 0644 ${WORKDIR}/qpe.conf ${D}/${palmtopdir}/etc/skel/ - } -#this two should be installed only on devices with keyboard +# These two should be installed only on devices with keyboard do_install_append_collie () { install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/ install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/ |