summaryrefslogtreecommitdiff
path: root/packages/opie-taskbar
diff options
context:
space:
mode:
Diffstat (limited to 'packages/opie-taskbar')
-rw-r--r--packages/opie-taskbar/opie-taskbar.inc (renamed from packages/opie-taskbar/opie-taskbar/server.pro-1.1.9)0
-rw-r--r--packages/opie-taskbar/opie-taskbar_1.1.9.bb103
-rw-r--r--packages/opie-taskbar/opie-taskbar_1.2.0.bb0
-rw-r--r--packages/opie-taskbar/opie-taskbar_cvs.bb103
4 files changed, 4 insertions, 202 deletions
diff --git a/packages/opie-taskbar/opie-taskbar/server.pro-1.1.9 b/packages/opie-taskbar/opie-taskbar.inc
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-taskbar/opie-taskbar/server.pro-1.1.9
+++ b/packages/opie-taskbar/opie-taskbar.inc
diff --git a/packages/opie-taskbar/opie-taskbar_1.1.9.bb b/packages/opie-taskbar/opie-taskbar_1.1.9.bb
deleted file mode 100644
index 751a2e46cc..0000000000
--- a/packages/opie-taskbar/opie-taskbar_1.1.9.bb
+++ /dev/null
@@ -1,103 +0,0 @@
-DESCRIPTION = "Opie Launcher and Taskbar"
-SECTION = "opie/base"
-PRIORITY = "optional"
-LICENSE = "GPL"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-DEPENDS = "opie-libqrsync opie-qss"
-PR = "r3"
-APPNAME = "qpe"
-
-SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \
- ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \
- ${HANDHELDS_CVS};tag=${TAG};module=opie/core/launcher \
- ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
- ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
- ${HANDHELDS_CVS};tag=${TAG};module=opie/root \
- ${HANDHELDS_CVS};tag=${TAG};module=opie/etc \
- file://nomax.patch;patch=1;pnum=3 \
- file://server.pro-1.1.9 \
- file://opie-reorgfiles \
- file://opie \
- file://qpe.conf \
- file://opie_defaults"
-
-S = "${WORKDIR}/launcher"
-
-CXXFLAGS_append_c7x0 = " -DOPIE_NO_WINDOWED "
-CXXFLAGS_append_tosa = " -DOPIE_NO_WINDOWED "
-
-# 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_c7x0 = "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_c7x0 = "-640x480"
-# PIXMAP_SIZE_tosa = "-640x480"
-PIXMAP_SIZE_simpad = "-800x600"
-
-inherit opie update-rc.d
-
-INITSCRIPT_NAME = "opie"
-INITSCRIPT_PARAMS = "defaults 99"
-
-do_configure_prepend() {
- ln -s ${WORKDIR}/calibrate ${S}/calibrate
- ln -s ${WORKDIR}/mediummount ${S}/mediummount
- install -m 0644 ${WORKDIR}/server.pro-1.1.9 ${S}/server.pro
-}
-
-do_stage() {
- install obexinterface.h ${STAGING_INCDIR}/
-
-}
-
-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
- for i in ${SECTIONS}
- do
- install -d ${D}${palmtopdir}/apps/$i/
- install -m 0644 ${WORKDIR}/apps/$i/.directory ${D}${palmtopdir}/apps/$i/
- done
- install -d ${D}${palmtopdir}/pics/launcher
- install -d ${D}${palmtopdir}/pics/logo
- install -d ${D}${palmtopdir}/pics/RoH/star/
- install -d ${D}${sysconfdir}/init.d
- install -d ${D}${sysconfdir}/profile.d
- install -d ${D}${palmtopdir}/etc/colors
- install -d ${D}${palmtopdir}/etc/skel
-
- install -m 0755 ${S}/qpe ${D}${palmtopdir}/bin/qpe
- 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}/opie_defaults ${D}${sysconfdir}/profile.d/
-
- 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}/pics/RoH/star/*.png ${D}${palmtopdir}/pics/RoH/star/
-
- install -m 0644 ${WORKDIR}/etc/colors/*.scheme ${D}${palmtopdir}/etc/colors/
- install -m 0644 ${WORKDIR}/etc/mime.types ${D}${sysconfdir}/
-
- install -m 0755 ${WORKDIR}/opie ${D}${sysconfdir}/init.d/opie
- install -m 0644 ${WORKDIR}/qpe.conf ${D}${palmtopdir}/etc/skel/
-
- install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}${palmtopdir}/pics/
- install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}${palmtopdir}/pics/
-}
-
-FILES_opie-taskbar_append = " /etc /etc/profile.d ${palmtopdir}/apps ${palmtopdir}/pics"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/packages/opie-taskbar/opie-taskbar_1.2.0.bb b/packages/opie-taskbar/opie-taskbar_1.2.0.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-taskbar/opie-taskbar_1.2.0.bb
diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb
index d4387bbb72..fe68d2a13c 100644
--- a/packages/opie-taskbar/opie-taskbar_cvs.bb
+++ b/packages/opie-taskbar/opie-taskbar_cvs.bb
@@ -1,12 +1,7 @@
-DESCRIPTION = "Opie Launcher and Taskbar"
-SECTION = "opie/base"
-PRIORITY = "optional"
-LICENSE = "GPL"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-DEPENDS = "opie-libqrsync opie-qss"
-PV = "1.1.9+cvs-${CVSDATE}"
-PR = "r5"
-APPNAME = "qpe"
+include ${PN}.inc
+
+PV = "1.2.0+cvs-${CVSDATE}"
+PR = "r0"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \
${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \
@@ -22,93 +17,3 @@ SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \
file://qpe.conf \
file://locale.conf \
file://opie_defaults"
-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_c7x0 = "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_c7x0 = "-640x480"
-# PIXMAP_SIZE_tosa = "-640x480"
-PIXMAP_SIZE_simpad = "-800x600"
-
-inherit opie update-rc.d
-
-INITSCRIPT_NAME = "opie"
-INITSCRIPT_PARAMS = "defaults 99"
-
-do_configure_prepend() {
- ln -s ${WORKDIR}/calibrate ${S}/calibrate
- ln -s ${WORKDIR}/mediummount ${S}/mediummount
- install -m 0644 ${WORKDIR}/server.pro ${S}/server.pro
-}
-
-do_stage() {
- install obexinterface.h ${STAGING_INCDIR}/
-
-}
-
-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
- for i in ${SECTIONS}
- do
- install -d ${D}${palmtopdir}/apps/$i/
- install -m 0644 ${WORKDIR}/apps/$i/.directory ${D}${palmtopdir}/apps/$i/
- done
- install -d ${D}${palmtopdir}/pics/launcher
- install -d ${D}${palmtopdir}/pics/logo
- install -d ${D}${palmtopdir}/pics/RoH/star/
- install -d ${D}${sysconfdir}/init.d
- install -d ${D}${sysconfdir}/profile.d
- install -d ${D}${palmtopdir}/etc/colors
- install -d ${D}${palmtopdir}/etc/skel
-
- install -m 0755 ${S}/qpe ${D}${palmtopdir}/bin/qpe
- 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}/opie_defaults ${D}${sysconfdir}/profile.d/
-
- 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}/pics/RoH/star/*.png ${D}${palmtopdir}/pics/RoH/star/
-
- install -m 0644 ${WORKDIR}/etc/colors/*.scheme ${D}${palmtopdir}/etc/colors/
- install -m 0644 ${WORKDIR}/etc/mime.types ${D}${sysconfdir}/
-
- install -m 0755 ${WORKDIR}/opie ${D}${sysconfdir}/init.d/opie
- install -m 0644 ${WORKDIR}/qpe.conf ${D}${palmtopdir}/etc/skel/
-
- if [ -s ${WORKDIR}/locale.conf ]; then
- install -m 0644 ${WORKDIR}/locale.conf ${D}${palmtopdir}/etc/skel/
- fi
-
- install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}${palmtopdir}/pics/
- install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}${palmtopdir}/pics/
-}
-
-updatercd_postinst_ramses() {
-if test "x$D" != "x"; then
- D="-r $D"
-else
- D="" # do not autostart at installation time
-fi
-update-rc.d $D ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS}
-}
-
-FILES_opie-taskbar_append = " /etc ${palmtopdir}/apps ${palmtopdir}/pics"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"