Check-in [a913fe8a97]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

SHA1 Hash:a913fe8a978b571af5de292908c53b1f4e30eeca
Date: 2012-07-23 09:19:34
User: BarryK
Comment:disable text-mode xorgwizard for the arm boards

Tags And Properties
Changes

Changes to woof-code/3builddistro

@@ -127,10 +127,11 @@
 #120708 added BOOT_QUICKSETUP='quickarm'. quickarm is symlink to /usr/sbin/quicksetup. leave out X config frame for arm boards.
 #120709 fix for pci.ids and usb.ids in "wrong" place. new BOOT_UDEVDCHILDREN.
 #120714 revert 120708. instead, BOOT_BOARD (= raspi, mele, odroidx, etc.) read by quicksetup.
 #120720 raspbian wheezy has files in /lib/arm-linux-gnueabihf and /usr/lib/arm-linux-gnueabihf
 #120721 support ubuntu and debian arm multiarch.
+#120723 BOOT_DISABLEXORGWIZARD variable.
 
 #v431 accepts passed params, from woof_gui_tabs:
 #$1=$CHOICE_KERNELPKG $2=$CHOICE_SCSI $3=$CHOICE_BIGMODEM $4=$CHK_FB_STATE $5=$CHK_EXOTIC_STATE $6=$CHK_RADICAL_STATE
 #100912 add $7=CHK_SIMPLE_FILENAMES
 
@@ -2319,33 +2320,10 @@
 #120224 move rootfs-complete/usr/share/doc/nls to 'devx'...
 mkdir -p devx/usr/share/doc/nls
 cp -a -f rootfs-complete/usr/share/doc/nls/* devx/usr/share/doc/nls/
 rm -r -f rootfs-complete/usr/share/doc/nls
 
-#110413 variable DISTRO_XORG_AUTO in /etc/DISTRO_SPECS, see also /usr/bin/xwin
-autoflag='no'
-#if [ "$DISTRO_XORG_AUTO" ];then
- #if [ $XORGVER -ge 170 ];then
- if vercmp "$XORGVER" ge "1.7.0";then #110621
-  echo
-  echo "Do you want Xorg to start automatically at first boot (or at 'pfix=ram'"
-  echo "kernel boot param) or run Xorg Wizard? The latter has been the case for"
-  echo "earlier puppies. Automatic startup of X usually works, though in some"
-  echo "cases may choose the wrong monitor resolution or driver -- which can be"
-  echo "fixed by running Xorg Wizard afterward."
-  echo -n "Press ENTER only for conventional XorgWizard: "
-  read xorgauto
-  [ "$xorgauto" != "" ] && autoflag='yes'
- fi
- if [ "`grep '^DISTRO_XORG_AUTO' rootfs-complete/etc/DISTRO_SPECS`" = "" ];then #110621
-  echo "DISTRO_XORG_AUTO='${autoflag}'" >> rootfs-complete/etc/DISTRO_SPECS
- else
-  REGEXauto="s%^DISTRO_XORG_AUTO.*%DISTRO_XORG_AUTO='${autoflag}'%"
-  sed -i -e "$REGEXauto" rootfs-complete/etc/DISTRO_SPECS
- fi
-#fi
-
 #110417 this may be helpful for more apps than Thunar...
 #this will make Thunar use ROX-Filer's icons for files...
 if [ -d rootfs-complete/usr/local/apps/ROX-Filer/ROX/MIME ];then
  if [ ! -e rootfs-complete/usr/share/icons/hicolor/48x48/mimetypes ];then
   ln -s ../../../../local/apps/ROX-Filer/ROX/MIME rootfs-complete/usr/share/icons/hicolor/48x48/mimetypes
@@ -2490,11 +2468,40 @@
  echo "BOOT_DIRTYWRITE='1500'" >> rootfs-complete/etc/rc.d/BOOTCONSTRAINED #defer writing to disk. refer: http://www.lesswatts.org/tips/disks.php
  echo "BOOT_SCHEDULER='deadline'" >> rootfs-complete/etc/rc.d/BOOTCONSTRAINED #my kernel defaults to 'cfq', change to 'deadline'. refer: http://tombuntu.com/index.php/2008/09/04/four-tweaks-for-using-linux-with-solid-state-drives/
  #echo "BOOT_QUICKSETUP='quickarm'" >> rootfs-complete/etc/rc.d/BOOTCONSTRAINED #120708 leaves out X config frame. 120714 removed.
  echo "BOOT_UDEVDCHILDREN='1'" >> rootfs-complete/etc/rc.d/BOOTCONSTRAINED #120709 is this a good idea? append --children-max=1 to udevd in rc.sysinit.
  echo "BOOT_BOARD='${BOOT_BOARD}'" >> rootfs-complete/etc/rc.d/BOOTCONSTRAINED #120714 read by quicksetup.
-fi
+ echo "BOOT_DISABLEXORGWIZARD='yes'" >> rootfs-complete/etc/rc.d/BOOTCONSTRAINED #120723 read in xwin, also xorgwizard. also see below.
+fi
+
+#120723 code moved down, add BOOT_DISABLEXORGWIZARD test...
+#110413 variable DISTRO_XORG_AUTO in /etc/DISTRO_SPECS, see also /usr/bin/xwin
+autoflag='no'
+if [ "$BOOT_DISABLEXORGWIZARD" != "yes" ];then
+ if [ "$DISTRO_XORG_AUTO" ];then
+  autoflag="$DISTRO_XORG_AUTO"
+ else
+  if vercmp "$XORGVER" ge "1.7.0";then #110621
+   echo
+   echo "Do you want Xorg to start automatically at first boot (or at 'pfix=ram'"
+   echo "kernel boot param) or run Xorg Wizard? The latter has been the case for"
+   echo "earlier puppies. Automatic startup of X usually works, though in some"
+   echo "cases may choose the wrong monitor resolution or driver -- which can be"
+   echo "fixed by running Xorg Wizard afterward."
+   echo -n "Press ENTER only for automatic Xorg: "
+   read xorgauto
+   [ "$xorgauto" = "" ] && autoflag='yes'
+  fi
+ fi
+fi
+if [ "`grep '^DISTRO_XORG_AUTO' rootfs-complete/etc/DISTRO_SPECS`" = "" ];then #110621
+ echo "DISTRO_XORG_AUTO='${autoflag}'" >> rootfs-complete/etc/DISTRO_SPECS
+else
+ REGEXauto="s%^DISTRO_XORG_AUTO.*%DISTRO_XORG_AUTO='${autoflag}'%"
+ sed -i -e "$REGEXauto" rootfs-complete/etc/DISTRO_SPECS
+fi
+
 
 #120709 debian squeeze has /usr/share/misc/pci.ids, usb.ids, which confuses some apps, create symlinks...
 if [ ! -e rootfs-complete/usr/share/pci.ids ];then
  if [ -e rootfs-complete/usr/share/misc/pci.ids ];then
   ln -s misc/pci.ids rootfs-complete/usr/share/pci.ids

Changes to woof-code/rootfs-skeleton/usr/bin/xwin

@@ -30,10 +30,11 @@
 #120131 rodin.s: internationalized.
 #120301 load console font on exit from X.
 #120505 automatic network reconnect. refer /usr/sbin/hostname-set
 #120511 hostname-set changed HOSTNAME, via quicksetup, X is restarted, update $HOSTNAME (was exported at bootup in /etc/profile)...
 #120517 arm hardware does not support ddcprobe.
+#120723 simplify xorg auto logic (refer 3builddistro).
 
 export TEXTDOMAIN=xwin
 export OUTPUT_CHARSET=UTF-8
 eval_gettext () {
   local myMESSAGE=$(gettext "$1")
@@ -55,10 +56,11 @@
 #PUPMODE=current operating configuration,
 #PDEV1=the partition have booted off, DEV1FS=f.s. of PDEV1,
 #PUPSFS=puppy.sfs main part of puppy, stored on PDEV1, PUPSAVE=vfat,sda1,/pup_save.3fs
 #PMEDIA is a broad description of the boot media, ex "usbflash" or "idehd".
 . /etc/DISTRO_SPECS #110413
+. /etc/rc.d/BOOTCONSTRAINED #120723
 
 KERNELVER="`uname -r`" #w479
 
 #120505 automatic network reconnect. refer /usr/sbin/hostname-set
 if [ -f /tmp/simple_network_setup/network_default_reconnect_required_flag ];then
@@ -93,11 +95,11 @@
    sleep 1
    ddcprobe >/tmp/ddcprobe.txt
    ;;
   esac
 
-#v3.99 begin
+  #v3.99 begin
   if [ -f /etc/xorgoverrides ] && grep -q -f /etc/xorgoverrides /tmp/ddcprobe.txt;then
    rm -f /etc/.XLOADED 2> /dev/null #not necessary, precaution.
    #1st dialog offers to use Xvesa...
    /usr/sbin/xorgwizard
    HAVEX="`readlink /usr/bin/X`"
@@ -107,11 +109,11 @@
 fi
 #Repeat earlier tests in case Xserver now Xorg and to retain indentation levels.
 if [ "$HAVEX" = "Xvesa" ];then #0.9.9
  BASEMODE=""
  if [ ! -f /tmp/videomode -a ! -f /etc/videomode ];then #v2.21
-#v3.99 end
+ #v3.99 end
 
   #v3.95 note code duplicated in xorgwizard, not efficient...
   #v3.94 detect if a Classmate PC laptop with 800x480 screen...
   #if [ "`grep 'edidfail' /tmp/ddcprobe.txt`" != "" ];then
   # if [ "`cat /tmp/ddcprobe.txt | tr -s ' ' | grep 'oem: Intel(r)915GM/910ML/915MS Graphics'`" != "" ];then
@@ -333,23 +335,20 @@
    fi
   fi
  fi
  if [ ! -f /etc/X11/xorg.conf ];then
   rm -f /etc/.XLOADED 2> /dev/null #not necessary, precaution.
-  #20110328 xorg 7.5, automatic setup... 110622 fix test...
-  #XORGMAJORVER=`Xorg -version 2>&1 | grep -o '^X.Org X Server 1.[0-9]' | rev | cut -c 1` #1.7.5 will return 7
-  XORGVER="`Xorg -version 2>&1 | grep '^X\.Org X Server' | rev | cut -f 1 -d ' ' | rev`"
-  #[ ! $XORGMAJORVER ] && XORGMAJORVER=3
-  #if [ $XORGMAJORVER -ge 7 -a "$DISTRO_XORG_AUTO" = "yes" ];then #110413
-  [ "$XORGVER" = "" ] && XORGVER="1.3.0"
-  AUTOXORG='no'
+  #120723 simplify xorg auto logic (refer 3builddistro)...
+  #XORGVER="`Xorg -version 2>&1 | grep '^X\.Org X Server' | rev | cut -f 1 -d ' ' | rev`"
+  #[ "$XORGVER" = "" ] && XORGVER="1.3.0"
+  #AUTOXORG='no'
   if [ "$DISTRO_XORG_AUTO" = "yes" ];then #see /etc/DISTRO_SPECS.
-   if vercmp "$XORGVER" ge "1.7.0";then
-    AUTOXORG='yes'
-   fi
-  fi
-  if [ "$AUTOXORG" = "yes" ];then
+  # if vercmp "$XORGVER" ge "1.7.0";then
+  #  AUTOXORG='yes'
+  # fi
+  #fi
+  #if [ "$AUTOXORG" = "yes" ];then
    /usr/sbin/xorgwizard-automatic
   else
    #1st dialog offers to use Xvesa...
    /usr/sbin/xorgwizard
    HAVEX="`readlink /usr/bin/X`"

Changes to woof-code/rootfs-skeleton/usr/sbin/xorgwizard

@@ -65,10 +65,11 @@
 #120213 rodin.s: removed LANG=C prefix when run xinitrc_test.
 #120226 01micko: bugfix, call new script 'nouveau_unload'.
 #120301 it seems have to reload console font after exit from X.
 #120318 correctly set keyboard layout, model and variant.
 #120323 partial replace 'xmessage' with 'pupmessage'.
+#120723 BOOT_DISABLEXORGWIZARD variable in /etc/rc.d/BOOTCONSTRAINED. refer 3builddistro, also xwin.
 
 [ "`whoami`" != "root" ] && exec sudo -A ${0} ${@} #110505
 
 export TEXTDOMAIN=xorgwizard
 export OUTPUT_CHARSET=UTF-8
@@ -79,10 +80,21 @@
 
 #120226 unload nouveau
 [ $DISPLAY ] && CURRENTVIDEODRIVER="`grep -E -i " connected|card detect|primary dev" /var/log/Xorg.0.log|cut -d ':' -f1|rev|cut -d ' ' -f1|rev|cut -d '(' -f1|tr '[:upper:]' '[:lower:]'|head -n1`"
 [ "$CURRENTVIDEODRIVER" = "nouveau" ] && nouveau_unload
 [ -f /tmp/abort_xorgwizard ] && exit
+
+. /etc/DISTRO_SPECS #120723
+. /etc/rc.d/BOOTCONSTRAINED #120723
+
+if [ ! $DISPLAY ];then #120723
+ if [ "$BOOT_DISABLEXORGWIZARD" = "yes" ];then #120723 refer /etc/rc.d/BOOTCONSTRAINED and 3builddistro.
+  echo
+  echo "Sorry, the text-mode Xorg Wizard is disabled for this build of Puppy."
+  exit
+ fi
+fi
 
 alternate_driver_func() { #100401 100708
  REPLACEDDRV=""
  mv -f /usr/lib/x/drivers-backup/* /usr/lib/xorg/modules/drivers/ 2>/dev/null
  SUBSTDRV="$1" #alternative driver in /usr/lib/x/drivers-alternate
@@ -244,25 +256,28 @@
 RETVALS="`keymap-set --xopt`"
 eval "$RETVALS" #ex: XKBMODEL="pc102", XKBLAYOUT="us", XKBVARIANT=""
 [ "$XKBLAYOUT" = "" ] && XKBLAYOUT='us'
 [ "$XKBMODEL" = "" ] && XKBMODEL='pc102'
 
-MAIN1="
-<window title=\"$(gettext 'Xorg Video Wizard')\">
-<hbox>
- <vbox>
-  <text><label>\"$(gettext 'Welcome to the Puppy Linux
-Xorg Video Wizard!')\"</label></text>
+if [ "$BOOT_DISABLEXORGWIZARD" = "yes" ];then #120723 refer /etc/rc.d/BOOTCONSTRAINED and 3builddistro.
+ XORGPRELIM_XML="
+  <text><label>\"$(gettext 'The behaviour of Xorg is controlled
+by a configuration file, /etc/X11/
+xorg.conf. This was generated auto-
+matically at the first boot, but
+you may now edit it manually.')\"</label></text>"
+ XORGWIZ_XML=""
+else
+ XORGPRELIM_XML="
   <text><label>\"$(gettext 'The behaviour of Xorg is controlled
 by a configuration file, /etc/X11/
 xorg.conf. You have a choice here,
 either to completely reconstruct
 the /etc/X11/xorg.conf file, or
-to modify the existing file.')\"</label></text>
- </vbox>
- <vbox>
-  <frame $(gettext 'XorgWizard')>
+to modify the existing file.')\"</label></text>"
+ XORGWIZ_XML="
+ <frame $(gettext 'XorgWizard')>
   <hbox>
    <text><label>$(gettext 'XorgWizard completely reconstructs the /etc/X11/xorg.conf file, and X must not be running to do this. A reboot is required, and the Wizard will run in text mode, before X is launched.')</label></text>
    <vbox>
     <button>
      <input file>/usr/local/lib/X11/mini-icons/wizard16.xpm</input>
@@ -269,12 +284,23 @@
      <action>EXIT:11</action>
     </button>
    </vbox>
   </hbox>
   <text><label>$(gettext 'NOTE: You can also run XorgWizard manually, without rebooting, by exiting from X to the commandline (see Shutdown menu) then run xorgwizard.')</label></text>
-  </frame>
-
+ </frame>"
+fi
+
+MAIN1="
+<window title=\"$(gettext 'Xorg Video Wizard')\">
+<hbox>
+ <vbox>
+  <text><label>\"$(gettext 'Welcome to the Puppy Linux
+Xorg Video Wizard!')\"</label></text>
+  ${XORGPRELIM_XML}
+ </vbox>
+ <vbox>
+  ${XORGWIZ_XML}
   <frame $(gettext 'Edit xorg.conf')>
    <hbox>
     <text><label>$(gettext 'You can manually edit /etc/X11/xorg.conf, but note that you will need to exit from X afterward then restart X (see Shutdown menu). Click button to edit:')</label></text>
     <vbox>
      <button>

Changes to woof-distro/arm/Packages-puppy-armv6-official

@@ -61,10 +61,12 @@
 gifsicle-1.40-armv6|gifsicle|1.40-armv6||BuildingBlock|188K||gifsicle-1.40-armv6.pet||Create and edit GIF images|puppy|||
 gifsicle_DOC-1.40-armv6|gifsicle_DOC|1.40-armv6||BuildingBlock|56K||gifsicle_DOC-1.40-armv6.pet||cli edit gif images||||
 glipper-0.95.1-armv6|glipper|0.95.1-armv6||Desktop|44K||glipper-0.95.1-armv6.pet|+gtk+|clipboard manager for traybar|puppy|||
 glipper_DOC-0.95.1-armv6|glipper_DOC|0.95.1-armv6||Desktop|84K||glipper_DOC-0.95.1-armv6.pet||clipboard manager for tray||||
 glipper_NLS-0.95.1-armv6|glipper_NLS|0.95.1-armv6||Desktop|52K||glipper_NLS-0.95.1-armv6.pet|+glipper|clipboard manager for tray||||
+gmeasures-0.7-sap6|gmeasures|0.7-sap6||Business|88K||gmeasures-0.7-sap6.pet|+gtk+|weights and measures converter|debian|squeeze||
+gmeasures_DOC-0.7-sap6|gmeasures_DOC|0.7-sap6||Business|60K||gmeasures_DOC-0.7-sap6.pet||units converter||||
 gnet-2.0.8-armv6|gnet|2.0.8-armv6||BuildingBlock|180K||gnet-2.0.8-armv6.pet||needed by surfer, help_surfer browsers|puppy|||
 gnet_DEV-2.0.8-armv6|gnet_DEV|2.0.8-armv6||BuildingBlock|760K||gnet_DEV-2.0.8-armv6.pet|+gnet|needed by surfer browser (and help_surfer)|puppy|||
 gnet_DOC-2.0.8-armv6|gnet_DOC|2.0.8-armv6||BuildingBlock|680K||gnet_DOC-2.0.8-armv6.pet||needed by surfer browser||||
 gnome-menus-2.24.2-armv6|gnome-menus|2.24.2-armv6||BuildingBlock|328K||gnome-menus-2.24.2-armv6.pet||needed by xdg_puppy at compiled-time, not needed at runtime|puppy|||
 gnome-menus_DEV-2.24.2-armv6|gnome-menus_DEV|2.24.2-armv6||BuildingBlock|396K||gnome-menus_DEV-2.24.2-armv6.pet|+gnome-menus|needed by xdg_puppy at compile-time, not needed at runtime|puppy|||
@@ -143,12 +145,12 @@
 linux_kernel-3.1.9-armv6-raspi-19apr2012|linux_kernel|3.1.9-armv6-raspi-19apr2012||BuildingBlock|18688K||linux_kernel-3.1.9-armv6-raspi-19apr2012.pet||Linux kernel for Raspberry Pi. Compiled 19 April 2012. Notice: linux_kernel PETs are for use by Woof developers only, not to be installed by end users||||
 linux_kernel-3.1.9-sap6-raspi-27jun2012|linux_kernel|3.1.9-sap6-raspi-27jun2012||BuildingBlock|18688K||linux_kernel-3.1.9-sap6-raspi-27jun2012.pet||Linux kernel for Raspberry Pi. Compiled 27 june 2012. Notice: linux_kernel PETs are for use by Woof developers only, not to be installed by end users|debian|squeeze||
 mingetty-1.08-armv6|mingetty|1.08-armv6||BuildingBlock|20K||mingetty-1.08-armv6.pet||small getty replacement, features autologin|puppy|||
 mingetty_DOC-1.08-armv6|mingetty_DOC|1.08-armv6||BuildingBlock|24K||mingetty_DOC-1.08-armv6.pet||small getty replacement, features autologin||||
 minixcal-1.1.1-armv6|minixcal|1.1.1-armv6||Desktop|8K||minixcal-1.1.1-armv6.pet|+gtk+|enhanced clock applet for tray|puppy|||
-mixmos-0.2.0-sap6|mixmos|0.2.0-sap6||Multimedia|408K||mixmos-0.2.0-sap6.pet|+gtk+|Mixmos sound mixer|debian|squeeze||
-mixmos_DOC-0.2.0-sap6|mixmos_DOC|0.2.0-sap6||Multimedia|20K||mixmos_DOC-0.2.0-sap6.pet||sound mixer||||
+mixmos-0.2.0-1-sap6|mixmos|0.2.0-1-sap6||Multimedia|408K||mixmos-0.2.0-1-sap6.pet|+gtk+|Mixmos sound mixer, with tray applet|debian|squeeze||
+mixmos_DOC-0.2.0-1-sap6|mixmos_DOC|0.2.0-1-sap6||Multimedia|20K||mixmos_DOC-0.2.0-1-sap6.pet||sound mixer||||
 modem_stats-1.0.1-armv6|modem_stats|1.0.1-armv6||BuildingBlock|6K||modem_stats-1.0.1-armv6.pet||send commands to a modem|gentoo|gap6||
 mp-3.2.13-armv6|mp|3.2.13-armv6||Document|196K||mp-3.2.13-armv6.pet||MP console editor|puppy|||
 mpscan-0.1.0-armv6|mpscan|0.1.0-armv6||BuildingBlock|24K||mpscan-0.1.0-armv6.pet||mpscan utility|debian|squeeze||
 nenscript-1.13.3-armv6|nenscript|1.13.3-armv6||BuildingBlock|36K||nenscript-1.13.3-armv6.pet||Text file to Postscript converter|puppy|||
 nenscript_DOC-1.13.3-armv6|nenscript_DOC|1.13.3-armv6||BuildingBlock|24K||nenscript_DOC-1.13.3-armv6.pet||text file to postscript converter||||
@@ -207,10 +209,11 @@
 squashfs-tools-3.3-armv6|squashfs-tools|3.3-armv6||BuildingBlock|148K||squashfs-tools-3.3-armv6.pet||A compressed read-only filesystem for Linux, for squashfs 3.x filesystems|puppy|||
 squashfs-tools4-4.2-gzip-xz-armv6|squashfs-tools4|4.2-gzip-xz-armv6||BuildingBlock|200K||squashfs-tools4-4.2-gzip-xz-armv6.pet|+linux_kernel&ge2.6.39,+xz|squashfs utilities, with gzip and xz compression support, use with kernel 2.6.39 or later and with xz support|puppy|||
 ssh_gui-0.7.1-patched1-armv6|ssh_gui|0.7.1-patched1-armv6||Internet|40K||ssh_gui-0.7.1-patched1-armv6.pet|+gtk+,+openssh_client|secure ssh remote login gui|puppy|||
 streamripper-1.64.6-armv6|streamripper|1.64.6-armv6||BuildingBlock|132K||streamripper-1.64.6-armv6.pet|+libmad,+faad2,+libogg,+libvorbis|rip media streams, used by pmusic|puppy|||
 streamripper_DOC-1.64.6-armv6|streamripper_DOC|1.64.6-armv6||BuildingBlock|44K||streamripper_DOC-1.64.6-armv6.pet||rip media streams||||
+superscan-0.8-patched1-sap6|superscan|0.8-patched1-sap6||Network|92K||superscan-0.8-patched1-sap6.pet|+gtk+|port scanner|debian|squeeze||
 surfer-0.0.7-patched_libgtkhtml-armv6|surfer|0.0.7-patched_libgtkhtml-armv6||Internet|76K||surfer-0.0.7-patched_libgtkhtml-armv6.pet|+gnet,+libSystem,+libgtkhtml,+gtk+|Simple web browser, limited html and css support. note, helpsurfer pkg is cutdown surfer|puppy|||
 tar-1.26-armv6|tar|1.26-armv6||BuildingBlock|400K||tar-1.26-armv6.pet||archive utility||||
 truncate-1.0-armv6|truncate|1.0-armv6||BuildingBlock|28K||truncate-1.0-armv6.pet||truncate a file, used by pet-tools|puppy|||
 udev_167-167-patched_t2-sap6|udev_167|167-patched_t2-sap6||BuildingBlock|420K||udev_167-167-patched_t2-sap6.pet||daemon to handle kernel uevents|debian|squeeze||
 unclutter-1.09-armv6|unclutter|1.09-armv6||Desktop|24K||unclutter-1.09-armv6.pet|+xorg|daemon to remove mouse pointer after period of inactivity|puppy|||

Changes to woof-distro/arm/debian/squeeze/DISTRO_PKGS_SPECS-debian-squeeze

@@ -190,11 +190,11 @@
 yes|glib|libglib2.0-0,libglib2.0-data,libglib2.0-dev|exe,dev,doc,nls
 yes|glibc|libc-bin,libc6,libc6-dev,tzdata|exe,dev,doc,nls
 yes|glibc_locales|locales|exe,dev,doc,nls>exe| #pkg belocs-locales-bin_ removed.
 no|glibc_i18n_en||exe
 yes|glipper||exe,dev>null,doc,nls
-no|gmeasures||exe,dev>null,doc,nls
+yes|gmeasures||exe,dev>null,doc,nls
 yes|gmp|libgmp3c2|exe>dev,dev,doc,nls
 yes|gnet||exe,dev,doc,nls| #needed by helpsurfer.
 yes|gnome-doc-utils|gnome-doc-utils|exe>dev,dev,doc,nls|+python-libxml2
 yes|gnome-keyring|libgnome-keyring0,libgnome-keyring-dev|exe,dev,doc,nls
 yes|gnome-menus|libgnome-menu2,libgnome-menu-dev|exe,dev,doc,nls
@@ -613,11 +613,11 @@
 yes|ssh_gui||exe,dev,doc,nls
 yes|startup-notification|libstartup-notification0,libstartup-notification0-dev|exe,dev,doc,nls
 yes|strace|strace|exe>dev,dev,doc,nls
 no|stress||exe,dev,doc,nls| #useful, stress-test the computer.
 yes|subversion|subversion,libsvn1,libdb4.6,libneon27-gnutls,libaprutil1,libpq5,libmysqlclient16,libapr1|exe>dev,dev,doc,nls
-no|superscan||exe
+yes|superscan||exe
 yes|sylpheed|sylpheed,libcompfaceg1,libgpgme11,libldap-2.4-2,libonig2,libpisock9,libbluetooth3|exe,dev,doc,nls
 no|sylpheed||exe
 no|sys-freedos||exe
 yes|sysfsutils|libsysfs2,libsysfs-dev,sysfsutils|exe,dev,doc,nls
 yes|syslinux|syslinux-common|exe,dev>null,doc,nls| #no, must use pet syslinux pkg.

Changes to woof-distro/arm/gentoo/gap6/DISTRO_PKGS_SPECS-gentoo-gap6

@@ -188,11 +188,11 @@
 yes|glibc|glibc,timezone-data|exe,dev,doc,nls|
 yes|glibc_locales|glibc|exe,dev,doc,nls>exe|
 no|glibmm||exe>dev
 yes|glib-networking|glib-networking|exe,dev,doc,nls
 yes|glipper||exe,dev>null,doc,nls
-no|gmeasures||exe,dev>null,doc,nls
+yes|gmeasures||exe,dev>null,doc,nls
 yes|gmp|gmp|exe,dev,doc,nls
 yes|gnet||exe,dev,doc,nls| #needed by helpsurfer.
 yes|gnome-menus||exe,dev,doc,nls
 no|gnome-mplayer||exe,dev,doc,nls
 no|gnumeric||exe,dev,doc,nls
@@ -536,11 +536,11 @@
 yes|startup-notification|startup-notification|exe,dev,doc,nls
 no|strace|strace|exe>dev,dev,doc,nls
 yes|streamripper||exe,dev,doc,nls
 no|subversion|subversion|exe>dev,dev,doc,nls
 yes|sudo|sudo|exe,dev,doc,nls
-no|superscan||exe
+yes|superscan||exe
 no|sweep|sweep|exe,dev,doc,nls
 no|sylpheed||exe
 no|synclient||exe
 no|sys-freedos||exe
 no|sysfsutils|sysfsutils|exe,dev,doc,nls

Changes to woof-distro/arm/raspbian/wheezy/DISTRO_PKGS_SPECS-raspbian-wheezy

@@ -213,11 +213,11 @@
 yes|glibc|libc-bin,libc6,libc6-dev,tzdata|exe,dev,doc,nls
 yes|glibc_locales|locales|exe,dev,doc,nls>exe
 no|glibc_i18n_en||exe
 yes|glibmm|libglibmm-2.4-1c2a,libglibmm-2.4-dev|exe,dev,doc,nls
 yes|glipper||exe,dev>null,doc,nls
-no|gmeasures||exe,dev>null,doc,nls
+yes|gmeasures||exe,dev>null,doc,nls
 yes|gmp|libgmp10|exe>dev,dev,doc,nls
 yes|gnome-doc-utils|gnome-doc-utils|exe>dev,dev,doc,nls|+python-libxml2
 yes|gnome-keyring|libgnome-keyring0,libgnome-keyring-dev|exe,dev,doc,nls
 yes|gnome_menus|libgnome-menu2,libgnome-menu-dev|exe,dev,doc,nls
 no|gnome_mplayer||exe,dev,doc,nls
@@ -339,10 +339,11 @@
 yes|libdvdnav|libdvdnav4,libdvdnav-dev|exe,dev,doc,nls| #needed by mplayer.
 no|libdvdplay||exe,dev,doc,nls
 yes|libdvdread|libdvdread4,libdvdread-dev|exe,dev,doc,nls
 yes|libedit|libedit2,libedit-dev|exe,dev,doc,nls
 yes|libelf|libelfg0,libelfg0-dev|exe,dev,doc,nls| #note, elfutils is a different pkg.
+yes|libevent|libevent-2.0-5,libevent-core-2.0-5,libevent-dev|exe,dev,doc,nls| #needed by iceape.
 yes|libexif|libexif12,libexif-dev|exe,dev,doc,nls
 yes|libexif-gtk|libexif-gtk5,libexif-gtk-dev|exe,dev,doc,nls
 yes|libffi|libffi5,libffi-dev|exe,dev,doc,nls
 yes|libfs|libfs6,libfs-dev|exe,dev,doc,nls| #120603 mavrothal reported need this for compiling xorg drivers.
 yes|libgcrypt|libgcrypt11,libgcrypt11-dev|exe,dev,doc,nls
@@ -641,11 +642,11 @@
 yes|ssh_gui||exe
 yes|startup-notification|libstartup-notification0,libstartup-notification0-dev|exe,dev,doc,nls
 yes|strace|strace|exe>dev,dev,doc,nls
 yes|streamripper|streamripper|exe,dev,doc,nls
 yes|subversion|subversion,libsvn1,libdb5.1,libneon27-gnutls,libaprutil1,libpq5,libmysqlclient18,libapr1|exe>dev,dev,doc,nls
-no|superscan||exe
+yes|superscan||exe
 no|sylpheed|sylpheed,libbluetooth3,libcompfaceg1,libonig2,libpisock9,libgpgme11|exe,dev,doc,nls
 no|sylpheed||exe
 no|synclient||exe
 no|sys-freedos||exe
 yes|sysfsutils|libsysfs2,libsysfs-dev,sysfsutils|exe,dev,doc,nls

Changes to woof-distro/arm/raspbian/wheezy/DISTRO_SPECS

@@ -1,9 +1,9 @@
 #One or more words that identify this distribution:
 DISTRO_NAME='Wheezy Arm Raspbian Puppy'
 #version number of this distribution:
-DISTRO_VERSION=5.110
+DISTRO_VERSION=5.111
 #The distro whose binary packages were used to build this distribution:
 DISTRO_BINARY_COMPAT='raspbian'
 #Prefix for some filenames: exs: wap6save.2fs, wap6-4.99.0.sfs
 DISTRO_FILE_PREFIX='warp'
 #The version of the distro whose binary packages were used to build this distro: