merge of b14eb00575e3edb8659a9f31c47e1416187938b7

     and d666453b1d27ca8088768cfc910fd4bd31f2682c

7 files changed, 45 insertions, 21 deletions

diff --git a/packages/display-brightness/display-brightness.sh b/packages/display-brightness/display-brightness.sh
index 8141866858..4e706e1e75 100644
--- a/packages/display-brightness/display-brightness.sh
+++ b/packages/display-brightness/display-brightness.sh
@@ -7,10 +7,13 @@
 
 
 STEP=5
-MAX_BRIGHTNESS=`cat /sys/class/backlight/*/max_brightness`
-ACTUAL_BRIGHTNESS=`cat /sys/class/backlight/*/actual_brightness`
-BRIGHTNESS_FILE="/sys/class/backlight/*/brightness"
+DRIVER="`ls /sys/class/backlight/|head -1`"
+MAX_BRIGHTNESS=`cat /sys/class/backlight/$DRIVER/max_brightness`
+ACTUAL_BRIGHTNESS=`cat /sys/class/backlight/$DRIVER/actual_brightness`
+BRIGHTNESS_FILE="/sys/class/backlight/$DRIVER/brightness"
 
+echo "max / current"
+echo "$MAX_BRIGHTNESS / $ACTUAL_BRIGHTNESS"
 if [ ! -n "$1" ]; then
     exit 0
 fi
diff --git a/packages/display-brightness/display-brightness_1.0.0.bb b/packages/display-brightness/display-brightness_1.0.0.bb
index e275b3f8bc..1919f98231 100644
--- a/packages/display-brightness/display-brightness_1.0.0.bb
+++ b/packages/display-brightness/display-brightness_1.0.0.bb
@@ -3,7 +3,7 @@ AUTHOR = "Patrick Steiner <patrick.steiner@a1.net>"
 MAINTAINER = "Patrick Steiner <patrick.steiner@a1.net>"
 DEPENDS = ""
 PRIORITY = "optional"
-PR = "r0"
+PR = "r1"
 LICENSE = "GPLv2"
 
 SRC_URI = "file://display-brightness.sh"
diff --git a/packages/keylaunch/files/akita/keylaunchrc b/packages/keylaunch/files/akita/keylaunchrc
index e0b729a508..8ef83c2830 100644
--- a/packages/keylaunch/files/akita/keylaunchrc
+++ b/packages/keylaunch/files/akita/keylaunchrc
@@ -1,6 +1,10 @@
-key=....F9:-:gpe-calendar
-key=....F10:-:gpe-contacts
+key=....F9:-:gpe-contacts
+key=....F10:-:gpe-calendar
 key=....F13:-:sylpheed
-key=....F12:-:gpe-mini-browser
-key=...*F18:-:display-brightness.sh down
-key=...*F19:-:display-brightness.sh up
+key=....F12:-:~matchbox-remote -next
+key=...*F12:-:~matchbox-remote -desktop
+#key=....F11:-:~matchbox-remote -menu
+#key=...*1:-:~zoom out
+#key=...*2:-:~zoom in
+key=...*3:-:~display-brightness.sh down 
+key=...*4:-:~display-brightness.sh up 
diff --git a/packages/keylaunch/files/borzoi/keylaunchrc b/packages/keylaunch/files/borzoi/keylaunchrc
index e0b729a508..8ef83c2830 100644
--- a/packages/keylaunch/files/borzoi/keylaunchrc
+++ b/packages/keylaunch/files/borzoi/keylaunchrc
@@ -1,6 +1,10 @@
-key=....F9:-:gpe-calendar
-key=....F10:-:gpe-contacts
+key=....F9:-:gpe-contacts
+key=....F10:-:gpe-calendar
 key=....F13:-:sylpheed
-key=....F12:-:gpe-mini-browser
-key=...*F18:-:display-brightness.sh down
-key=...*F19:-:display-brightness.sh up
+key=....F12:-:~matchbox-remote -next
+key=...*F12:-:~matchbox-remote -desktop
+#key=....F11:-:~matchbox-remote -menu
+#key=...*1:-:~zoom out
+#key=...*2:-:~zoom in
+key=...*3:-:~display-brightness.sh down 
+key=...*4:-:~display-brightness.sh up 
diff --git a/packages/keylaunch/files/spitz/keylaunchrc b/packages/keylaunch/files/spitz/keylaunchrc
index e0b729a508..8ef83c2830 100644
--- a/packages/keylaunch/files/spitz/keylaunchrc
+++ b/packages/keylaunch/files/spitz/keylaunchrc
@@ -1,6 +1,10 @@
-key=....F9:-:gpe-calendar
-key=....F10:-:gpe-contacts
+key=....F9:-:gpe-contacts
+key=....F10:-:gpe-calendar
 key=....F13:-:sylpheed
-key=....F12:-:gpe-mini-browser
-key=...*F18:-:display-brightness.sh down
-key=...*F19:-:display-brightness.sh up
+key=....F12:-:~matchbox-remote -next
+key=...*F12:-:~matchbox-remote -desktop
+#key=....F11:-:~matchbox-remote -menu
+#key=...*1:-:~zoom out
+#key=...*2:-:~zoom in
+key=...*3:-:~display-brightness.sh down 
+key=...*4:-:~display-brightness.sh up 
diff --git a/packages/keylaunch/keylaunch_2.0.10.bb b/packages/keylaunch/keylaunch_2.0.10.bb
index f84cd35b33..c0d0b2c44a 100644
--- a/packages/keylaunch/keylaunch_2.0.10.bb
+++ b/packages/keylaunch/keylaunch_2.0.10.bb
@@ -1,6 +1,9 @@
 inherit gpe
 
 DEPENDS = "virtual/xserver libxtst libxau libxpm libgpelaunch"
+DEPENDS_append_openzaurus = " display-brightness"
+RDEPENDS_append_openzaurus = " display-brightness"
+
 SECTION = "gpe"
 LICENSE = "GPL"
 DESCRIPTION = "A small utility for binding commands to a hot key.\
@@ -10,7 +13,7 @@ DESCRIPTION = "A small utility for binding commands to a hot key.\
  program is already running, keylaunch can bring its window to the front\
  rather than just running another copy."
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI += " file://keylaunchrc"
 
diff --git a/packages/openssh/openssh_4.0p1.bb b/packages/openssh/openssh_4.0p1.bb
index e41b8f655c..bcfe2f370f 100644
--- a/packages/openssh/openssh_4.0p1.bb
+++ b/packages/openssh/openssh_4.0p1.bb
@@ -1,4 +1,10 @@
 DEPENDS = "zlib openssl"
+
+RREPLACES_openssh = "dropbear"
+RCONFLICTS_openssh = "dropbear"
+RREPLACES_openssh-sshd = "dropbear"
+RCONFLICTS_openssh-sshd = "dropbear"
+
 SECTION = "console/network"
 DESCRIPTION = "Secure rlogin/rsh/rcp/telnet replacement (OpenSSH) \
 Ssh (Secure Shell) is a program for logging into a remote machine \
@@ -11,7 +17,7 @@ used to provide applications with a secure communication channel."
 HOMEPAGE = "http://www.openssh.org/"
 LICENSE = "BSD"
 MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
-PR = "r6"
+PR = "r7"
 
 SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \
            file://configure.patch;patch=1 \