merge of '7370b7cb2be2fee991acda2f9f3376b3f7b46a68'

     and '8b47107ec4e62cba68868b4e79de81c71361255a'

8 files changed, 44 insertions, 33 deletions

diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb
index 00669e48de..55541872fa 100644
--- a/packages/alsa/alsa-state.bb
+++ b/packages/alsa/alsa-state.bb
@@ -1,20 +1,19 @@
-#! /bin/sh
-#
 # Copyright Matthias Hentges <devel@hentges.net> (c) 2007
 # License: MIT (see http://www.opensource.org/licenses/mit-license.php
 #               for a copy of the license)
 #
 # Filename: alsa-state.bb
-# Date: 20070308 (YMD)
 
 DESCRIPTION = "Default ALSA configuration"
 LICENSE = "GPL"
 RRECOMMENDS_alsa-state = "alsa-states"
-PV = "0.0.4"
-PR = "r3"
+PV = "0.1.0"
+PR = "r0"
 
-SRC_URI = "file://asound.state \
-           file://alsa-state "
+SRC_URI = " \
+  file://asoundrc \
+  file://asound.state \
+  file://alsa-state "
 
 SRC_URI_append_fic-gta01 = " \
   file://capturehandset.state \
@@ -33,11 +32,12 @@ do_install() {
     install -d ${D}${sysconfdir}/init.d
     install -m 0755 ${WORKDIR}/alsa-state ${D}${sysconfdir}/init.d
 
+	install -m 0644 ${WORKDIR}/asoundrc ${D}${sysconfdir}
 	install -m 0644 ${WORKDIR}/*.state ${D}${sysconfdir}
 }
 
 PACKAGES += "alsa-states"
-FILES_${PN} = "${sysconfdir}/init.d"
+FILES_${PN} = "${sysconfdir}/init.d ${sysconfdir}/asoundrc"
 FILES_alsa-states = "${sysconfdir}/*.state"
 PACKAGE_ARCH_${PN} = "all"
 PACKAGE_ARCH_alsa-states = "${MACHINE}"
diff --git a/packages/alsa/alsa-state/asoundrc b/packages/alsa/alsa-state/asoundrc
new file mode 100644
index 0000000000..bc038e3e73
--- /dev/null
+++ b/packages/alsa/alsa-state/asoundrc
@@ -0,0 +1,12 @@
+#
+# simple dmix configuration
+#
+pcm.dsp0 {
+    type plug
+    slave.pcm "dmix"
+}
+
+ctl.mixer0 {
+    type hw
+    card 0
+}
diff --git a/packages/gpicview/.mtn2git_empty b/packages/gpicview/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gpicview/.mtn2git_empty
diff --git a/packages/gpicview/gpicview_0.1.5.bb b/packages/gpicview/gpicview_0.1.5.bb
new file mode 100644
index 0000000000..14248ec14f
--- /dev/null
+++ b/packages/gpicview/gpicview_0.1.5.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "Extremely lightweight and fast with low memory usage"
+LICENSE = "GPL"
+
+DEPENDS = "gtk+"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/${PN}-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+
diff --git a/packages/meta/meta-sdk-gpe.bb b/packages/meta/meta-sdk-gpe.bb
index 7b5ac70f48..a91f3192c7 100644
--- a/packages/meta/meta-sdk-gpe.bb
+++ b/packages/meta/meta-sdk-gpe.bb
@@ -26,16 +26,11 @@ TARGET_INSTALL = "\
 
 RDEPENDS = "${TARGET_INSTALL} ${HOST_INSTALL}"
 
-sdk_do_indexes () {
-        set -ex
-        rootfs_ipk_do_indexes
-        sdk_ipk_do_indexes
-        set +ex
-}
-
 do_populate_sdk() {
-        sdk_do_indexes
- 
+	set -ex
+	package_update_index_ipk
+	set +ex
+
 	rm -rf ${SDK_OUTPUT}
 	mkdir -p ${SDK_OUTPUT}
 
diff --git a/packages/meta/meta-sdk-sbox-gpe.bb b/packages/meta/meta-sdk-sbox-gpe.bb
index c9b7737af2..28317c03fe 100644
--- a/packages/meta/meta-sdk-sbox-gpe.bb
+++ b/packages/meta/meta-sdk-sbox-gpe.bb
@@ -29,10 +29,9 @@ RDEPENDS = "${TARGET_INSTALL}"
 IPKG_TARGET = "ipkg-cl -f ${SDK_DIR}/ipkg-target.conf -o ${SDK_OUTPUT}/${prefix}"
 
 do_populate_sdk() {
-
-        set -ex
-        rootfs_ipk_do_indexes
-        set +ex
+	set -ex
+	package_update_index_ipk
+	set +ex
 
 	rm -rf ${SDK_OUTPUT}
 	mkdir -p ${SDK_OUTPUT}
diff --git a/packages/meta/meta-sdk-sbox.bb b/packages/meta/meta-sdk-sbox.bb
index c0cb27d404..13c9612a74 100644
--- a/packages/meta/meta-sdk-sbox.bb
+++ b/packages/meta/meta-sdk-sbox.bb
@@ -25,10 +25,9 @@ RDEPENDS = "${TARGET_INSTALL}"
 IPKG_TARGET = "ipkg-cl -f ${SDK_DIR}/ipkg-target.conf -o ${SDK_OUTPUT}/${prefix}"
 
 do_populate_sdk() {
-
-        set -ex
-        rootfs_ipk_do_indexes
-        set +ex
+	set -ex
+	package_update_index_ipk
+	set +ex
 
 	rm -rf ${SDK_OUTPUT}
 	mkdir -p ${SDK_OUTPUT}
diff --git a/packages/meta/meta-sdk.bb b/packages/meta/meta-sdk.bb
index cc163448ea..47796603db 100644
--- a/packages/meta/meta-sdk.bb
+++ b/packages/meta/meta-sdk.bb
@@ -23,15 +23,11 @@ TARGET_INSTALL = "\
 
 RDEPENDS = "${TARGET_INSTALL} ${HOST_INSTALL}"
 
-sdk_do_indexes () {
-        set -ex
-        rootfs_ipk_do_indexes
-        sdk_ipk_do_indexes
-        set +ex
-}
-
 do_populate_sdk() {
-        sdk_do_indexes
+	set -ex
+	package_update_index_ipk
+	set +ex
+
         echo "Creating host.conf..."
 
 	rm -rf ${SDK_OUTPUT}