Diablo support.

diff --git a/debian/busybox-power.postinst b/debian/busybox-power.postinst
index 65637f3..e2d7c5a 100644 (file)
--- a/debian/busybox-power.postinst
+++ b/debian/busybox-power.postinst
@@ -70,7 +70,7 @@ ROLLBACK_HARMATTAN() {
 # dpkg-divert is disallowed on Harmattan, do not use it there!
 INSTALL() {
     case $ENVIRONMENT in
-      SDK|FREMANTLE)
+      SDK|DIABLO|FREMANTLE)
         /usr/sbin/dpkg-divert --local --divert $DISTBIN /bin/busybox
         $EXECPWR cp -f $EXECPWR /bin/busybox
         ;;

diff --git a/debian/busybox-power.preinst b/debian/busybox-power.preinst
index ca1f237..102de6d 100644 (file)
--- a/debian/busybox-power.preinst
+++ b/debian/busybox-power.preinst
@@ -14,8 +14,12 @@ else
   fi
 
   case $PROD in
+    RX-34|RX-44)
+      echo "busybox-power: Maemo4 (N8x0) environment detected"
+      ENVIRONMENT="DIABLO"
+      ;;
     RX-51)
-      echo "busybox-power: Maemo (N900) environment detected"
+      echo "busybox-power: Maemo5 (N900) environment detected"
       ENVIRONMENT="FREMANTLE"
       ;;
     RM-680|RM-696)
@@ -34,11 +38,12 @@ case $ENVIRONMENT in
     # Extra warning doesn't apply to SDK, just exit
     exit 0
     ;;
-  FREMANTLE)
+  DIABLO|FREMANTLE)
     f=/tmp/busybox-power-msg
     cat > $f <<EOF
 Warning: This package touches an essential system binary!
-Even though installation should be safe, a reflash might be required if something does go wrong (i.e. worst-case scenario).
+Even though installation should be safe, a reflash might be required
+if something does go wrong (i.e. worst-case scenario).
 
 Files overwritten by this package:
 bin/busybox

diff --git a/debian/busybox-power.prerm b/debian/busybox-power.prerm
index 66c3c34..e793a33 100644 (file)
--- a/debian/busybox-power.prerm
+++ b/debian/busybox-power.prerm
@@ -110,7 +110,7 @@ DISPLAY_ERRORS() {
         echo "   Hit [ctrl-c] to break"
         read 
         ;;
-      FREMANTLE)
+      DIABLO|FREMANTLE)
         echo "Click \"I Agree\" to ignore the above errors/warnings. Ask for" \
           "help if you don't know what to do." >> /tmp/busybox-power-error
         echo "Please confirm the text on the screen of your device"
@@ -152,7 +152,7 @@ UNINSTALL() {
     fi
 
     case $ENVIRONMENT in
-      SDK|FREMANTLE)
+      SDK|DIABLO|FREMANTLE)
         if test -e $DISTBIN; then
           cp -af $DISTBIN /bin/busybox
           if test -e /bin/busybox; then

diff --git a/debian/scripts/functions b/debian/scripts/functions
index eb79512..2d36913 100644 (file)
--- a/debian/scripts/functions
+++ b/debian/scripts/functions
@@ -25,6 +25,9 @@ CHECK_ENV() {
       fi
 
       case $PROD in
+        RX-34|RX-44)
+          ENVIRONMENT="DIABLO"
+          ;;
         RX-51)
           ENVIRONMENT="FREMANTLE"
           ;;