Merge nslu2-linux@nslu2-linux.bkbits.net:openembedded

into giantshoulder.com:/home/tom/dev/openslug/openembedded

2005/03/26 17:01:49+01:00 nslu2-linux.org!perlguru
openslug-packages.bb:
  Added CVS

2005/03/26 06:41:32-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/26 15:07:57+01:00 vanille.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into allanon.vanille.de:/home/mickey/openembedded

2005/03/26 15:05:31+01:00 vanille.de!mickeyl
This ChangeSet introduces .inc files for everything Opie related
Fixed and floating versions only differ in PV and SRC_URI, so that's
what gets overridden in the actual .bbfiles. Please watch out for breakage
and catch up if I missed files.
Unfortunately, for now I had to yank the few individually versioned Opie
programs. We will bring individual versions for many (if not all) programs
back eventually.

2005/03/26 14:14:13+01:00 mauricekoster.com!maurice
openslug-packages.bb:
  Added rsync

2005/03/26 04:41:37-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/26 13:06:25+01:00 utwente.nl!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into bitbake.utwente.nl:/home/koen/OE/openembedded

2005/03/26 13:06:05+01:00 utwente.nl!koen
libgphoto2_2.1.5.bb:
  fix deps

2005/03/26 03:41:28-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/26 12:07:48+01:00 uni-frankfurt.de!mickeyl
opie-1.2.0 uses qcop 1.0.1

2005/03/26 12:06:49+01:00 utwente.nl!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into bitbake.utwente.nl:/home/koen/OE/openembedded

2005/03/26 12:03:13+01:00 utwente.nl!koen
libgphoto2_2.1.5.bb, gphoto2_2.1.5.bb: add latest and greatest gphoto2, features improved ptp2 support

2005/03/26 12:02:29+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/03/26 12:00:56+01:00 uni-frankfurt.de!mickeyl
opie-taskbar-1.2.0: catch up with cvs version

2005/03/26 11:51:00+01:00 uni-frankfurt.de!mickeyl
use opie 1.2.0 in familiar 0.8.2

2005/03/26 11:44:24+01:00 uni-frankfurt.de!mickeyl
libqpe-opie-1.2.0: catch up with cvs version

2005/03/25 20:41:33-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/25 23:09:00-05:00 handhelds.org!kergoth
Merge oe-devel@oe-devel.bkbits.net:openembedded
into handhelds.org:/home/kergoth/code/openembedded

2005/03/25 23:08:40-05:00 handhelds.org!kergoth
Add linux-libc-headers 2.6.11.1.

2005/03/25 16:44:54-08:00 kalmiopsis!jbowler
ssh does not allow login as a user unless that user has a password.
Unmodified NSLU2 boxes running OpenSlug only allow login via dropbear
(ssh), therefore a password is required for root (the only user in
the initial setup.)  This changed version of the root-home.patch
adds a password, the password is documented in the README file.

2005/03/25 15:41:35-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/26 00:02:41+01:00 vanille.de!mickeyl
oz.conf: last updates - approaching 3.5.3

2005/03/25 07:41:37-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/25 16:05:02+01:00 uni-frankfurt.de!mickeyl
switch oz-3.5.3 to release mode and update

2005/03/25 04:41:32-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/25 13:29:29+01:00 uni-frankfurt.de!mickeyl
add generic distro configuration and x86 machine configuration

2005/03/25 00:35:27-10:00 (none)!dyoung
change DISTRO_TYPE from = to ?= construct to simplify future testing.

2005/03/24 23:55:09-10:00 (none)!dyoung
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
into builder.(none):/home/dereky/bbroot/openembedded

2005/03/24 23:54:07-10:00 (none)!dereky
openslug-image.bb:
  change base-passwd to version 3.5.9

2005/03/25 01:41:35-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/25 10:37:35+01:00 utwente.nl!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into bitbake.utwente.nl:/home/koen/OE/openembedded

2005/03/25 10:37:05+01:00 utwente.nl!koen
x11_cvs.bb:  fix is upstream now, threads.patch is obsolete now

2005/03/24 17:41:35-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/24 20:29:38-05:00 handhelds.org!kergoth
Add unionfs version 1.0.11.

2005/03/25 09:16:21+10:30 (none)!rwhitby
Fixed the nsswitch.conf for Unslung

2005/03/25 07:38:46+10:30 (none)!rwhitby
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
into home.(none):/home/bitbake/openembedded

2005/03/25 07:38:18+10:30 (none)!rwhitby
Added /etc/nsswitch.conf to Unslung rootfs

2005/03/24 12:41:31-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/24 21:04:24+01:00 zeckescompany.nl!alwin
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into zeckescompany.nl:/home/ral/progs/Zaurus/oe/openembedded

2005/03/24 21:04:07+01:00 zeckescompany.nl!alwin
fixed typo in base-files/c7x0/fstab

2005/03/24 10:41:32-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/24 19:07:47+01:00 utwente.nl!koen
x11_cvs.bb:  add threads.patch

2005/03/24 02:41:28-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/24 11:12:07+01:00 uni-frankfurt.de!mickeyl
base.bbclass: add function base_conditional that serves as an equivalent of the
'?' operator in C. this is very handy to simplify some constructs in our .bb files, i.e. appending things based on if a variable has a
certain value or not. Example Use: SRC_URI_append = '{base_conditional(DISTRO_TYPE,debug,file://allow-root-pw.patch,'',d)}'

2005/03/24 11:01:31+01:00 uni-frankfurt.de!mickeyl
bump timezones to 1.2.0

2005/03/24 01:41:28-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/24 10:17:49+01:00 handhelds.org!CoreDump
Just a test, no changes

2005/03/23 17:41:24-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/24 01:59:38+01:00 handhelds.org!zecke
Libopie2 Visibility changes:
	-There is no difference between 1.2.0 and cvs in regards to visibility
	-Quote the string inside the message
	-Remove include-cvs.pro as it is not needed anymore

2005/03/23 16:41:34-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/24 00:45:36+01:00 handhelds.org!zecke
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into handhelds.org:/home/ich/programming/oe/opie_move

2005/03/24 00:44:26+01:00 handhelds.org!zecke
Opie 1.1.9 -> 1.2.0:
	-increment PV on the _cvs.bb files
	-remove PR from the .bb files

2005/03/23 15:41:25-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/24 00:37:00+01:00 handhelds.org!zecke
Opie 1.1.9 -> 1.2.0:
	Update courtsey python and kergoths super cow power über sed skills

	-mv 1.1.9.bb to 1.2.0.bb
	-remove PR fromm 1.2.0.bb and _cvs.bb
	-bump PV in the _cvs.bb

2005/03/24 00:31:44+01:00 zeckescompany.nl!alwin
corrected corgikeymap

BKrev: 42459626c9gSuz7RwCyChCjKFbynfA

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}"