merge of '64150943417ebf98926c87bea03e27789cb841df'

     and 'af98a46d791cb8616b2641e2e57ee9de1d5e94c5'

8 files changed, 17 insertions, 16 deletions

diff --git a/classes/qmake-base.bbclass b/classes/qmake-base.bbclass
index 5ca3ee2904..09694e97b8 100644
--- a/classes/qmake-base.bbclass
+++ b/classes/qmake-base.bbclass
@@ -23,7 +23,7 @@ export OE_QMAKE_RPATH="-Wl,-rpath-link,"
 # default to qte2 via bb.conf, inherit qt3x11 to configure for qt3x11
 export OE_QMAKE_INCDIR_QT="${QTDIR}/include"
 export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib"
-export OE_QMAKE_LIBS_QT="${QT_LIBRARY}"
+export OE_QMAKE_LIBS_QT="qte"
 export OE_QMAKE_LIBS_X11=""
 
 oe_qmake_mkspecs () {
diff --git a/conf/sanity.conf b/conf/sanity.conf
index 58313f27ca..3a1dec9059 100644
--- a/conf/sanity.conf
+++ b/conf/sanity.conf
@@ -3,6 +3,6 @@
 # See sanity.bbclass
 #
 # Expert users can confirm their sanity with "touch conf/sanity.conf"
-BB_MIN_VERSION = "1.6.2"
+BB_MIN_VERSION = "1.6.8"
 INHERIT += "sanity"
 
diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb
index 37068780fd..74c4c33711 100644
--- a/packages/base-files/base-files_3.0.14.bb
+++ b/packages/base-files/base-files_3.0.14.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Miscellaneous files for the base system."
 SECTION = "base"
 PRIORITY = "required"
-PR = "r66"
+PR = "r68"
 LICENSE = "GPL"
 
 SRC_URI = " \
@@ -80,9 +80,11 @@ do_install () {
 		echo ${hostname} > ${D}${sysconfdir}/hostname
 	fi
 
+        install -m 644 ${WORKDIR}/issue*  ${D}${sysconfdir}  
+
         if [ -n "${DISTRO_NAME}" ]; then
-		echo -n "${DISTRO_NAME} " > ${D}${sysconfdir}/issue
-		echo -n "${DISTRO_NAME} " > ${D}${sysconfdir}/issue.net
+		echo -n "${DISTRO_NAME} " >> ${D}${sysconfdir}/issue
+		echo -n "${DISTRO_NAME} " >> ${D}${sysconfdir}/issue.net
 		if [ -n "${DISTRO_VERSION}" ]; then
 			echo -n "${DISTRO_VERSION} " >> ${D}${sysconfdir}/issue
 			echo -n "${DISTRO_VERSION} " >> ${D}${sysconfdir}/issue.net
diff --git a/packages/gspcav1/gspcav1_20070508.bb b/packages/gspcav1/gspcav1_20070508.bb
index 86cb1010df..e1fc443d36 100644
--- a/packages/gspcav1/gspcav1_20070508.bb
+++ b/packages/gspcav1/gspcav1_20070508.bb
@@ -4,7 +4,9 @@ PRIORITY = "optional"
 SECTION = "kernel/modules"
 LICENSE = "GPL"
 
-SRC_URI = "http://mxhaard.free.fr/spca50x/Download/${PN}-${PV}.tar.gz \
+PR = "r1"
+
+SRC_URI = "http://mxhaard.free.fr/spca50x/Download/oldrelease/${PN}-${PV}.tar.gz \
            file://Makefile.patch;patch=1 \
 	   file://MS.patch;patch=1"
 
diff --git a/packages/images/angstrom-minimal-image.bb b/packages/images/angstrom-minimal-image.bb
index 90f46a1e01..c79bff25e2 100644
--- a/packages/images/angstrom-minimal-image.bb
+++ b/packages/images/angstrom-minimal-image.bb
@@ -1,15 +1,11 @@
 #Angstrom minimalist image
 #gives you a small images with ssh access
 LICENSE = "MIT"
-PR = "r0"
+PR = "r1"
 
 ANGSTROM_EXTRA_INSTALL ?= ""
 DISTRO_SSH_DAEMON ?= "dropbear"
 
-DEPENDS = "task-base \
-           ${DISTRO_SSH_DAEMON} \
-	  "
-
 RDEPENDS = "task-boot \
             ${DISTRO_SSH_DAEMON} \
 	   "
diff --git a/packages/pulseaudio/pulse.inc b/packages/pulseaudio/pulse.inc
index c8cb6dc6b5..d4a9c5ef54 100644
--- a/packages/pulseaudio/pulse.inc
+++ b/packages/pulseaudio/pulse.inc
@@ -8,7 +8,7 @@ DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool"
 # optional
 DEPENDS += "alsa-lib"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz"
 
@@ -71,7 +71,7 @@ CONFFILES_pulseaudio-server = "\
 		       ${sysconfdir}/pulse/daemon.conf \
 		       ${sysconfdir}/pulse/client.conf \
 		       "
-pkg_postinst_${PN}-bin() {
+pkg_postinst_libppulse() {
 if test "x$D" != "x"; then
         exit 1
 else
@@ -83,7 +83,7 @@ else
 fi
 }
 
-pkg_postrm${PN}-bin() {
+pkg_postrm_libpulse() {
 if test "x$D" != "x"; then
         exit 1
 else
diff --git a/packages/pulseaudio/pulseaudio_0.9.5.bb b/packages/pulseaudio/pulseaudio_0.9.5.bb
index dda2353827..3a4ab46cae 100644
--- a/packages/pulseaudio/pulseaudio_0.9.5.bb
+++ b/packages/pulseaudio/pulseaudio_0.9.5.bb
@@ -1,3 +1,3 @@
 require pulse.inc
 
-PR  = "r9"
+PR  = "r10"
diff --git a/packages/usb-gadget-mode/usb-gadget-mode.bb b/packages/usb-gadget-mode/usb-gadget-mode.bb
index f27be3e427..ae1f08b5ea 100644
--- a/packages/usb-gadget-mode/usb-gadget-mode.bb
+++ b/packages/usb-gadget-mode/usb-gadget-mode.bb
@@ -8,12 +8,13 @@
 # Date: 20070606 (YMD)
 
 DESCRIPTION = "Manage the default USB gadget mode"
+SECTION = "console/network"
 LICENSE = "GPL"
 
 ######################################################################################
 
 PV = "0.0.1"
-PR = "r2"
+PR = "r3"
 
 ######################################################################################