More merging with OE. Fix settings-daemon depends.

git-svn-id: https://svn.o-hand.com/repos/poky@133 311d38ba-8fff-0310-9ca6-ca027cbcb966

openembedded/conf/distro/familiar-0.8.3.conf

@@ -1,9 +1,13 @@
-include conf/distro/familiar-distro.conf
-
 DISTRO = "familiar"
 DISTRO_NAME = "Familiar Linux"
 DISTRO_VERSION = "v0.8.3-unofficial-unsupported-snapshot-${DATE}"
 
+include conf/distro/familiar.conf
+
+"${@bb.fatal('This file is unmaintained in the org.oe.dev branch, use the org.openembedded.oz354fam083 branch instead. You can also remove this line, but don't complain if something breaks')}"
+
+
+
 DISTRO_TYPE = "debug"
 #DISTRO_TYPE = "release"
 

openembedded/conf/distro/openzaurus-3.5.4.conf

@@ -1,7 +1,10 @@
-include conf/distro/openzaurus.inc
 DISTRO = "openzaurus"
 DISTRO_NAME = "OpenZaurus"
 DISTRO_VERSION = "3.5.3-snapshot-${DATE}"
+
+include conf/distro/openzaurus.conf
+
+
 # DISTRO_VERSION = "3.5.4"
 DISTRO_TYPE = "debug"
 # DISTRO_TYPE = "release"

openembedded/conf/distro/preferred-gpe-versions-2.7.inc

@@ -27,7 +27,7 @@ PREFERRED_VERSION_libgpewidget ?= "0.103"
 PREFERRED_VERSION_libgpepimc ?= "0.5"
 PREFERRED_VERSION_libgpevtype ?= "0.12"
 PREFERRED_VERSION_libschedule ?= "0.15"
-PREFERRED_VERSION_gpe-icons ?= "0.24"
+PREFERRED_VERSION_gpe-icons ?= "0.25"
 PREFERRED_VERSION_libgsm ?= "1.0.10"
 PREFERRED_VERSION_diet-x11 ?= "6.2.1"
 PREFERRED_VERSION_xproto ?= "6.6.2"
@@ -39,14 +39,14 @@ PREFERRED_VERSION_xst ?= "0.15"
 PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}" 
 PREFERRED_VERSION_xhost ?= "0.0cvs20040413"
 PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}"
-PREFERRED_VERSION_gpe-login ?= "0.82"
+PREFERRED_VERSION_gpe-login ?= "0.83"
 PREFERRED_VERSION_gpe-session-scripts ?= "0.66"
 PREFERRED_VERSION_gpe-soundserver ?= "0.4-1"
 PREFERRED_VERSION_gpe-todo ?= "0.54"
 PREFERRED_VERSION_gpe-calendar ?= "0.65"
 PREFERRED_VERSION_gpe-sketchbox ?= "0.2.8"
 PREFERRED_VERSION_gpe-contacts ?= "0.42"
-PREFERRED_VERSION_gpe-today ?= "0.09"
+PREFERRED_VERSION_gpe-today ?= "0.10"
 PREFERRED_VERSION_matchbox-panel-manager ?= "0.1"
 PREFERRED_VERSION_dbus ?= "0.23.4"
 PREFERRED_VERSION_gpe-beam ?= "0.2.8" 

openembedded/packages/dbus/dbus-native_0.50.bb

@@ -8,7 +8,7 @@ S = "${WORKDIR}/dbus-${PV}"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus"
 DEPENDS = "glib-2.0-native"
 
-PR = "r2"
+PR = "r1"
 
 do_stage() {
 	oe_runmake install

openembedded/packages/matchbox-panel/matchbox-panel_0.9.2.bb

@@ -1,24 +1,6 @@
-DESCRIPTION = "Matchbox Window Manager Panel"
+include matchbox-panel.inc
-LICENSE = "GPL"
-DEPENDS = "libmatchbox x11 xext xpm apmd startup-notification virtual/kernel wireless-tools"
-SECTION = "x11/wm"
-PR="r2"
 
+PR="r2"
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz"
 
-inherit autotools pkgconfig gettext
-
-CFLAGS += "-D_GNU_SOURCE"
-
-EXTRA_OECONF = "--enable-startup-notification --enable-dnotify"
-EXTRA_OECONF_append_h3600 = " --enable-small-icons "
-EXTRA_OECONF_append_h3900 = " --enable-small-icons "
-EXTRA_OECONF_append_collie = " --enable-small-icons "
-EXTRA_OECONF_append_poodle = " --enable-small-icons "
-EXTRA_OECONF_append_mnci = " --enable-small-icons "
-EXTRA_OECONF_append_integral = " --enable-small-icons "
-
-FILES_${PN} = "${bindir} \
-	       ${datadir}/applications \
-	       ${datadir}/pixmaps"
 

openembedded/packages/matchbox-panel/matchbox-panel_svn.bb

@@ -1,20 +1,11 @@
-DESCRIPTION = "Matchbox Window Manager Panel"
+include matchbox-panel.inc
-LICENSE = "GPL"
-DEPENDS = "libmatchbox x11 xext xpm apmd startup-notification virtual/kernel"
-SECTION = "x11/wm"
 PV = "0.9.2+cvs-${CVSDATE}"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
 
+EXTRA_OECONF = "--enable-startup-notification --enable-dnotify"
+
 S = ${WORKDIR}/${PN}
 
-inherit autotools pkgconfig gettext
-
-EXTRA_OECONF = "--enable-startup-notification --enable-dnotify"
-CFLAGS += " -D_GNU_SOURCE"
-
-FILES_${PN} = "${bindir} \
-	       ${datadir}/applications \
-	       ${datadir}/pixmaps"
 

openembedded/packages/pcmcia-cs/pcmcia-cs-3.2.8/pcic-extra.patch

@@ -1,14 +1,11 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
 --- pcmcia-cs-3.2.8/etc/rc.pcmcia~pcic-extra
 +++ pcmcia-cs-3.2.8/etc/rc.pcmcia
-@@ -105,10 +105,16 @@
+@@ -104,11 +104,17 @@ for x in "1" ; do
+ 		  (/sbin/modprobe yenta_socket >/dev/null 2>&1 &&
  		   echo "using yenta_socket instead of $PCIC") ||
  		  /sbin/modprobe $PCIC $PCIC_OPTS || break
- 		/sbin/modprobe ds || break
+-		/sbin/modprobe ds || break
++		/sbin/modprobe $DS || break
 +		if [ "x$PCIC_EXTRA" != "x" ]; then
 +		   /sbin/modprobe $PCIC_EXTRA
 +		fi
@@ -22,7 +19,7 @@
  	    else
  		echo "module directory $PC not found."
  		break
-@@ -154,7 +160,7 @@
+@@ -154,7 +160,7 @@ for x in "1" ; do
  	;;
  
      status)

openembedded/packages/rxvt-unicode/rxvt-unicode_5.6.bb

@@ -11,7 +11,7 @@ SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2
 	   file://signedchar.patch;patch=1 \
 	   file://rxvt.desktop \
 	   file://rxvt.png"
-PR = "r5"
+PR = "r3"
 
 inherit autotools update-alternatives
 

openembedded/packages/settings-daemon/settings-daemon_svn.bb

@@ -1,6 +1,6 @@
 DESCRIPTION = "Settings-daemon is a bridge between xst/gpe-confd and gconf"
 LICENSE = "GPL"
-DEPENDS = "gconf xst glib-2.0"
+DEPENDS = "gconf glib-2.0"
 SECTION = "gpe"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \