summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/display-brightness/display-brightness.sh2
-rw-r--r--packages/display-brightness/display-brightness_1.0.0.bb2
-rwxr-xr-xpackages/usb-gadget-mode/files/usb-gadget2
-rw-r--r--packages/usb-gadget-mode/usb-gadget-mode.bb4
-rw-r--r--packages/xserver-common/files/sl-cxx00-modmap.patch10
-rw-r--r--packages/xserver-common/xserver-common_1.16.bb2
6 files changed, 12 insertions, 10 deletions
diff --git a/packages/display-brightness/display-brightness.sh b/packages/display-brightness/display-brightness.sh
index 5e1a0e97d4..a82c748309 100644
--- a/packages/display-brightness/display-brightness.sh
+++ b/packages/display-brightness/display-brightness.sh
@@ -28,6 +28,8 @@ if [ "$1" = "up" ]; then
if [ $ACTUAL_BRIGHTNESS -eq $MAX_BRIGHTNESS ]; then
exit 0
else
+
+ test -x /usr/bin/bl && bl on
test "$STEP" -gt "$MAX_BRIGHTNESS" -o "$STEP" -eq "$MAX_BRIGHTNESS" && STEP=1
let CURRENT_BRIGHTNESS=$ACTUAL_BRIGHTNESS+$STEP
echo $CURRENT_BRIGHTNESS >> $BRIGHTNESS_FILE
diff --git a/packages/display-brightness/display-brightness_1.0.0.bb b/packages/display-brightness/display-brightness_1.0.0.bb
index aa3c0995e9..bc46c16631 100644
--- a/packages/display-brightness/display-brightness_1.0.0.bb
+++ b/packages/display-brightness/display-brightness_1.0.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "display brightness utility"
AUTHOR = "Patrick Steiner <patrick.steiner@a1.net>"
DEPENDS = ""
PRIORITY = "optional"
-PR = "r2"
+PR = "r3"
LICENSE = "GPLv2"
SRC_URI = "file://display-brightness.sh"
diff --git a/packages/usb-gadget-mode/files/usb-gadget b/packages/usb-gadget-mode/files/usb-gadget
index 611703f09d..4fdc429f5b 100755
--- a/packages/usb-gadget-mode/files/usb-gadget
+++ b/packages/usb-gadget-mode/files/usb-gadget
@@ -10,7 +10,7 @@
#
# 20070606 - v0.0.1 - Initial release
-CONF_FILE="/etc/usb-gadget.conf"
+CONF_FILE="/etc/default/usb-gadget"
die() {
echo "ERROR: $1"
diff --git a/packages/usb-gadget-mode/usb-gadget-mode.bb b/packages/usb-gadget-mode/usb-gadget-mode.bb
index 7c2083e99b..ab373c772d 100644
--- a/packages/usb-gadget-mode/usb-gadget-mode.bb
+++ b/packages/usb-gadget-mode/usb-gadget-mode.bb
@@ -15,7 +15,7 @@ LICENSE = "GPL"
######################################################################################
PV = "0.0.1"
-PR = "r0"
+PR = "r1"
######################################################################################
@@ -34,7 +34,7 @@ do_install() {
install -d ${D}/etc/init.d
install -d ${D}/usr/bin
- install -m 0644 ${WORKDIR}/usb-gadget.conf ${D}/etc
+ install -m 0644 ${WORKDIR}/usb-gadget.conf ${D}/etc/default/usb-gadget
install -m 0755 ${WORKDIR}/usb-gadget.init ${D}/etc/init.d/usb-gadget
install -m 0755 ${WORKDIR}/usb-gadget ${D}/usr/bin
}
diff --git a/packages/xserver-common/files/sl-cxx00-modmap.patch b/packages/xserver-common/files/sl-cxx00-modmap.patch
index c5dbebdbbf..057f9880bf 100644
--- a/packages/xserver-common/files/sl-cxx00-modmap.patch
+++ b/packages/xserver-common/files/sl-cxx00-modmap.patch
@@ -102,12 +102,12 @@
+! The Menu key generates F12 when pressed with Fn or Shift.
+
+! "Calendar" label and icon, "Sync" label beneath it:
-+keycode 67 = F13 F14 F14
++keycode 67 = F9 F14 F14
+! "Address" label and icon:
-+keycode 68 = F15 F15 F15
++keycode 68 = F10 F15 F15
+! "Mail" label and icon, "Check" label beneath it:
-+keycode 76 = F16 F17 F17
++keycode 76 = F13 F17 F17
+! "Home" label and icon:
-+keycode 107 = F18 F18 F18
++keycode 107 = F12 F18 F18
+! "Menu" label and icon:
-+keycode 96 = F19 F12 F12
++keycode 96 = F11 F12 F12
diff --git a/packages/xserver-common/xserver-common_1.16.bb b/packages/xserver-common/xserver-common_1.16.bb
index 5a8739e679..ca1c2f09cd 100644
--- a/packages/xserver-common/xserver-common_1.16.bb
+++ b/packages/xserver-common/xserver-common_1.16.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files"
LICENSE = "GPL"
SECTION = "x11"
RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
-PR = "r5"
+PR = "r6"
PACKAGE_ARCH = "all"