module-init-tools: prefer 3.2.1 over 3.2-pre4

- adds DEFAULT_PREFERENCE="-1" to the 3.2-pre4, see bug #498

15 files changed, 21 insertions, 17 deletions

diff --git a/packages/bluez/bluez-utils-dbus_2.21.bb b/packages/bluez/bluez-utils-dbus_2.21.bb
index 58b2725143..abe6dc2656 100644
--- a/packages/bluez/bluez-utils-dbus_2.21.bb
+++ b/packages/bluez/bluez-utils-dbus_2.21.bb
@@ -3,7 +3,6 @@ include bluez-utils.inc
 PR = "r2"
 
 DEPENDS += "dbus"
-SRC_URI += "file://dbus.patch;patch=1 \
-	    file://smash.patch;patch=1 \
+SRC_URI += "file://smash.patch;patch=1 \
 	    file://hcid-alignment-fix.patch;patch=1"
 EXTRA_OECONF += "--with-dbus"
diff --git a/packages/bluez/bluez-utils.inc b/packages/bluez/bluez-utils.inc
index 07dc5d6125..a4652b17ab 100644
--- a/packages/bluez/bluez-utils.inc
+++ b/packages/bluez/bluez-utils.inc
@@ -4,11 +4,13 @@ PRIORITY = "optional"
 DEPENDS = "bluez-libs-${PV} pcmcia-cs"
 RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils"
 LICENSE = "GPL"
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
 	file://base.patch;patch=1 \
 	file://blueboxes.patch;patch=1 \
+	file://hciattach-ti-bts.patch;patch=1 \
+	file://TIInit_3.2.26.bts \
 	file://hcid.conf \
 	file://bluetooth.default \
 	file://bluetooth.conf "
@@ -40,6 +42,7 @@ do_install_append() {
 	chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig
 	chmod 755 ${D}${sysconfdir}/pcmcia/bluetooth
 	install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/
+	install -m 0644 ${WORKDIR}/TIInit_3.2.26.bts ${D}${sysconfdir}/bluetooth/
 	install -m 0644 ${WORKDIR}/bluetooth.default ${D}${sysconfdir}/default/bluetooth
 	cat ${WORKDIR}/bluetooth.conf >> ${D}${sysconfdir}/pcmcia/bluetooth.conf
 }
diff --git a/packages/dbus/dbus_0.50.bb b/packages/dbus/dbus_0.50.bb
index a1d19897cc..e827457371 100644
--- a/packages/dbus/dbus_0.50.bb
+++ b/packages/dbus/dbus_0.50.bb
@@ -2,7 +2,6 @@ include dbus_${PV}.inc
 
 
 DEPENDS = "expat glib-2.0 virtual/libintl dbus-native"
-DEFAULT_PREFERENCE = "-1"
 SRC_URI_EXTRA = "file://no-introspect.patch;patch=1 file://no-bindings.patch;patch=1"
 
 FILES_${PN} += "${bindir}/dbus-daemon"
diff --git a/packages/dbus/dbus_0.50.inc b/packages/dbus/dbus_0.50.inc
index 094a9b68d6..70546ed5b1 100644
--- a/packages/dbus/dbus_0.50.inc
+++ b/packages/dbus/dbus_0.50.inc
@@ -4,7 +4,6 @@ HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 DESCRIPTION = "message bus system for applications to talk to one another"
 LICENSE = "GPL"
 DEPENDS = "expat glib-2.0 virtual/libintl"
-DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \
 	   file://cross.patch;patch=1 \
diff --git a/packages/gpe-autostarter/gpe-autostarter_0.11.bb b/packages/gpe-autostarter/gpe-autostarter_0.11.bb
index 555134889b..e56d91f620 100644
--- a/packages/gpe-autostarter/gpe-autostarter_0.11.bb
+++ b/packages/gpe-autostarter/gpe-autostarter_0.11.bb
@@ -4,3 +4,5 @@ RDEPENDS = "hotplug-dbus"
 LICENSE = "GPL"
 
 inherit gpe
+
+SRC_URI += "file://dbus-new-api.patch;patch=1"
diff --git a/packages/gpe-beam/gpe-beam_0.2.8.bb b/packages/gpe-beam/gpe-beam_0.2.8.bb
index d55cd6db60..25a6b41b15 100644
--- a/packages/gpe-beam/gpe-beam_0.2.8.bb
+++ b/packages/gpe-beam/gpe-beam_0.2.8.bb
@@ -10,3 +10,5 @@ PRIORITY = "optional"
 MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
 LICENSE = "GPL"
 
+SRC_URI += "file://dbus-new-api.patch;patch=1"
+
diff --git a/packages/gpe-calendar/gpe-calendar_0.66.bb b/packages/gpe-calendar/gpe-calendar_0.66.bb
index d3741787ea..154de75762 100644
--- a/packages/gpe-calendar/gpe-calendar_0.66.bb
+++ b/packages/gpe-calendar/gpe-calendar_0.66.bb
@@ -5,6 +5,8 @@ MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
 
 inherit autotools gpe
 
+SRC_URI += "file://dbus-new-api.patch;patch=1"
+
 DEPENDS = "libeventdb libschedule libxsettings libxsettings-client libgpepimc libdisplaymigration libgpevtype"
 SECTION = "gpe"
 RDEPENDS = "gpe-icons"
diff --git a/packages/gpe-calendar/gpe-calendar_cvs.bb b/packages/gpe-calendar/gpe-calendar_cvs.bb
index df84ff9475..134ec6ca2d 100644
--- a/packages/gpe-calendar/gpe-calendar_cvs.bb
+++ b/packages/gpe-calendar/gpe-calendar_cvs.bb
@@ -1,5 +1,4 @@
 LICENSE = "GPL"
-DEFAULT_PREFERENCE = "-1"
 
 S =     "${WORKDIR}/${PN}"
 PV =        "0.65+cvs-${CVSDATE}"
diff --git a/packages/gpe-conf/gpe-conf_cvs.bb b/packages/gpe-conf/gpe-conf_cvs.bb
index e13ac767c2..4f23ec754f 100644
--- a/packages/gpe-conf/gpe-conf_cvs.bb
+++ b/packages/gpe-conf/gpe-conf_cvs.bb
@@ -1,5 +1,3 @@
-DEFAULT_PREFERENCE = "-1"
-
 S =     "${WORKDIR}/${PN}"
 PV =        "0.1.26+cvs-${CVSDATE}"
 PR = "r0"
diff --git a/packages/gpe-contacts/gpe-contacts_0.42.bb b/packages/gpe-contacts/gpe-contacts_0.42.bb
index 32103b1867..f277348c17 100644
--- a/packages/gpe-contacts/gpe-contacts_0.42.bb
+++ b/packages/gpe-contacts/gpe-contacts_0.42.bb
@@ -2,14 +2,14 @@ LICENSE = "GPL"
 MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
 inherit gpe autotools
 
-PR = "r0"
+PR = "r1"
 
 DEPENDS = "libgpewidget libgpepimc libdisplaymigration libgpevtype dbus"
 SECTION = "gpe"
 RDEPENDS = "gpe-icons"
 DESCRIPTION = "GPE contacts manager"
-SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2"
-
+SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2 \
+	   file://dbus-new-api.patch;patch=1"
 
 FILES_${PN} += " ${datadir}/gpe ${datadir}/gpe-contacts"
 
diff --git a/packages/gpe-filemanager/gpe-filemanager_0.23.bb b/packages/gpe-filemanager/gpe-filemanager_0.23.bb
index 2beee83596..57a8e9a6b8 100644
--- a/packages/gpe-filemanager/gpe-filemanager_0.23.bb
+++ b/packages/gpe-filemanager/gpe-filemanager_0.23.bb
@@ -1,12 +1,14 @@
 
 inherit gpe
 
-PR          = "r0"
+PR          = "r1"
 LICENSE     = "GPL"
 DESCRIPTION = "GPE file manager"
-DEPENDS     = "libgpewidget gnome-vfs dbus"
+DEPENDS     = "libgpewidget gnome-vfs-dbus dbus"
 SECTION     = "gpe"
 RDEPENDS    = "gpe-icons"
 RRECOMMENDS = "gnome-vfs-plugin-file"
 
 FILES_${PN} += " ${datadir}/gpe"
+
+SRC_URI += " file://dbus-new-api.patch;patch=1"
diff --git a/packages/gpe-today/gpe-today_cvs.bb b/packages/gpe-today/gpe-today_cvs.bb
index a1ed5c6707..a467d7e52f 100644
--- a/packages/gpe-today/gpe-today_cvs.bb
+++ b/packages/gpe-today/gpe-today_cvs.bb
@@ -1,4 +1,3 @@
-DEFAULT_PREFERENCE = "-1"
 
 DESCRIPTION = 	"Displays a summary of appointments and tasks for the day ahead"
 DEPENDS =		"gtk+ libxrandr libxsettings libxsettings-client libgpewidget libdisplaymigration libeventdb libgpepimc libtododb"
diff --git a/packages/module-init-tools/module-init-tools_3.2-pre4.bb b/packages/module-init-tools/module-init-tools_3.2-pre4.bb
index 41aea223fe..72ec9c4fb0 100644
--- a/packages/module-init-tools/module-init-tools_3.2-pre4.bb
+++ b/packages/module-init-tools/module-init-tools_3.2-pre4.bb
@@ -1,9 +1,10 @@
+DEFAULT_PREFERENCE="-1"
 DESCRIPTION = "This package contains a set of programs for loading, inserting, and \
 removing kernel modules for Linux (versions 2.5.48 and above). It serves \
 the same function that the modutils package serves for Linux 2.4."
 LICENSE = "GPL"
 SECTION = "base"
-PR = "r0"
+PR = "r1"
 
 PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod"
 RDEPENDS_${PN} += "module-init-tools-depmod"
diff --git a/packages/scap/files/scap.sh b/packages/scap/files/scap.sh
index ba8bc7e584..6ab1735748 100644
--- a/packages/scap/files/scap.sh
+++ b/packages/scap/files/scap.sh
@@ -6,7 +6,7 @@ if [ -x /usr/bin/bl ]; then
 fi
 MODEL=`cat /proc/cpuinfo | grep ^Hardware | sed "s/.* //"`
 test -e /etc/scap.conf && USER=`cat /etc/scap.conf`
-RES=`fbset 2>/dev/null | awk "/geometry/ { print \$2 "x" \$3 }"`
+RES=`/usr/sbin/fbset 2>/dev/null | awk /geometry/{print\ \\$2\"x\"\\$3}`
 (echo "POST /scap/capture.cgi?$MODEL+$USER+$RES HTTP/1.1"
  echo -n Content-length:
  cat /dev/fb0 | wc -c
diff --git a/packages/sylpheed/sylpheed_2.0.0rc.bb b/packages/sylpheed/sylpheed_2.0.0rc.bb
index 531d694f98..ca0320bdcd 100644
--- a/packages/sylpheed/sylpheed_2.0.0rc.bb
+++ b/packages/sylpheed/sylpheed_2.0.0rc.bb
@@ -4,7 +4,6 @@ DEPENDS = "gtk+ gpgme gnutls"
 MAINTAINER = "Patrick Steiner <patrick.steiner@a1.net>"
 LICENSE = "GPL"
 PR = "r3"
-DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "http://sylpheed.good-day.net/sylpheed/v2.0beta/sylpheed-2.0.0rc.tar.bz2 \
 	file://sylpheed-gnutls_2.0.0rc.patch;patch=1 \