merge of '08b850dd4e1df4e1751532b79a9685dd41464df7'

     and 'e79716efdd36e7696ebd0ad656d58dbc0edd904c'

7 files changed, 2 insertions, 198 deletions

diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.61.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.61.bb
deleted file mode 100644
index 9d199cd780..0000000000
--- a/packages/gpe-session-scripts/gpe-session-scripts_0.61.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-LICENSE = "GPL"
-PR = "r6"
-
-inherit gpe
-
-DESCRIPTION = "GPE session startup scripts"
-SECTION = "gpe"
-PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-RDEPENDS = "matchbox gpe-session-starter gpe-bluetooth xstroke xtscal gpe-question gpe-clock matchbox-applet-inputmanager xrandr"
-# more rdepends: keylaunch ipaq-sleep apmd blueprobe
-DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr"
-
-SRC_URI += "file://change-default-applets.patch;patch=1"
-
-do_install_append() {
-	install -d ${D}${sysconfdir}/gpe/xsettings-default.d
-	if [ "${GUI_MACHINE_CLASS}" != "bigscreen" ]; then
-		echo "Gtk/ToolbarStyle:S:icons" > ${D}${sysconfdir}/gpe/xsettings-default.d/toolbar
-	fi
-}
-
-# This makes use of GUI_MACHINE_CLASS, so set PACKAGE_ARCH appropriately
-PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb
deleted file mode 100644
index b9178ac6bf..0000000000
--- a/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb
+++ /dev/null
@@ -1,42 +0,0 @@
-LICENSE = "GPL"
-PR = "r14"
-
-inherit gpe
-
-DESCRIPTION = "GPE session startup scripts"
-SECTION = "gpe"
-PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-RDEPENDS_${PN} = "matchbox gpe-session-starter gpe-bluetooth xstroke xtscal gpe-question gpe-clock matchbox-applet-inputmanager xrandr xmodmap xdpyinfo"
-# more rdepends: keylaunch ipaq-sleep apmd blueprobe
-DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr xmodmap xdpyinfo"
-
-SRC_URI += "file://zaurus.sh \
-	file://keymap.sh \
-	file://change-default-applets.patch;patch=1 \
-	file://xdefaults.patch;patch=1 \
-	file://matchbox-session \
-	file://shepherd.xmodmap file://simpad.xmodmap \
-	file://collie.xmodmap \
-	file://disable-composite.xsettings \
-	file://change-default-xsettings.patch;patch=1"
-
-do_install_append() {
-	install ${WORKDIR}/zaurus.sh ${D}${sysconfdir}/X11/Xinit.d/11zaurus
-	install ${WORKDIR}/keymap.sh ${D}${sysconfdir}/X11/Xinit.d/12keymap
-	for m in simpad shepherd collie; do
-		install -m 0644 ${WORKDIR}/$m.xmodmap ${D}${sysconfdir}/X11/
-	done
-	install -d ${D}${sysconfdir}/gpe/xsettings-default.d
-	if [ "${GUI_MACHINE_CLASS}" != "bigscreen" ]; then
-		echo "Gtk/ToolbarStyle:S:icons" > ${D}${sysconfdir}/gpe/xsettings-default.d/toolbar
-	fi
-	install -d ${D}${sysconfdir}/matchbox
-	install ${WORKDIR}/matchbox-session ${D}${sysconfdir}/matchbox/session
-
-	install -d ${D}${sysconfdir}/gpe/xsettings-default.d
-	install -m 0644 ${WORKDIR}/disable-composite.xsettings ${D}${sysconfdir}/gpe/xsettings-default.d/disable-composite
-}
-
-# This makes use of GUI_MACHINE_CLASS, so set PACKAGE_ARCH appropriately
-PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.63.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.63.bb
deleted file mode 100644
index 986810e8ba..0000000000
--- a/packages/gpe-session-scripts/gpe-session-scripts_0.63.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-LICENSE = "GPL"
-PR = "r17"
-
-inherit gpe
-
-DESCRIPTION = "GPE session startup scripts"
-SECTION = "gpe"
-PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-RDEPENDS_${PN} = "matchbox gpe-session-starter gpe-bluetooth xstroke xtscal gpe-question gpe-clock matchbox-applet-inputmanager xrandr xmodmap xdpyinfo xserver-common"
-# more rdepends: keylaunch ipaq-sleep apmd blueprobe
-DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr xmodmap xdpyinfo xserver-common"
-
-SRC_URI += "file://matchbox-session \
-	file://disable-composite.xsettings \
-        file://remove-x11-common-files.patch;patch=1"
-
-do_install_append() {
-	install -d ${D}${sysconfdir}/gpe/xsettings-default.d
-	if [ "${GUI_MACHINE_CLASS}" != "bigscreen" ]; then
-		echo "Gtk/ToolbarStyle:S:icons" > ${D}${sysconfdir}/gpe/xsettings-default.d/toolbar
-	fi
-	install -d ${D}${sysconfdir}/matchbox
-	install ${WORKDIR}/matchbox-session ${D}${sysconfdir}/matchbox/session
-
-	install -d ${D}${sysconfdir}/gpe/xsettings-default.d
-	install -m 0644 ${WORKDIR}/disable-composite.xsettings ${D}${sysconfdir}/gpe/xsettings-default.d/disable-composite
-}
-
-# This makes use of GUI_MACHINE_CLASS, so set PACKAGE_ARCH appropriately
-PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.64.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.64.bb
deleted file mode 100644
index 9364dcab2e..0000000000
--- a/packages/gpe-session-scripts/gpe-session-scripts_0.64.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-LICENSE = "GPL"
-PR = "r1"
-
-inherit gpe
-
-DESCRIPTION = "GPE session startup scripts"
-SECTION = "gpe"
-PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-RDEPENDS_${PN} = "matchbox gpe-session-starter gpe-bluetooth xstroke xtscal gpe-question gpe-clock matchbox-applet-inputmanager xrandr xmodmap xdpyinfo xserver-common"
-# more rdepends: keylaunch ipaq-sleep apmd blueprobe
-DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr xmodmap xdpyinfo xserver-common"
-
-SRC_URI += "file://matchbox-session \
-	file://disable-composite.xsettings \
-        file://remove-x11-common-files.patch;patch=1"
-
-do_install_append() {
-	install -d ${D}${sysconfdir}/gpe/xsettings-default.d
-	if [ "${GUI_MACHINE_CLASS}" != "bigscreen" ]; then
-		echo "Gtk/ToolbarStyle:S:icons" > ${D}${sysconfdir}/gpe/xsettings-default.d/toolbar
-	fi
-	install -d ${D}${sysconfdir}/matchbox
-	install ${WORKDIR}/matchbox-session ${D}${sysconfdir}/matchbox/session
-
-	install -d ${D}${sysconfdir}/gpe/xsettings-default.d
-	install -m 0644 ${WORKDIR}/disable-composite.xsettings ${D}${sysconfdir}/gpe/xsettings-default.d/disable-composite
-}
-
-# This makes use of GUI_MACHINE_CLASS, so set PACKAGE_ARCH appropriately
-PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.65.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.65.bb
deleted file mode 100644
index d7a3054149..0000000000
--- a/packages/gpe-session-scripts/gpe-session-scripts_0.65.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-LICENSE = "GPL"
-PR = "r0"
-
-inherit gpe
-
-DESCRIPTION = "GPE session startup scripts"
-SECTION = "gpe"
-PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-RDEPENDS_${PN} = "matchbox gpe-session-starter gpe-bluetooth xstroke xtscal gpe-question gpe-clock matchbox-applet-inputmanager xrandr xmodmap xdpyinfo xserver-common"
-# more rdepends: keylaunch ipaq-sleep apmd blueprobe
-DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr xmodmap xdpyinfo xserver-common"
-
-SRC_URI += "file://matchbox-session \
-	file://disable-composite.xsettings"
-
-do_install_append() {
-	install -d ${D}${sysconfdir}/gpe/xsettings-default.d
-	if [ "${GUI_MACHINE_CLASS}" != "bigscreen" ]; then
-		echo "Gtk/ToolbarStyle:S:icons" > ${D}${sysconfdir}/gpe/xsettings-default.d/toolbar
-	fi
-	install -d ${D}${sysconfdir}/matchbox
-	install ${WORKDIR}/matchbox-session ${D}${sysconfdir}/matchbox/session
-
-	install -d ${D}${sysconfdir}/gpe/xsettings-default.d
-	install -m 0644 ${WORKDIR}/disable-composite.xsettings ${D}${sysconfdir}/gpe/xsettings-default.d/disable-composite
-}
-
-# This makes use of GUI_MACHINE_CLASS, so set PACKAGE_ARCH appropriately
-PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.66.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.66.bb
deleted file mode 100644
index 3b8f8a958f..0000000000
--- a/packages/gpe-session-scripts/gpe-session-scripts_0.66.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-LICENSE = "GPL"
-PR = "r3"
-
-inherit gpe
-
-DESCRIPTION = "GPE session startup scripts"
-SECTION = "gpe"
-PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-RDEPENDS_${PN} = "matchbox matchbox-panel (>= 0.9.2-r12) matchbox-desktop (>= 0.9.1-r1) matchbox-common (>= 0.9.1-r2) gpe-session-starter gpe-bluetooth xstroke xtscal gpe-question gpe-clock matchbox-applet-inputmanager xrandr xmodmap xdpyinfo xserver-common"
-# more rdepends: keylaunch ipaq-sleep apmd blueprobe
-DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr xmodmap xdpyinfo xserver-common"
-
-SRC_URI += "file://matchbox-session \
-	file://disable-composite.xsettings"
-
-#apply a patch to set the fontsize for bigdpi (200+) devices to 5
-SRC_URI_append_ipaq-pxa270 = " file://highdpifontfix.patch;patch=1"
-SRC_URI_append_spitz = " file://highdpifontfix.patch;patch=1"
-SRC_URI_append_akita = " file://highdpifontfix.patch;patch=1"
-SRC_URI_append_c7x0 = " file://highdpifontfix.patch;patch=1"
-SRC_URI_append_nokia770 = " file://highdpifontfix.patch;patch=1"
-
-do_install_append() {
-	install -d ${D}${sysconfdir}/gpe/xsettings-default.d
-	if [ "${GUI_MACHINE_CLASS}" != "bigscreen" ]; then
-		echo "Gtk/ToolbarStyle:S:icons" > ${D}${sysconfdir}/gpe/xsettings-default.d/toolbar
-	fi
-	install -d ${D}${sysconfdir}/matchbox
-	install ${WORKDIR}/matchbox-session ${D}${sysconfdir}/matchbox/session
-
-	install -d ${D}${sysconfdir}/gpe/xsettings-default.d
-	install -m 0644 ${WORKDIR}/disable-composite.xsettings ${D}${sysconfdir}/gpe/xsettings-default.d/disable-composite
-}
-
-# This makes use of GUI_MACHINE_CLASS, so set PACKAGE_ARCH appropriately
-PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
index 8879833c6e..e6f7aee181 100644
--- a/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
+++ b/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
@@ -4,7 +4,6 @@ DESCRIPTION = "GPE session startup scripts"
 LICENSE = "GPL"
 SECTION = "gpe"
 PRIORITY = "optional"
-MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
 RDEPENDS_${PN} = "matchbox matchbox-panel (>= 0.9.2-r12) matchbox-desktop (>= 0.9.1-r1) matchbox-common (>= 0.9.1-r2) gpe-session-starter gpe-bluetooth xstroke xtscal gpe-question gpe-clock matchbox-applet-inputmanager xrandr xmodmap xdpyinfo xserver-common"
 # more rdepends: keylaunch ipaq-sleep apmd blueprobe
 DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr xmodmap xdpyinfo xserver-common"
@@ -12,10 +11,10 @@ DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question
 SRC_URI += "file://matchbox-session \
 	file://disable-composite.xsettings"
 
-PR = "r1"
+PR = "r2"
 
 #apply a patch to set the fontsize for bigdpi (200+) devices to 5
-SRC_URI_append_ipaq-pxa270 = " file://highdpifontfix.patch;patch=1"
+SRC_URI_append_hx4700 = " file://highdpifontfix.patch;patch=1"
 SRC_URI_append_spitz = " file://highdpifontfix.patch;patch=1"
 SRC_URI_append_akita = " file://highdpifontfix.patch;patch=1"
 SRC_URI_append_c7x0 = " file://highdpifontfix.patch;patch=1"