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

into hyperion.kergoth.com:/home/kergoth/code/packages

2004/11/17 20:31:25+01:00 uni-frankfurt.de!mickeyl
fix iqnotes SRC_URI. i mirrored it since upstream seems gone for good

2004/11/17 20:26:55+01:00 uni-frankfurt.de!mickeyl
Merge bk://openembedded@openembedded.bkbits.net/packages-devel
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2004/11/17 20:26:38+01:00 uni-frankfurt.de!mickeyl
we need opie-packagemanager-cvs for 3.5.2

2004/11/17 20:26:06+01:00 hrw.one.pl!hrw
Merge bk://openembedded@openembedded.bkbits.net/packages-devel
into home.hrw.one.pl:/home/hrw/zaurus/oe/packages

2004/11/17 20:24:23+01:00 hrw.one.pl!hrw
Merge bk://openembedded@openembedded.bkbits.net/packages-devel
into home.hrw.one.pl:/home/hrw/zaurus/oe/packages

2004/11/17 20:24:08+01:00 hrw.one.pl!hrw
added some packages to meta-opie

2004/11/17 20:24:07+01:00 uni-frankfurt.de!mickeyl
opie-collections.inc:
  remove irda-utils, which is already in handhelds-common

2004/11/17 20:20:57+01:00 uni-frankfurt.de!mickeyl
Merge bk://openembedded@openembedded.bkbits.net/packages-devel
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2004/11/17 20:20:47+01:00 uni-frankfurt.de!mickeyl
add openobex-apps and irda-utils to opie base

2004/11/17 20:20:30+01:00 uni-frankfurt.de!mickeyl
fix sound module deps for collie

2004/11/17 20:03:37+01:00 hrw.one.pl!hrw
Merge bk://openembedded@openembedded.bkbits.net/packages-devel
into home.hrw.one.pl:/home/hrw/zaurus/oe/packages

2004/11/17 19:54:34+01:00 hrw.one.pl!hrw
added qpe-vexed 1.3

2004/11/17 12:44:23-06:00 (none)!kergoth
Change the default udevdir to /dev, and kill the long form commandline arguments on the start-stop-daemon calls in udev's startup script.

2004/11/17 17:18:33+01:00 local!hrw
Unbork a few of the glibc PROVIDES bits in glibc 2.3.2 20040726 snapshot

BKrev: 419bb178SWxMJEIF1b5Fr6nkZDZpXg

9 files changed, 30 insertions, 20 deletions

diff --git a/conf/distro/openzaurus-3.5.2.conf b/conf/distro/openzaurus-3.5.2.conf
index 91de0a60a3..2c3a4a92f8 100644
--- a/conf/distro/openzaurus-3.5.2.conf
+++ b/conf/distro/openzaurus-3.5.2.conf
@@ -7,7 +7,7 @@ FEED_URIS_openzaurus = " \
 	libs##http://openzaurus.org/official/unstable/3.5.2/feed/libs/		\
 	console##http://openzaurus.org/official/unstable/3.5.2/feed/console"
 
-CVSDATE = 20041115
+CVSDATE = 20041117
 ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95"
 PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie"
 PREFERRED_PROVIDERS += " virtual/xserver:xserver-kdrive"
@@ -30,6 +30,7 @@ PREFERRED_VERSION_orinoco-modules = "0.13e"
 PREFERRED_VERSION_glibc = "2.3.2+cvs20040726"
 PREFERRED_VERSION_libpng = "1.2.5+1.2.6rc5"
 PREFERRED_VERSION_wlan-ng-modules = "0.2.1pre22"
+PREFERRED_VERSION_bluez-utils-dbus = "2.11"
 
 #
 # Opie
@@ -139,7 +140,7 @@ PREFERRED_VERSION_opie-odict = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-osearch = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-oxygen = "1.0.0"
 PREFERRED_VERSION_opie-oyatzee = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-packagemanager = "${OPIE_VERSION}"
+# PREFERRED_VERSION_opie-packagemanager = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-parashoot = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-performance = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-pickboard = "${OPIE_VERSION}"
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index 2c652fa5e0..ac28317fba 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -10,7 +10,8 @@ BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules sharp-s
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel modutils hostap-modules-cs orinoco-modules \
 sharp-sdmmc-support kernel-module-devinfo kernel-module-gpio kernel-module-net-fd \
 kernel-module-registers kernel-module-sa1100-bi kernel-module-usbdcore \
-kernel-module-usbdmonitor kernel-module-collie-ssp kernel-module-collie-tc35143af" 
+kernel-module-usbdmonitor"
+# kernel-module-collie-ssp kernel-module-collie-tc35143af" 
 
 # This is needed for the ramdisk script to work
 BOOTSTRAP_EXTRA_DEPENDS  += "e2fsprogs"
diff --git a/glibc/glibc_2.3.2+cvs20040726.oe b/glibc/glibc_2.3.2+cvs20040726.oe
index a476a74e95..5f70050695 100644
--- a/glibc/glibc_2.3.2+cvs20040726.oe
+++ b/glibc/glibc_2.3.2+cvs20040726.oe
@@ -31,6 +31,7 @@ PACKAGES = "glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-d
 
 # nptl needs unwind support in gcc, which can't be built without glibc.
 PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}"
+PROVIDES += "virtual/libintl virtual/libiconv"
 DEPENDS = "patcher-native ${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers"
 INHIBIT_DEFAULT_DEPS = "1"
 
diff --git a/iqnotes/iqnotes_2.0.2.oe b/iqnotes/iqnotes_2.0.2.oe
index fe35f3eee3..80c735b4f9 100644
--- a/iqnotes/iqnotes_2.0.2.oe
+++ b/iqnotes/iqnotes_2.0.2.oe
@@ -6,9 +6,8 @@ SECTION = "opie/applications"
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "virtual/libqpe"
-MAINTAINER = "Peter Vrabel <kybu@kybu.sk>"
 
-SRC_URI = "http://iqnotes.kybu.sk/iqnotes-2.0.2-src.tar.bz2 \
+SRC_URI = "http://www.vanille.de/mirror/iqnotes-2.0.2-src.tar.bz2 \
            file://md5.diff;patch=1"
 S = "${WORKDIR}/iqnotes/iqnotes"
 
diff --git a/meta/meta-opie.oe b/meta/meta-opie.oe
index 9feca28d77..bc2af205e9 100644
--- a/meta/meta-opie.oe
+++ b/meta/meta-opie.oe
@@ -2,20 +2,21 @@ DESCRIPTION = "Meta-package for Opie and QPE"
 MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 SECTION = "opie/base"
 ALLOW_EMPTY = 1
-PR = "r10"
+PR = "r11"
 PACKAGE_ARCH = "all"
 LICENSE = "MIT"
 
 PACKAGES = "opie task-opie-applets task-opie-applications task-opie-base \
-            task-opie-decorations task-opie-games task-opie-inputmethods \
-		    task-opie-multimedia task-opie-pim task-opie-settings \
-		    task-opie-styles task-opie-today task-opie-bluetooth \
-			task-opie-wlan \
-			task-qpe-applets task-qpe-games task-qpe-inputmethods \
-			task-qpe-multimedia task-qpe-emulators task-qpe-applications \
-			task-qpe-fonts"
+	task-opie-decorations task-opie-games task-opie-inputmethods \
+	task-opie-multimedia task-opie-pim task-opie-settings \
+	task-opie-styles task-opie-today task-opie-bluetooth \
+	task-opie-wlan \
+	task-qpe-applets task-qpe-games task-qpe-inputmethods \
+	task-qpe-multimedia task-qpe-emulators task-qpe-applications \
+	task-qpe-fonts task-qpe-settings"
 
 DEPENDS = "\
+libopieobex0 \
 opie-examples-python \
 opie-freetype \
 opie-help-en \
@@ -188,6 +189,7 @@ task-qpe-games = "\
 aliens \
 aliens-qt \
 atomic \
+billiardz \
 brickout \
 checkers \
 crossword \
@@ -210,6 +212,7 @@ powermanga \
 prboom \
 puzz-le \
 qfish2 \
+qpe-vexed \
 qmatrix \
 rott \
 scummvm \
@@ -380,3 +383,8 @@ qpf-bitstream-vera \
 "
 DEPENDS += " ${task-qpe-fonts}"
 
+task-qpe-settings = "\
+qclockchange \
+"
+RDEPENDS_task-qpe-settings += "${task-qpe-settings}"
+DEPENDS += " ${task-qpe-settings}"
diff --git a/meta/opie-collections.inc b/meta/opie-collections.inc
index f0d05d6da2..f15e4f78ff 100644
--- a/meta/opie-collections.inc
+++ b/meta/opie-collections.inc
@@ -37,8 +37,8 @@ OPIE_BASE_DECOS = "opie-deco-flat opie-deco-liquid opie-deco-polished"
 
 OPIE_BASE_STYLES = "opie-style-flat opie-style-liquid opie-style-fresh opie-style-metal opie-style-web opie-style-phase"
 
-OPIE_BASE_DEPENDS = "ipkg ntp bluez-utils-nodbus"
-OPIE_BASE_RDEPENDS = "ntpdate opie-handwriting-classicset bluez-utils-nodbus"
+OPIE_BASE_DEPENDS = "ipkg ntp bluez-utils-nodbus irda-utils openobex-apps"
+OPIE_BASE_RDEPENDS = "ntpdate opie-handwriting-classicset bluez-utils-nodbus openobex-apps libopieobex"
 
 #
 # Additional things for a standard 16MB distribution
diff --git a/qpe-vexed/qpe-vexed_1.3.oe b/qpe-vexed/qpe-vexed_1.3.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/qpe-vexed/qpe-vexed_1.3.oe
diff --git a/udev/udev-042/init b/udev/udev-042/init
index 4e31881274..e6b2986f89 100644
--- a/udev/udev-042/init
+++ b/udev/udev-042/init
@@ -99,7 +99,7 @@ case "$1" in
     echo "done."
     ;;
   stop)
-    start-stop-daemon --stop --exec /sbin/udevd --oknodo --quiet
+    start-stop-daemon -K -x /sbin/udevd 
     echo -n "Unmounting $udev_root..."
     # unmounting with -l should never fail
     if umount -l $udev_root; then
@@ -146,7 +146,7 @@ case "$1" in
 #    /etc/init.d/mountvirtfs start
     ;;
   stop)
-    start-stop-daemon --stop --exec /sbin/udevd --oknodo --quiet
+    start-stop-daemon -K -x /sbin/udevd 
     unmount_devpts
     echo -n "Unmounting /dev..."
     # unmounting with -l should never fail
@@ -159,7 +159,7 @@ case "$1" in
     fi
     ;;
   restart|force-reload)
-    start-stop-daemon --stop --exec /sbin/udevd --oknodo --quiet
+    start-stop-daemon -K -x /sbin/udevd 
     echo -n "Recreating device nodes..."
     ACTION=add
     $UDEVSTART
diff --git a/udev/udev_042.oe b/udev/udev_042.oe
index 01209744d3..79ea9d5674 100644
--- a/udev/udev_042.oe
+++ b/udev/udev_042.oe
@@ -1,7 +1,7 @@
 DESCRIPTION = "udev is a program which dynamically creates and removes device nodes from \
 /dev/. It responds to /sbin/hotplug device events and requires a 2.6 kernel."
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 	   file://flags.patch;patch=1 \
@@ -15,7 +15,7 @@ INITSCRIPT_NAME = "udev"
 INITSCRIPT_PARAMS = "start 03 S ."
 
 export HOSTCC = "${BUILD_CC}"
-export udevdir ?= "/udev"
+export udevdir ?= "/dev"
 export usrbindir := "${bindir}"
 export usrsbindir := "${sbindir}"
 export etcdir = "${sysconfdir}"