Fremantle versions pushed to Extras

diff --git a/fremantle/easy-chroot/build_easychroot.py b/fremantle/easy-chroot/build_easychroot.py
index 031a7b5..dc05744 100755 (executable)
--- a/fremantle/easy-chroot/build_easychroot.py
+++ b/fremantle/easy-chroot/build_easychroot.py
@@ -24,6 +24,9 @@ if __name__ == "__main__":
      p.description=qoledescript.read()
      p.xsbc_bugtracker="https://garage.maemo.org/tracker/?atid=3577&group_id=953&func=browse"
      p.maemodispname="Easy Chroot" 
      p.description=qoledescript.read()
      p.xsbc_bugtracker="https://garage.maemo.org/tracker/?atid=3577&group_id=953&func=browse"
      p.maemodispname="Easy Chroot" 

+     version = "0.3.0"   #Version of your software, e.g. "1.2.0" or "0.8.2"
+     build = "1fremantle1"         #Build number
+     versionbuild = version + "-" + build

      p.author="Alan Bruce (qole)"
      p.mail="qole@qole.org"
      p.depends = "libblkid1"
      p.author="Alan Bruce (qole)"
      p.mail="qole@qole.org"
      p.depends = "libblkid1"

@@ -42,9 +45,6 @@ if __name__ == "__main__":
      # p.preinstall=""
      # p.preremove=""
 
      # p.preinstall=""
      # p.preremove=""
 

-     version = "0.2.7"   #Version of your software, e.g. "1.2.0" or "0.8.2"
-     build = "1fremantle1"         #Build number
-     versionbuild = version + "-" + build

                          #Text with changelog information to be displayed in the package "Details" tab of the HAM
      qolechangelog = open("control/changelog", "r")
      changeloginformation = qolechangelog.read()
                          #Text with changelog information to be displayed in the package "Details" tab of the HAM
      qolechangelog = open("control/changelog", "r")
      changeloginformation = qolechangelog.read()

diff --git a/fremantle/easy-chroot/control/changelog b/fremantle/easy-chroot/control/changelog
index 0f4ce79..9b22b36 100644 (file)
--- a/fremantle/easy-chroot/control/changelog
+++ b/fremantle/easy-chroot/control/changelog
@@ -1,7 +1,10 @@
-0.2.1: First version for Fremantle, fifth package. Trying a new version of py2deb. <br>
-0.2.2: Added thp's patches, some other fixes. <br>
-0.2.3: First version in Extras! <br>
-0.2.4: Fixed some small bugs and added a bugtracker field. <br>
-0.2.5: Unmount /dev/shm in the closechroot script <br>
-0.2.6: Include Debian's fuser as a workaround for broken busybox <br>
-0.2.7: Remove the closechroot .desktop file, move to Easy Debian <br>
\ No newline at end of file
+0.2.1: First version for Fremantle, fifth package. Trying a new version of py2deb. 
+0.2.2: Added thp's patches, some other fixes. 
+0.2.3: First version in Extras! 
+0.2.4: Fixed some small bugs and added a bugtracker field. 
+0.2.5: Unmount /dev/shm in the closechroot script 
+0.2.6: Include Debian's fuser as a workaround for broken busybox 
+0.2.7: Remove the closechroot .desktop file, move to Easy Debian
+0.2.8: Support dmsetup + kernel-module-dmloop packages, if installed
+0.2.9: Use the 'cd /proc' workaround for broken fuser bug, add 'nodiratime,nobh' to mount options
+0.3.0: Require dmlosetup to be present before attempting dm-loop.
\ No newline at end of file

diff --git a/fremantle/easy-chroot/control/description b/fremantle/easy-chroot/control/description
index 86c039d..c290875 100644 (file)
--- a/fremantle/easy-chroot/control/description
+++ b/fremantle/easy-chroot/control/description
@@ -3,5 +3,6 @@ Scripts to mount and chroot into images/partitions, Fremantle version.
 This package provides the infrastructure for Easy Debian,
 but it can be used for other purposes, like mounting a CD-ROM image
 or setting up an on-device SDK for app development.
 This package provides the infrastructure for Easy Debian,
 but it can be used for other purposes, like mounting a CD-ROM image
 or setting up an on-device SDK for app development.

+Install dmsetup and kernel-module-dmloop to use the (possibly faster) dm-loop.

 ---
 (If that didn't make any sense to you, don't install this)
\ No newline at end of file
 ---
 (If that didn't make any sense to you, don't install this)
\ No newline at end of file

diff --git a/fremantle/easy-chroot/src/bin/gfuser b/fremantle/easy-chroot/src/bin/gfuser
deleted file mode 100755 (executable)
index e0a0d2e..0000000
Binary files a/fremantle/easy-chroot/src/bin/gfuser and /dev/null differ

diff --git a/fremantle/easy-chroot/src/sbin/closechroot b/fremantle/easy-chroot/src/sbin/closechroot
index eda7e9e..2892bcf 100755 (executable)
--- a/fremantle/easy-chroot/src/sbin/closechroot
+++ b/fremantle/easy-chroot/src/sbin/closechroot
@@ -30,7 +30,8 @@ fi
 echo "Closing the chroot..."
 
 # Fremantle's fuser command is broken.
 echo "Closing the chroot..."
 
 # Fremantle's fuser command is broken.

-# Using Debian's one instead.
+# We can either use Debian's one instead (as gfuser),
+# or we can use the workaround: "cd /proc" first.

 
 echo "...closing chroot apps..."
 
 
 echo "...closing chroot apps..."
 

@@ -39,12 +40,14 @@ if [ "x$TEST1" != "x" ] ; then
   if [ -f "/bin/gfuser" ] ; then
     gfuser -m "$CHROOT" -k
   else
   if [ -f "/bin/gfuser" ] ; then
     gfuser -m "$CHROOT" -k
   else

+    cd /proc

     fuser -m "$CHROOT" -k
   fi
 else
   if [ -f "/bin/gfuser" ] ; then
     gfuser "$CHROOT" -k
   else
     fuser -m "$CHROOT" -k
   fi
 else
   if [ -f "/bin/gfuser" ] ; then
     gfuser "$CHROOT" -k
   else

+    cd /proc

     fuser "$CHROOT" -k
   fi
 fi
     fuser "$CHROOT" -k
   fi
 fi

diff --git a/fremantle/easy-chroot/src/sbin/qmount b/fremantle/easy-chroot/src/sbin/qmount
index 9a92802..f44d3db 100755 (executable)
--- a/fremantle/easy-chroot/src/sbin/qmount
+++ b/fremantle/easy-chroot/src/sbin/qmount
@@ -88,13 +88,6 @@ if [ ! -f "$MNTPT/var/lock/qmount-complete" ] ; then
      fi
    fi
 
      fi
    fi
 

-   #if [ -d "/mnt/initfs/lib/modules/`uname -r`" ] ; then
-   #  MODULEPATH="/mnt/initfs/lib/modules/`uname -r`"
-   #else
-   #  MODULEPATH=/mnt/initfs/lib/modules/2.6.21-omap1
-   #fi
-   #insmod "$MODULEPATH/mbcache.ko" 2>/dev/null
-

    # missing in Fremantle...
    # modprobe mbcache
 
    # missing in Fremantle...
    # modprobe mbcache
 

@@ -112,20 +105,50 @@ if [ ! -f "$MNTPT/var/lock/qmount-complete" ] ; then
    #insmod "$MODULEPATH/$IMGFS.ko" 2>/dev/null
    modprobe $IMGFS
 
    #insmod "$MODULEPATH/$IMGFS.ko" 2>/dev/null
    modprobe $IMGFS
 

+   if [ -d "/lib/modules/`uname -r`" ] ; then
+     MODULEPATH="/lib/modules/`uname -r`"
+   else
+     MODULEPATH=/lib/modules/2.6.28-omap1
+   fi
+

    if [ "$LOOP" = "loop," ] ; then
    if [ "$LOOP" = "loop," ] ; then

-    #echo "mounting $IMGFILE on the turbo-loop ;)"
-    echo "mounting $IMGFILE on loop" >/dev/stderr
-     #insmod /lib/modules/2.6.21-omap1/dm-mod.ko 2>/dev/null
-     #insmod /lib/modules/2.6.21-omap1/dm-loop.ko 2>/dev/null
-     #NEXTLOOP=`ls -l /dev/dm-* 2>/dev/null | tail -1 | awk '{print $NF}' | awk -F '-' '{print $NF+1}'`
-     NEXTLOOP=""
-     if [ "x$NEXTLOOP" = "x"  ] ; then
-       NEXTLOOP=0
+
+   # Check for dm-loop kernel module and dmlosetup command. 
+   # If found, then use dm-loop instead of regular loop.
+
+     if [ -f "$MODULEPATH/dm-loop.ko" ] && [ -f "/sbin/dmlosetup" ]; then
+
+       # use dm-loop
+
+       echo "mounting $IMGFILE on the turbo-loop ;)"
+       #insmod $MODULEPATH/dm-mod.ko 2>/dev/null
+       modprobe dm-mod
+       #insmod $MODULEPATH/dm-loop.ko 2>/dev/null
+       modprobe dm-loop
+
+       NEXTLOOP=`ls -l /dev/dm-* 2>/dev/null | tail -1 | awk '{print $NF}' | awk -F '-' '{print $NF+1}'`
+       if [ "x$NEXTLOOP" = "x"  ] ; then
+         NEXTLOOP=0
+       fi
+
+       DMLOMSG=`dmlosetup loop$NEXTLOOP "$IMGFILE" 2>&1`
+       MNTMSG=`mount -t "$IMGFS" /dev/dm-$NEXTLOOP "$MNTPT" -o noatime,nobh,nodiratime 2>&1` 
+
+     else
+
+       # use "regular" loop
+
+       echo "mounting $IMGFILE on loop" >/dev/stderr
+       NEXTLOOP=""
+       if [ "x$NEXTLOOP" = "x"  ] ; then
+         NEXTLOOP=0
+       fi
+
+       DMLOMSG=""
+       MNTMSG=`mount -t "$IMGFS" "$IMGFILE" "$MNTPT" -o loop,noatime,nobh,nodiratime 2>&1` 
+

      fi
      fi

-     #DMLOMSG=`dmlosetup loop$NEXTLOOP "$IMGFILE" 2>&1`
-     DMLOMSG=""
-     #MNTMSG=`mount -t "$IMGFS" /dev/dm-$NEXTLOOP "$MNTPT" -o noatime 2>&1` 
-     MNTMSG=`mount -t "$IMGFS" "$IMGFILE" "$MNTPT" -o loop,noatime 2>&1` 
+

      if [ "$?" != 0 ] ; then
        MSG1=`printf "Mount failure!\n\n$IMGFILE failed to mount on loop$NEXTLOOP\n\n$DMLOMSG\n$MNTMSG"`
        if [ ! -f "/usr/bin/gxmessage" ] ; then
      if [ "$?" != 0 ] ; then
        MSG1=`printf "Mount failure!\n\n$IMGFILE failed to mount on loop$NEXTLOOP\n\n$DMLOMSG\n$MNTMSG"`
        if [ ! -f "/usr/bin/gxmessage" ] ; then

@@ -138,7 +161,7 @@ if [ ! -f "$MNTPT/var/lock/qmount-complete" ] ; then
      echo ...$IMGFILE mounted on loop$NEXTLOOP >/dev/stderr
    else
      echo "mounting device: $IMGFILE" >/dev/stderr
      echo ...$IMGFILE mounted on loop$NEXTLOOP >/dev/stderr
    else
      echo "mounting device: $IMGFILE" >/dev/stderr

-     if ! mount -t "$IMGFS" "$IMGFILE" "$MNTPT" -o ${LOOP}noatime ; then
+     if ! mount -t "$IMGFS" "$IMGFILE" "$MNTPT" -o ${LOOP}noatime,nobh,nodiratime ; then

        MSG1=`printf "Mount failure!\n\n$IMGFILE failed to mount on $MNTPT"`
        if [ ! -f "/usr/bin/gxmessage" ] ; then
          echo $MSG1 >/dev/stderr
        MSG1=`printf "Mount failure!\n\n$IMGFILE failed to mount on $MNTPT"`
        if [ ! -f "/usr/bin/gxmessage" ] ; then
          echo $MSG1 >/dev/stderr

diff --git a/fremantle/easy-deb-chroot/build_easydebchroot.py b/fremantle/easy-deb-chroot/build_easydebchroot.py
index 4628399..ff65c32 100755 (executable)
--- a/fremantle/easy-deb-chroot/build_easydebchroot.py
+++ b/fremantle/easy-deb-chroot/build_easydebchroot.py
@@ -24,7 +24,7 @@ if __name__ == "__main__":
      p.description=qoledescript.read()
      p.xsbc_bugtracker="http://talk.maemo.org/showthread.php?t=34550"
      p.maemodispname="Easy Debian" 
      p.description=qoledescript.read()
      p.xsbc_bugtracker="http://talk.maemo.org/showthread.php?t=34550"
      p.maemodispname="Easy Debian" 

-     version = "0.9.42"   #Version of your software, e.g. "1.2.0" or "0.8.2"
+     version = "0.9.46"   #Version of your software, e.g. "1.2.0" or "0.8.2"

      build = "1fremantle1"         #Build number
      qolechangelog = open("control/changelog", "r")
      changeloginformation = qolechangelog.read()
      build = "1fremantle1"         #Build number
      qolechangelog = open("control/changelog", "r")
      changeloginformation = qolechangelog.read()

diff --git a/fremantle/easy-deb-chroot/control/changelog b/fremantle/easy-deb-chroot/control/changelog
index d4fc055..c65d9a1 100644 (file)
--- a/fremantle/easy-deb-chroot/control/changelog
+++ b/fremantle/easy-deb-chroot/control/changelog
@@ -1,2 +1,10 @@
+0.9.37 Fixed the closechroot icon, added back oo icon & fullscreen key
+0.9.38 Fixed top menu in LXDE and added ctrl-space fullscreen key.
+0.9.39 Tweaked top menu in LXDE
+0.9.40 New image (m5-v3), new icons for HW keys, closechroot and Evince, improved installer

 0.9.41: Fixed closechroot icon conflict with easy-chroot pkg
 0.9.42: Changed icon and .desktop name for Evince to avoid conflict with Maemo pkg, improved installer.
 0.9.41: Fixed closechroot icon conflict with easy-chroot pkg
 0.9.42: Changed icon and .desktop name for Evince to avoid conflict with Maemo pkg, improved installer.

+0.9.43: Removed Evince icon; Maemo version is just as good. Don't overwrite user's .xbindkeysrc
+0.9.44: Added notification (noise, vibration, LED) to install script, ready to push to Extras!
+0.9.45: Fixed ~/.xbindkeysrc file to work with all keyboards. Installer now triggers synchroot script.
+0.9.46: Deleted theme line from /home/user/.config/lxde/config
\ No newline at end of file

diff --git a/fremantle/easy-deb-chroot/control/description b/fremantle/easy-deb-chroot/control/description
index a003f44..9abf623 100644 (file)
--- a/fremantle/easy-deb-chroot/control/description
+++ b/fremantle/easy-deb-chroot/control/description
@@ -1,11 +1,11 @@
 Scripts to run Debian applications easily in Maemo
 Scripts to run Debian applications easily in Maemo

+(including OpenOffice, Gimp, LXDE and Java applet support) 

 for users not familiar with the command line.
 ---
 for users not familiar with the command line.
 ---

-NOTE: A large image file must be downloaded
-and installed before this package will work!
-You will need approx. 2.5 GB free in either
+NOTE: A large image file must be downloaded and installed before this
+package will work!  You will need approx. 2.5 GB free in either

 your MyDocs directory or your MicroSD card.
 your MyDocs directory or your MicroSD card.

-BE AWARE: Downloading and extracting can take 
-more than an hour and will need a fast connection!
-Instructions and an automated installer
-are provided in the package.
\ No newline at end of file
+BE AWARE: Downloading the approx. 300MB file and extracting it can
+take more than an hour and you will need a fast connection!
+---
+Instructions and an automated installer are provided in the package.
\ No newline at end of file

diff --git a/fremantle/easy-deb-chroot/control/postinst b/fremantle/easy-deb-chroot/control/postinst
index a7cc187..cd17d46 100644 (file)
--- a/fremantle/easy-deb-chroot/control/postinst
+++ b/fremantle/easy-deb-chroot/control/postinst
@@ -30,8 +30,9 @@ fi
 # fi
 
 if  [ -f "/home/user/.xbindkeysrc.orig" ] ; then
 # fi
 
 if  [ -f "/home/user/.xbindkeysrc.orig" ] ; then

-  rm /home/user/.xbindkeysrc.orig
-#  mv /home/user/.xbindkeysrc.orig /home/user/.xbindkeysrc
+#  rm /home/user/.xbindkeysrc.orig
+  mv /home/user/.xbindkeysrc /home/user/.xbindkeysrc.dist
+  mv /home/user/.xbindkeysrc.orig /home/user/.xbindkeysrc

 fi
 
 if  [ -f "/home/user/.gimp-2.6/gimprc.orig" ] ; then
 fi
 
 if  [ -f "/home/user/.gimp-2.6/gimprc.orig" ] ; then

diff --git a/fremantle/easy-deb-chroot/src/home/user/.config/lxde/config b/fremantle/easy-deb-chroot/src/home/user/.config/lxde/config
index 12ffa55..18a90c4 100644 (file)
--- a/fremantle/easy-deb-chroot/src/home/user/.config/lxde/config
+++ b/fremantle/easy-deb-chroot/src/home/user/.config/lxde/config
@@ -1,6 +1,5 @@
 
 [GTK]
 
 [GTK]

-sNet/ThemeName=MurrinaNightOrange

 sNet/IconThemeName=dlg-neu
 sGtk/FontName=DejaVu Sans Semi-Condensed 14
 iGtk/ToolbarStyle=0
 sNet/IconThemeName=dlg-neu
 sGtk/FontName=DejaVu Sans Semi-Condensed 14
 iGtk/ToolbarStyle=0

diff --git a/fremantle/easy-deb-chroot/src/home/user/.xbindkeysrc b/fremantle/easy-deb-chroot/src/home/user/.xbindkeysrc
index f01c392..29252e0 100644 (file)
--- a/fremantle/easy-deb-chroot/src/home/user/.xbindkeysrc
+++ b/fremantle/easy-deb-chroot/src/home/user/.xbindkeysrc
@@ -1,5 +1,3 @@
-Mounting...
-Using ext2 file system

 # For the benefit of emacs users: -*- shell-script -*-
 ###########################
 # xbindkeys configuration #
 # For the benefit of emacs users: -*- shell-script -*-
 ###########################
 # xbindkeys configuration #

@@ -25,7 +23,7 @@ Using ext2 file system
 #
 # List of modifier:
 #   Release, Control, Shift, Mod1 (Alt), Mod2 (NumLock),
 #
 # List of modifier:
 #   Release, Control, Shift, Mod1 (Alt), Mod2 (NumLock),

-#   Mod3 (CapsLock), Mod4, Mod5 (Scroll).
+#   Mod3 (CapsLock), Mod4, Mod5 (Blue Fn).

 #
 
 # The release modifier is not a standard X modifier, but you can
 #
 
 # The release modifier is not a standard X modifier, but you can

@@ -47,15 +45,51 @@ Using ext2 file system
     m:0x4 + c:65
     Control + space
 
     m:0x4 + c:65
     Control + space
 

+# the enter key is KP_Enter instead of Return (thanks, rebhana!)
+# some applications don't accept KP_Enter in place of Return, hence:

 
 

-# Examples of commands:
+"xvkbd -xsendevent -text '\r'"
+   Shift + KP_Enter

 
 

-#"xbindkeys_show" 
-#  control+shift + q
+# F1-F12 mapped to Shift+Fn + keys from upper row (thanks, rebhana):

 
 

-# set directly keycode (here control + f with my keyboard)
-#"xterm"
-#  c:41 + m:0x4
+"xvkbd -text "\[F1]""
+ m:0x81 + c:24
+
+"xvkbd -text "\[F2]""
+ m:0x81 + c:25
+
+"xvkbd -text "\[F3]""
+ m:0x81 + c:26
+
+"xvkbd -text "\[F4]""
+ m:0x81 + c:27
+
+"xvkbd -text "\[F5]""
+ m:0x81 + c:28
+
+"xvkbd -text "\[F6]""
+ m:0x81 + c:29
+
+"xvkbd -text "\[F7]""
+ m:0x81 + c:30
+
+"xvkbd -text "\[F8]""
+ m:0x81 + c:31
+
+"xvkbd -text "\[F9]""
+ m:0x81 + c:32
+
+"xvkbd -text "\[F10]""
+ m:0x81 + c:33
+
+"xvkbd -text "\[F11]""
+ m:0x81 + c:59
+
+"xvkbd -text "\[F12]""
+ m:0x81 + c:22
+
+# Examples of commands:

 
 # specify a mouse button
 #"xterm"
 
 # specify a mouse button
 #"xterm"

diff --git a/fremantle/easy-deb-chroot/src/home/user/img-install/debian-installer.sh b/fremantle/easy-deb-chroot/src/home/user/img-install/debian-installer.sh
index 0bb0979..f9cd2d8 100755 (executable)
--- a/fremantle/easy-deb-chroot/src/home/user/img-install/debian-installer.sh
+++ b/fremantle/easy-deb-chroot/src/home/user/img-install/debian-installer.sh
@@ -3,14 +3,13 @@
 ## Download the list of images. Also use this opportunity to check
 ## the Internet connection and availability of the server.
 
 ## Download the list of images. Also use this opportunity to check
 ## the Internet connection and availability of the server.
 

-IMGLIST="imagelist-0.9.40"
+IMGLIST="imagelist-fremantle-01"

 
 mv $IMGLIST $IMGLIST.old
 wget -t 3 http://qole.org/$IMGLIST
 if [ $? != 0 ] ; then
   MSG1=`printf "\
 Cannot download the list of available images.\n\
 
 mv $IMGLIST $IMGLIST.old
 wget -t 3 http://qole.org/$IMGLIST
 if [ $? != 0 ] ; then
   MSG1=`printf "\
 Cannot download the list of available images.\n\

-$? \

 Something is wrong with either your Internet connection\n\
 or the qole.org file server.\n\n\
 Check your Internet connection and the status\n\
 Something is wrong with either your Internet connection\n\
 or the qole.org file server.\n\n\
 Check your Internet connection and the status\n\

@@ -96,7 +95,7 @@ export GOTIT="no"
 if [ -f $TARPATH/$BIGTAR1 ] ; then
   echo You already have the big image file! 
   echo   Checking to see if it is good...
 if [ -f $TARPATH/$BIGTAR1 ] ; then
   echo You already have the big image file! 
   echo   Checking to see if it is good...

-  if [ "`$INSTPATH/md5sum  $TARPATH/$BIGTAR1 | awk '{print $1}'`" = "$MD51" ] ; then 
+  if [ "`md5sum  $TARPATH/$BIGTAR1 | awk '{print $1}'`" = "$MD51" ] ; then 

     export GOTIT="yes"
   fi
 fi
     export GOTIT="yes"
   fi
 fi

@@ -118,7 +117,7 @@ do
    export GOOD=$MD51
    if [ ! "$GOTIT" = "yes" ] ; then
      echo Testing the file to see if it is good.
    export GOOD=$MD51
    if [ ! "$GOTIT" = "yes" ] ; then
      echo Testing the file to see if it is good.

-     export TEST=`$INSTPATH/md5sum  $TARPATH/$BIGTAR1 | awk '{print $1}'`
+     export TEST=`md5sum  $TARPATH/$BIGTAR1 | awk '{print $1}'`

    else
      export TEST=$MD51
    fi
    else
      export TEST=$MD51
    fi

@@ -146,14 +145,18 @@ cause your device to become unresponsive."`
      if [ "$?" = 0 ] ; then
         rm -rf $TARPATH/$BIGTAR1
          $EXTCMD1
      if [ "$?" = 0 ] ; then
         rm -rf $TARPATH/$BIGTAR1
          $EXTCMD1

+         touch /home/user/.synchroot
+         ./msgnotify /usr/share/sounds/game-chess_checkmate.wav

          export MSG1=`printf "CONGRATULATIONS!\n\nAll has gone well!\n\nSuccess installing $PKGNAME1 package!"`
          gxmessage -center -alignbuttons right -buttons GTK_STOCK_OK:0 -geometry 640x250 -title "SUCCESS!" "$MSG1"
        else
          export MSG1=`printf "CONGRATULATIONS!\n\nAll has gone well!\n\nSuccess installing $PKGNAME1 package!"`
          gxmessage -center -alignbuttons right -buttons GTK_STOCK_OK:0 -geometry 640x250 -title "SUCCESS!" "$MSG1"
        else

+         ./msgnotify /usr/share/sounds/ui-information_note.wav

          export ERR1=`printf "ERROR! DECOMPRESSION FAILED!\nUnable to install $PKGNAME1\n$TARERR"`
          gxmessage -center -alignbuttons right -buttons GTK_STOCK_OK:0 -geometry 640x380 -title "DECOMPRESSION ERROR" "$ERR1"
          exit 99
       fi       
     else
          export ERR1=`printf "ERROR! DECOMPRESSION FAILED!\nUnable to install $PKGNAME1\n$TARERR"`
          gxmessage -center -alignbuttons right -buttons GTK_STOCK_OK:0 -geometry 640x380 -title "DECOMPRESSION ERROR" "$ERR1"
          exit 99
       fi       
     else

+      ./msgnotify /usr/share/sounds/ui-information_note.wav

       export ERR1=`printf "$PKGNAME1 package appears damaged.\nPress OK to try downloading again.\nCancel keeps the damaged file."`
       gxmessage -center -alignbuttons right -buttons GTK_STOCK_OK:0,GTK_STOCK_CANCEL:1 -geometry 640x100 -title "DOWNLOAD ERROR" "$ERR1"
       if [ "$?" = 1 ] ; then
       export ERR1=`printf "$PKGNAME1 package appears damaged.\nPress OK to try downloading again.\nCancel keeps the damaged file."`
       gxmessage -center -alignbuttons right -buttons GTK_STOCK_OK:0,GTK_STOCK_CANCEL:1 -geometry 640x100 -title "DOWNLOAD ERROR" "$ERR1"
       if [ "$?" = 1 ] ; then

diff --git a/fremantle/easy-deb-chroot/src/home/user/img-install/md5sum b/fremantle/easy-deb-chroot/src/home/user/img-install/md5sum
deleted file mode 100755 (executable)
index 1575535..0000000
Binary files a/fremantle/easy-deb-chroot/src/home/user/img-install/md5sum and /dev/null differ

diff --git a/fremantle/easy-deb-chroot/src/usr/bin/debwm b/fremantle/easy-deb-chroot/src/usr/bin/debwm
deleted file mode 100755 (executable)
index 2db2528..0000000
--- a/fremantle/easy-deb-chroot/src/usr/bin/debwm
+++ /dev/null
@@ -1,4 +0,0 @@
-/usr/bin/hostwin easy-debian x 'Log out to exit. CTRL-Backspace to get to the dashboard.' &
-sleep 1
-debbie xephwm easy-debian startlxde1
-killall hostwin
\ No newline at end of file

diff --git a/fremantle/easy-deb-chroot/src/usr/share/applications/hildon/debevince.desktop b/fremantle/easy-deb-chroot/src/usr/share/applications/hildon/debevince.desktop
deleted file mode 100644 (file)
index 5819754..0000000
--- a/fremantle/easy-deb-chroot/src/usr/share/applications/hildon/debevince.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Evince Doc Reader
-GenericName=Document Reader
-Exec=debbie evince
-Icon=evince
-X-Osso-Type=application/x-executable
-X-HildonDesk-ShowInToolbar=true
-Terminal=true
-Type=Application
-StartupNotify=true
\ No newline at end of file

diff --git a/fremantle/easy-deb-chroot/src/usr/share/icons/hicolor/scalable/hildon/debevince.png b/fremantle/easy-deb-chroot/src/usr/share/icons/hicolor/scalable/hildon/debevince.png
deleted file mode 100644 (file)
index f0b382f..0000000
Binary files a/fremantle/easy-deb-chroot/src/usr/share/icons/hicolor/scalable/hildon/debevince.png and /dev/null differ

diff --git a/fremantle/easy-deb-chroot/src/usr/share/themes/MurrinaNightOrange/gtk-2.0/gtkrc b/fremantle/easy-deb-chroot/src/usr/share/themes/MurrinaNightOrange/gtk-2.0/gtkrc
index 3ea49fa..11920cb 100755 (executable)
--- a/fremantle/easy-deb-chroot/src/usr/share/themes/MurrinaNightOrange/gtk-2.0/gtkrc
+++ b/fremantle/easy-deb-chroot/src/usr/share/themes/MurrinaNightOrange/gtk-2.0/gtkrc
@@ -5,8 +5,8 @@ style "theme-default"
   GtkButton      ::default_border    = { 0, 0, 0, 0 }
   GtkRange       ::trough_border     = 0
   GtkPaned       ::handle_size       = 6
   GtkButton      ::default_border    = { 0, 0, 0, 0 }
   GtkRange       ::trough_border     = 0
   GtkPaned       ::handle_size       = 6

-  GtkRange       ::slider_width      = 15
-  GtkRange       ::stepper_size      = 15
+  GtkRange       ::slider_width      = 32
+  GtkRange       ::stepper_size      = 38

 
   GtkScrollbar   ::min_slider_length = 30
   GtkCheckButton ::indicator_size    = 14
 
   GtkScrollbar   ::min_slider_length = 30
   GtkCheckButton ::indicator_size    = 14

diff --git a/fremantle/easy-deb-chroot/src/usr/share/themes/MurrinaNightOrange/wallpaper.png b/fremantle/easy-deb-chroot/src/usr/share/themes/MurrinaNightOrange/wallpaper.png
deleted file mode 100644 (file)
index adef047..0000000
Binary files a/fremantle/easy-deb-chroot/src/usr/share/themes/MurrinaNightOrange/wallpaper.png and /dev/null differ