Check-in [a0cca3798b]
Not logged in

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

Overview

SHA1 Hash:a0cca3798be0077741a507e3d380faad97c5dad9
Date: 2012-07-09 13:12:13
User: BarryK
Comment:built puppy 5.101 for RP, precursor to alpha3, lots of fixes

Tags And Properties
Changes

Changes to woof-arch/x86/build/support/find_cat

cannot compute difference between binary files

Changes to woof-arch/x86/target/boot/initrd-tree0/bin/guess_fstype

cannot compute difference between binary files

Changes to woof-code/3builddistro

@@ -119,10 +119,14 @@
 #120616 check dri drivers exist before offer kernel modesetting.
 #120618 raspi debian squeeze, links as main browser, helpsurfer html viewer, gtkmoz missing. 120620 modify.
 #120628 certain utilities are not appropriate when booting on an arm board.
 #120703 sd card: allow 2nd partition to be ext2, ext3 or ext4.
 #120704 ask if want to load swap partition/file at bootup.
+#120704 sd card image, ext2 f.s., offer to bump to ext4 (without journal).
+#120705 refine upgrade ext2 to ext4. 120706 disktype misreports ext4 without journal as ext2.
+#120707 change relatime to noatime. see also rc.sysinit.
+#120708 added BOOT_QUICKSETUP='quickarm'. quickarm is symlink to /usr/sbin/quicksetup. leave out X config frame for arm boards.
 
 #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
 
@@ -2426,10 +2430,39 @@
 #120620 problem, helpsurfer cannot display /usr/share/doc/index.html, so do not point gtkmoz at basichtmlviewer...
 if [ ! -e rootfs-complete/usr/local/bin/gtkmoz ];then
  ln -s defaultbrowser rootfs-complete/usr/local/bin/gtkmoz
 fi
 
+#120704 some constraints in a small system...
+if [ "$SDFLAG" != "" ];then
+ #ask if want to load swap partition/file...
+ echo
+ echo "Puppy will normally load a swap partition or swap file if it/they exist,
+however you can choose to ignore them and not load them at bootup."
+ echo -n "Press ENTER key to load swap at bootup, any key otherwise: "
+ read wantswap
+ if [ "$wantswap" != "" ];then
+  echo "BOOT_DISABLESWAP='yes'" >> rootfs-complete/etc/rc.d/BOOTCONSTRAINED #read by /etc/rc.d/rc.sysinit
+  echo "...BOOT_DISABLESWAP='yes' in /etc/rc.d/BOOTCONSTRAINED, read by rc.sysinit."
+ fi
+ #this also reduces writes to flash card... um, relatime seems to be the default anyway... 120707 change to noatime...
+ echo "BOOT_ATIME='noatime'" >> rootfs-complete/etc/rc.d/BOOTCONSTRAINED #rc.sysinit will remount / with 'relatime' (constrains updating access time). 120707 change to noatime.
+ #this file in rootfs-skeleton, overwrite...
+ echo 'none          /proc        proc     defaults,noatime               0 0
+none          /sys         sysfs    defaults,noatime               0 0
+none          /dev/pts     devpts   gid=2,mode=620,noatime         0 0
+shmfs         /dev/shm     tmpfs    defaults,noatime      0 0' > rootfs-complete/etc/fstab
+ 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.
+fi
+
+
+
+
+
+
 
 ###########
 #build the rootfs-complete sfs...
 echo
 echo "Now building the main f.s., ${PUPPYSFS}..."
@@ -2570,33 +2603,10 @@
 CUT3INSERT="`echo -n "$DISTRO_FILE_PREFIX" | cut -c 1,2,3`"
 cut2PATTERN="s%CUT2INSERT%${CUT2INSERT}%"
 cut3PATTERN="s%CUT3INSERT%${CUT3INSERT}%"
 sed -e "$verPATTERN" -e "$prefixPATTERN" -e "$cut2PATTERN" -e "$cut3PATTERN" ../boot/README.HTM > build/README.HTM
 
-if [ "$SDFLAG" != "" ];then #120704
- #120704 ask if want to load swap partition/file...
- echo
- echo "Puppy will normally load a swap partition or swap file if it/they exist,
-however you can choose to ignore them and not load them at bootup."
- echo -n "Press ENTER key to load swap at bootup, any key otherwise: "
- read wantswap
- if [ "$wantswap" != "" ];then
-  echo -n "BOOT_DISABLESWAP='yes'" >> /etc/rc.d/BOOTCONSTRAINED #read by /etc/rc.d/rc.sysinit
-  echo "...BOOT_DISABLESWAP='yes' in /etc/rc.d/BOOTCONSTRAINED, read by rc.sysinit."
- fi
- #120704 this also reduces writes to flash card... um, relatime seems to be the default anyway...
- echo "BOOT_ATIME='relatime'" >> /etc/rc.d/BOOTCONSTRAINED #rc.sysinit will remount / with 'relatime' (constrains updating access time).
- #this file in rootfs-skeleton, overwrite...
- echo 'none          /proc        proc     defaults               0 0
-none          /sys         sysfs    defaults               0 0
-none          /dev/pts     devpts   gid=2,mode=620,relatime         0 0
-shmfs         /dev/shm     tmpfs    defaults,relatime      0 0' > /etc/fstab
- echo "BOOT_DIRTYWRITE='1500'" >> /etc/rc.d/BOOTCONSTRAINED #defer writing to disk. refer: http://www.lesswatts.org/tips/disks.php
- echo "BOOT_SCHEDULER='deadline'" >> /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/
-
-fi
-
 sync
 
 if [ "$SDFLAG" = "" ];then #120506
  $MKISOFS -D -R -o ${DISTRO_FILE_PREFIX}-${DISTRO_VERSION}${SCSIFLAG}.iso -b isolinux.bin -c boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table ./build/
  sync
@@ -2679,18 +2689,10 @@
 is to be written to ${SDDEVICE}."
  echo -n "Press ENTER to continue: "
  read yepgo
  echo
 
- #120703 allow 2nd partition to be ext2, ext3 or ext4...
- sdPTN="/dev/${SDDEVICE}2"
- SDFS2="`probepart | grep "$sdPTN" | cut -f 2 -d '|'`"
- case $SDFS2 in
-  ext2|ext3|ext4) true ;;
-  *) echo "wrong f.s. in /dev/${SDDEVICE}2, aborting." ; exit ;;
- esac
-
  #need to know uncompressed size of image...
  echo "Uncompressing image, please wait..."
  cp -f ../sd-skeleton-images/${SDIMAGE} ./${SDIMAGE}
  sync
  SDBASE="`basename $SDIMAGE .xz`"
@@ -2701,28 +2703,64 @@
   [ -f ./$SDBASE ] && rm -f ./$SDBASE
   echo "Uncompress fail. Aborting."
   exit 1
  fi
  sync
- SDBASE="`basename $SDIMAGE .xz`"
+
  IMGBYTES=`stat --format=%s $SDBASE`
+ SDCARDINFO="`disktype ${SDDEVICE}`"
  #120506b check that sd card big enough...
- SDCARDBYTES=`disktype ${SDDEVICE} | grep '^Block device' | cut -f 2 -d '(' | cut -f 1 -d ' '` #ex: 4023386112
+ SDCARDBYTES=`echo "$SDCARDINFO" | grep '^Block device' | cut -f 2 -d '(' | cut -f 1 -d ' '` #ex: 4023386112
  if [ $IMGBYTES -gt $SDCARDBYTES ];then
   echo
   echo "Sorry, the image file is ${IMGBYTES}bytes, however the
 SD card is only ${SDCARDBYTES}bytes. Cannot continue."
   exit 1
  fi
+
+ #120703 allow 2nd partition to be ext2, ext3 or ext4...
+ SDIMGINFO="`disktype ${SDBASE}`"
+ SDFS2="`echo "$SDIMGINFO" | grep -o 'Ext[0-9] file system' | cut -f 1 -d ' ' | tr '[A-Z]' '[a-z]'`"
+ case $SDFS2 in
+  ext2|ext3|ext4) SDFS2="ext4" ;; #120706 hack for now. disktype misreports ext4 without journal as ext2.
+  *)
+   echo -n "wrong f.s. ${SDFS2} in ${SDBASE}, aborting. Press ENTER: "
+   read exitme
+   exit
+  ;;
+ esac
+
  echo "Writing skeleton image to ${SDDEVICE}, please wait very patiently..."
- dd if=${SDBASE} of=${SDDEVICE}
+ dd if=${SDBASE} of=${SDDEVICE} bs=4M #120704 added bs=4M
  if [ $? -ne 0 ];then
   echo "Sorry, operation failure. Aborting script."
   exit 1
  fi
  sync
  rm -f $SDBASE
+
+ FIXEXTPTN=''
+ if [ "$SDFS2" = "ext2" ];then #120704 120706 see hack above, bypass.
+  echo
+  echo "The 2nd partition is 'ext2', but you may bump it to 'ext4' if you wish."
+  echo -n "ENTER only to keep ext2, any char for ext4: "
+  read bumpit
+  if [ "$bumpit" != "" ];then
+   echo
+   echo "Creating ext4 f.s. on partition ${SDDEVICE}2, without a journal..."
+   #mke2fs -t ext4 -O ^has_journal -L puppy -m 0 -b 4096 ${SDDEVICE}2
+   ##120705 add '-E stride=2,stripe-width=1024' refer: http://blogofterje.wordpress.com/2012/01/14/optimizing-fs-on-sd-card/
+   #mke2fs -t ext4 -O ^has_journal -L puppy -m 0 -b 4096 -E stride=2,stripe-width=1024 ${SDDEVICE}2
+   #120706 mavrothal reports may not suit many cards, so revert...
+   mke2fs -t ext4 -O ^has_journal -L puppy -m 0 -b 4096 ${SDDEVICE}2
+   sync
+   FIXEXTPTN='s%ext2%ext4%' #see below.
+   SDFS2='ext4'
+   echo "...done"
+  fi
+ fi
+
  mkdir -p /mnt/sdimagep1
  mkdir -p /mnt/sdimagep2
  mount -t vfat ${SDDEVICE}1 /mnt/sdimagep1
  MNTSTAT1=$?
  mount -t ${SDFS2} ${SDDEVICE}2 /mnt/sdimagep2
@@ -2733,10 +2771,11 @@
   echo "vfat and ${SDFS2}. There was an error mounting them. Aborting script."
   umount /mnt/sdimagep1 2>/dev/null
   umount /mnt/sdimagep2 2>/dev/null
   exit 1
  fi
+ [ "$FIXEXTPTN" ] && [ -f /mnt/sdimagep1/cmdline.txt ] && sed -i -e "${FIXEXTPTN}" /mnt/sdimagep1/cmdline.txt #120704
  echo
  echo "Copying Linux kernel to SD card..."
  #120613 restore correct kernel image name...
  case $REALKERNAME in
   uImage)     cp -f build/vmlinuz /mnt/sdimagep1/uImage ;;
@@ -2746,10 +2785,13 @@
  echo -n "$REALKERNAME" > /mnt/sdimagep1/REALKERNAME #just in case need to know, in a running puppy.
  sync
  echo "...done"
  echo "Copying Puppy filesystem to SD card, please wait..."
  cp -a rootfs-complete/* /mnt/sdimagep2/
+ sync
+ #120704 add to /etc/fstab...
+ echo "/dev/${SDDEVICE}2     /     ${SDFS2}     defaults,noatime   0 1" >> /mnt/sdimagep2/etc/fstab #120707 change relatime to noatime.
  sync
  echo "...done"
  umount /mnt/sdimagep1 2>/dev/null
  umount /mnt/sdimagep2 2>/dev/null
  echo

Changes to woof-code/rootfs-skeleton/etc/rc.d/rc.sysinit

@@ -74,10 +74,11 @@
 #120409 no longer deleting /tmp/* in rc.shutdown... (note, init script in initrd.gz wipes it)
 #120423 pemasu: /dev/mouse was missing in full install.
 #120503 if kernel mounts a f.s. on /dev, removes my skeleton /dev
 #120505 remove network reconnect flag if it exists.
 #120704 introduce /etc/rc.d/BOOTCONSTRAINED. written by 3builddistro.
+#120706 removed some sync's, think they are bad idea in this script.
 
 #unset TZ #100319 busybox hwclock gives priority to this (rather than /etc/localtime) and 'init' has set it wrong.
 #...comment-out for now. note, TZ now set in rc.country.
 ORIGLANG="`grep '^LANG=' /etc/profile | cut -f 2 -d '=' | cut -f 1 -d ' '`" #120217
 ORIGLANG1="${ORIGLANG%_*}" #ex: en
@@ -281,11 +282,11 @@
 echo "VERSION UPDATE"
 #force update when new version of ${DISTRO_NAME}...
 echo -n "Updating..." >/dev/console #updating
 
 /etc/rc.d/rc.update $PUPMODE
-sync
+#sync
 status_func $STATUS
 
 #110814 01micko: http://www.murga-linux.com/puppy/viewtopic.php?p=550932#550932
 if [ "`cat /etc/hostname`" = "puppypc" ];then
  echo -n "Updating unique hostname..." >/dev/console #hostname
@@ -800,23 +801,23 @@
 ############MISC DESKTOP STUFF##################
 echo "MISC. DESKTOP STUFF"
 if [ "$PUPMODE" = "77" ];then #77=multisession cd/dvd.
  if [ "`cat /root/Choices/ROX-Filer/PuppyPin | grep "savesession"`" = "" ];then
   echo '<icon x="768" y="128" label="save">/usr/sbin/savesession-dvd</icon>' >> /root/Choices/ROX-Filer/PuppyPin
-  cat /root/Choices/ROX-Filer/PuppyPin | grep -v '/pinboard' > /tmp/PuppyPin-CPY
-  sync
+  grep -v '/pinboard' /root/Choices/ROX-Filer/PuppyPin  > /tmp/PuppyPin-CPY
+  #sync
   cp -f /tmp/PuppyPin-CPY /root/Choices/ROX-Filer/PuppyPin
   echo '</pinboard>' >> /root/Choices/ROX-Filer/PuppyPin
  fi
 fi
 
 #save button on desktop when booted from flash drive...
 if [ $PUPMODE -eq 3 -o $PUPMODE -eq 7 -o $PUPMODE -eq 13 ];then #pup_rw is tmpfs.
  if [ "`cat /root/Choices/ROX-Filer/PuppyPin | grep "save2flash"`" = "" ];then
   echo '<icon x="768" y="128" label="save">/usr/sbin/save2flash</icon>' >> /root/Choices/ROX-Filer/PuppyPin
-  cat /root/Choices/ROX-Filer/PuppyPin | grep -v '/pinboard' > /tmp/PuppyPin-CPY
-  sync
+  grep -v '/pinboard' /root/Choices/ROX-Filer/PuppyPin  > /tmp/PuppyPin-CPY
+  #sync
   cp -f /tmp/PuppyPin-CPY /root/Choices/ROX-Filer/PuppyPin
   echo '</pinboard>' >> /root/Choices/ROX-Filer/PuppyPin
  fi
 fi
 
@@ -853,14 +854,15 @@
  #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/
  if [ "$PDEV1" ];then
   PDEV="`echo -n "$PDEV1" | sed -e 's%[0-9]*$%%' -e 's%p$%%'`" #mmcblk0p2 becomes mmcblk0
   if [ "`cat /sys/block/${PDEV}/queue/scheduler | grep "$BOOT_SCHEDULER"`" != "" ];then #check available.
    if [ "`cat /sys/block/${PDEV}/queue/scheduler | cut -f 2 -d '[' | cut -f 1 -d ']' | grep "$BOOT_SCHEDULER"`" = "" ];then #check not already chosen.
-    sync
+    #sync
     echo $BOOT_SCHEDULER > /sys/block/${PDEV}/queue/scheduler
+    echo 1 > /sys/block/${PDEV}/queue/iosched/fifo_batch
    fi
   fi
  fi
 fi
 
 #that's it. next stop is /etc/profile...
 ###END###

Changes to woof-code/rootfs-skeleton/root/.xinitrc

@@ -10,11 +10,16 @@
 #v4.01 BK daemon to handle kernel uevents...
 /sbin/clean_desk_icons #v4.02 tidy up drive icons first.
 /sbin/pup_event_frontend_d & #v403
 
 #w482 reshape background image if widescreen...
-[ $PUPMODE -eq 5 ] && /usr/sbin/background_reshape
+#120708 need to reshape for PUPMODE=2 also...
+#[ $PUPMODE -eq 5 ] && /usr/sbin/background_reshape
+NEEDRESHAPE='yes'
+[ -f /usr/share/backgrounds_original/ORIGINAL-default.jpg ] && NEEDRESHAPE='no'
+[ -f /usr/share/backgrounds_original/ORIGINAL-default.png ] && NEEDRESHAPE='no'
+[ "$NEEDRESHAPE" = "yes" ] && /usr/sbin/background_reshape
 
 userresources=$HOME/.Xresources
 usermodmap=$HOME/.Xmodmap
 sysresources=/usr/lib/X11/xinit/Xresources
 sysmodmap=/usr/lib/X11/xinit/.Xmodmap

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

@@ -1,9 +1,10 @@
 #!/bin/sh
 #Lesser GPL licence v2 (/usr/share/doc/legal/lgpl-2.1.txt). 2007 www.puppylinux.com
 #120201 internationalized.
 #120226 01micko: test screensize and set SCROLLABLE variable.
+#120706 change gtkdialog3 to gtkdialog4.
 
 export TEXTDOMAIN=alsawizard
 export OUTPUT_CHARSET=UTF-8
 
 #if [ "`/etc/rc.d/rc.alsa status | grep "not loaded"`" = "" ];then
@@ -81,11 +82,11 @@
     </hbox>
 
   </vbox>
 </window>
 "
- RETVAL="`gtkdialog3 --program=ASKDIALOG 2>/dev/null`"
+ RETVAL="`gtkdialog4 --program=ASKDIALOG 2>/dev/null`"
  eval "$RETVAL"
  [ "$EXIT" != "RUNALSA" ] && exit
 
 
 #exec rxvt -e /usr/sbin/alsaconf

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

@@ -43,10 +43,11 @@
 #120227 call external /usr/sbin/check_internet
 #120329 shinobar: download tweaks.
 #120401 added warning flash player may not work.
 #120403 removed adobe flash download. no, have changed to older version.
 #120620 removed adobe flash download. want quicksetup/welcome1stboot for any PUPMODE at first startup.
+#120708 run 'quickarm' instead of 'quicksetup' on arm boards. see 3builddistro, /usr/sbin/quicksetup.
 
 [ "`whoami`" != "root" ] && exec sudo -A ${0} ${@} #120110
 
 export TEXTDOMAIN=delayedrun
 export OUTPUT_CHARSET=UTF-8
@@ -53,10 +54,11 @@
 . gettext.sh
 
 #variables created at bootup by 'init' in initramfs...
 . /etc/rc.d/PUPSTATE
 . /etc/DISTRO_SPECS
+. /etc/rc.d/BOOTCONSTRAINED #120708
 
 BGOPT=""
 #100821 start...
 WINDOWMANAGER="`cat /etc/windowmanager`"
 case $WINDOWMANAGER in
@@ -122,10 +124,11 @@
   touch /var/local/delayedrun_firstboot_flag
   if [ "$DISTRO_XORG_AUTO" = "yes" ];then #see /etc/DISTRO_SPECS 111019
    #quick setup window for country and language and X resolution...
    QUICKSETUP="quicksetup"
    [ "`readlink /usr/bin/X | grep 'Xorg'`" = "" ] && QUICKSETUP="quickcountry" #probably Xvesa, offer country settings only.
+   [ "$BOOT_QUICKSETUP" != "" ] && QUICKSETUP="$BOOT_QUICKSETUP" #120708 see /etc/rc.d/BOOTCONSTRAINED
    ${QUICKSETUP}
   fi
   if [ -c /dev/mixer ];then #110113 test for sound ready, see /etc/init.d/10alsa.
    aplay /usr/share/audio/2barks.au &
    #wavplay /usr/share/audio/2barks.wav &

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

@@ -1,1 +1,1 @@
-
+quicksetup

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

@@ -41,10 +41,11 @@
 #120401 change logic to call lang2initrd.
 #120402 expand locale help window.
 #120524 Please wait... msg after click ok button.
 #120625 always display network frame, remove set-hostname button, added firewall and ntp checkboxes.
 #120627 support kbd pkg.
+#120708 'quickarm' symlink to 'quicksetup', for booting on arm boards. see also /etc/rc.d/BOOTCONSTRAINED and /usr/sbin/delayedrun.
 
 [ "`whoami`" != "root" ] && exec sudo -A ${0} ${@}
 
 export TEXTDOMAIN=quicksetup
 export OUTPUT_CHARSET=UTF-8
@@ -76,10 +77,11 @@
  chooselocale) SET_WINTITLE="2"; SET_COUNTRYFRAMETITLE="2"; SET_LOCALE="yes"; SET_BACKTITLE="2" ;;
  timezone-set) SET_WINTITLE="3"; SET_COUNTRYFRAMETITLE="3"; SET_TIMEZONE="yes"; SET_BACKTITLE="3" ;;
  quickcountry) SET_WINTITLE="4"; SET_LOCALE="yes"; SET_TIMEZONE="yes"; SET_KEYBOARD="yes"; SET_BACKTITLE="4" ;;
  countrywizard) SET_WINTITLE="5"; SET_LOCALE="yes"; SET_TIMEZONE="yes"; SET_KEYBOARD="yes"; SET_BACKTITLE="5" ;;
  xrandrshell) SET_WINTITLE="6"; SET_XRES="yes"; SET_BACKTITLE="6"; SET_XFRAMETITLE="6" ;;
+ quickarm) SET_WINTITLE="1"; SET_LOCALE="yes"; SET_TIMEZONE="yes"; SET_KEYBOARD="yes"; SET_BACKTITLE="1"; SET_NETWORK="yes" ;; #120708
  *) SET_LOCALE="yes"; SET_TIMEZONE="yes"; SET_KEYBOARD="yes"; SET_XRES="yes"; SET_XWIZARD="yes"; SET_NETWORK="yes" ;;
 esac
 [ "$SET_LOCALE" -o "$SET_TIMEZONE" -o "$SET_KEYBOARD" ] && SET_COUNTRY="yes"
 [ "$SET_XRES" -o "$SET_XWIZARD" ] && SET_X="yes"
 case $SET_WINTITLE in
@@ -141,11 +143,11 @@
 #      <button tooltip-text=\"$(gettext 'Click button to apply hostname')\">
 #       <input file>/usr/local/lib/X11/mini-icons/mini-hostname.xpm</input>
 #       <action>/usr/sbin/hostname-set \$ENTRY_HOSTNAME ; echo \$? > /tmp/quicksetup-hostname-change-flag</action>
 #      </button>
 #      <text><label>\"                                            \"</label></text>
-if [ "$MYBASE" = "quicksetup" ];then #120313 only allow in main quicksetup window.
+if [ "$MYBASE" = "quicksetup" -o "$MYBASE" = "quickarm" ];then #120313 only allow in main quicksetup window. 120708 quickarm.
  if [ -f /var/local/quicksetup-network-check-flag1 ];then
     SET_NETWORK="yes"
     HOSTNAME="`cat /etc/hostname`" #do not use $HOSTNAME, as hostname-set may have just been run.
 
     #120625 firewall checkbox...

Changes to woof-code/support/find_cat.c

@@ -1,8 +1,9 @@
 /*called from 0setup
   Compile like this:
   # gcc -O2 -o find_cat find_cat.c
+  * 120708 BK add 'gnome-mplayer', 'chromium', 'planner' to categories.
 */
 
 /*
 bash script to make description words into C code:
 
@@ -131,15 +132,15 @@
 	char PKG_CAT_Setup[]=" net_setup net_setup_retro petget wakepup2 ";
 	char PKG_CAT_Utility[]=" alltray clamav cutecom floppy gadmin-rsync gexec glade2bas_DEV hiawatha isomaster lxrad lxrad_DEV lzma minicom most pbackup picocom pmirror rxvt rxvt rxvt-unicode snotes urxvt-unicode xarchive xarchiver xfdiff-cut xfprot xterm ";
 	char PKG_CAT_Filesystem[]=" gdmap gfnrename gwhere mc nautilus pdrive pfind prename uxplor worker xfe zfind ";
 	char PKG_CAT_Graphic[]=" autoq3d autotrace blender dia dia-gnomeless eog flphoto fotoxx gcolor2 gimageview gimp gimp-help gphoto2 gpicview gqview grabc gview inkscape inkscape inkscapelite inkview mtpaint scale2x varicad xfig xpaint xv ";
 	char PKG_CAT_Document[]=" abiword abiword-dictionary-en abiword-plugins adobereader aiksaurus amaya bluefish chmsee cssed e3 emacs epdfview geany gedit ghex gv jed joe jove leafpad leafpad link-grammar lyx medit mp nano pdfedit scite scribus xman xpdf zedit ";
-	char PKG_CAT_Calculate[]=" acct calcoo cgtkcalc expensetracker galculator gmeasures gnumeric grisbi homebank moneymanagerx ycalc xcalc ";
+	char PKG_CAT_Calculate[]=" acct calcoo cgtkcalc expensetracker galculator gmeasures gnumeric grisbi homebank moneymanagerx planner ycalc xcalc ";
 	char PKG_CAT_Personal[]=" datakiosk didiwiki dlume evolution fpm2 notecase osmo pplog pstopwatch ptimer ";
 	char PKG_CAT_Network[]=" autoconnect bind file_sharing-curlftpfs-mpscan fwbuilder gfilemanager gnome-ppp gpptp john linux_firewall monkey mtr nmap pnethood pppoeconf_pup pure_ftpd pwireless rp_pppoe_cli superscan wifi-radar wireshark wvdial ";
-	char PKG_CAT_Internet[]=" alpine axel ayttm bareftp bitchx dillo ekiga elinks elm epic4 fetchmail filezilla firefox flashplayer flock gajim gcurl getmail gftp gtkmoz gurlchecker jags lftp ihu licq links lynx mailx mcabber mldonkey mozilla-firefox mozilla-thunderbird msmtp mutt ncftp netsurf nn pan pctorrent pidgin pidgin_perl psip puppy-podcast-grabber pwget seamonkey seamonkey seamonkey_addons sendmail skipstone ssh_gui sylpheed urlgfe wengophone xchat ";
-	char PKG_CAT_Multimedia[]=" amarok amp asunder audacious audacity aumix cdw cinelerra dkop gecko-mediaplayer grafburn gtkam gxine madplay mhwaveedit mpg321 mplayer mplayer_codecs_basic mplayer_codecs_full mplayer-fonts mplayerplug-in pburn pburn_theme_pburn_original pcdripper pdvdrsab pmetatagger pmusic pmusic_THEME_pmusic_original pupdvdtool ripoff sgmixer simpleburn timidity++ workbone xfmedia xfreecd xine-ui xsane zmixer ";
+	char PKG_CAT_Internet[]=" alpine axel ayttm bareftp bitchx chromium dillo ekiga elinks elm epic4 fetchmail filezilla firefox flashplayer flock gajim gcurl getmail gftp gtkmoz gurlchecker jags lftp ihu licq links lynx mailx mcabber mldonkey mozilla-firefox mozilla-thunderbird msmtp mutt ncftp netsurf nn pan pctorrent pidgin pidgin_perl psip puppy-podcast-grabber pwget seamonkey seamonkey seamonkey_addons sendmail skipstone ssh_gui sylpheed urlgfe wengophone xchat ";
+	char PKG_CAT_Multimedia[]=" amarok amp asunder audacious audacity aumix cdw cinelerra dkop gecko-mediaplayer gnome-mplayer grafburn gtkam gxine madplay mhwaveedit mpg321 mplayer mplayer_codecs_basic mplayer_codecs_full mplayer-fonts mplayerplug-in pburn pburn_theme_pburn_original pcdripper pdvdrsab pmetatagger pmusic pmusic_THEME_pmusic_original pupdvdtool ripoff sgmixer simpleburn timidity++ workbone xfmedia xfreecd xine-ui xsane zmixer ";
 	char PKG_CAT_Fun[]=" frozen-bubble gnuchess gtans lincity picpuz rubix supertux tile vitetris wesnoth wormux xinvaders xsoldier ";
 	char PKG_CAT_Develop[]=" anjuta boo clisp cmake cvs gambas lua mercurial mono nant ocaml nasm poedit ruby subversion svn vala valgrind ";
 	char PKG_CAT_BuildingBlock[]=" 915resolution a2ps a52dec acl alsa-lib alsa-utils atk audiofile aufs autocutsel autologin bash bbc_provided bc bcrypt bdb bin boehm-gc bogofilter bridge-utils busybox buttondialog bzip2 cairo cairomm cddetect cdp cdparanoia cdrdao cdrkit cdrtools chmlib coreutils cpio ctorrent cups cups cups_pdf curl ddcprobe device_mapper dhcp dhcpcd dhcp_client dialog dialog dictd_client dietlibc diffstat diffutils disktype dmidecode docbook-xml dosfstools dotpuphandler dpkg-deb dvdauthor dvd+rwtools e2fsprogs ed edid eject elspci enchant exiv2 expat faac faad2 ffmpeg file findutils flac foomatic-filters freetype fribidi fuse gail gawk gcc gdbm getdir gettext ghostscript ghostscript gifsicle gins glib glibc glibc_i18n_en glibc_locales glibmm gnome_menus goffice goffice7 grep grub gtk+ gtk+ gtkdialog gtkdialog2 gtkdialog3 gtklist04mu gtklogfileviewer gtkmm guess_fs gutenprint gutenprint gxmessage gzip hdparm hicolor-icon-theme hotplug2stdout hsfmodem id3lib ifplugd ifplugd_old inotail inotify-tools installwatch iptables jasper kbd lame lcms less libao libart libcap libcddb libcdio libdaemon libdvdcss libdvdnav libdvdplay libdvdread libexif libexif-gtk libexo libexo_lib libgd libgif libglade libgnomecanvas libgnomecanvasmm libgnomecups libgnomecups libgnomeprint libgnomeprint libgnomeprintui libgphoto2 libgsf libid3tag libidl libjpeg libmad libmng libogg libpng librsvg libsigc++ libsndfile libstdc++ libtiff libtool libungif libusb libvorbis libxfce4util libxfcegui4 libxml libxml_python libxscrnsaver libxslt libxslt_python linux-header metamail mimencode mirdir mktemp modem_stats module-init-tools module_init_tools mp3info mut2 ncompress ncurses ndiswrapper nenscript netpbm net-tools normalize ntfs-3g ntfsprogs openssh_client openssl pango parted pciutils pcmcia-cs pcmciautils pcre perl perl-compress-zlib perl-digest-sha1 perl-extutils-depends perl-extutils-pkgconfig perl-html-parser perl-uri perl-xml-parser perl-xml-simple pfilesearch pixman poppler popt ppp pptp procinfo procps programchooser psmisc pup_dock puppybasic puppyinputdetect puppyserialdetect qt4 readline reiserfsprogs replaceit rman rsync samba samba_client sane-backends sdparm sed setserial setvol sgml-base since sqlite squashfs_tools squashfs-tools startup-notification sysfsutils syslinux sysvinit tar time truncate udev udev_cut unclutter unionfs_utils unzip util-linux vamps vcdimager vorbis-tools waitmax wavplay wget wireless-tools wpa_supplicant wpa_supplicant wpa_supplicant wv x264 xclip xcut xdg_puppy xdialog xine-lib xine-plugin xmessage xorg_base xorg_really_base xorg_xfbdev xorg_xorg_base xorg_xorg_dri xorg_xorg_full_dri xorg_xorg_servers xorg_xvesa xvidcore yaf_splash zenity zip zlib ";
 	char PKG_CAT_Help[]=" linux-faqs linux-howtos man-pages ";
 

Changes to woof-code/support/find_cat.gs

@@ -1,9 +1,10 @@
 /*BK called from 0setup
   Compile like this (requires Vala compiler):
   # valac find_cat.gs
   w464, 25 April 2009, fix for new 0setup script.
+  * 120708 BK add 'gnome-mplayer', 'chromium', 'planner' to categories.
 */
 
 init
 	var DB_nameonly = args[1]
 	var DB_description = args[2]
@@ -22,15 +23,15 @@
 	var PKG_CAT_Setup=" net_setup net_setup_retro petget wakepup2 "
 	var PKG_CAT_Utility=" alltray clamav cutecom floppy gadmin-rsync gexec glade2bas_DEV hiawatha isomaster lxrad lxrad_DEV lzma minicom most pbackup picocom pmirror rxvt rxvt rxvt-unicode snotes urxvt-unicode xarchive xarchiver xfdiff-cut xfprot xterm "
 	var PKG_CAT_Filesystem=" gdmap gfnrename gwhere mc nautilus pdrive pfind prename uxplor worker xfe zfind "
 	var PKG_CAT_Graphic=" autoq3d autotrace blender dia dia-gnomeless eog flphoto fotoxx gcolor2 gimageview gimp gimp-help gphoto2 gpicview gqview grabc gview inkscape inkscape inkscapelite inkview mtpaint scale2x varicad xfig xpaint xv "
 	var PKG_CAT_Document=" abiword abiword-dictionary-en abiword-plugins adobereader aiksaurus amaya bluefish chmsee cssed e3 emacs epdfview geany gedit ghex gv jed joe jove leafpad leafpad link-grammar lyx medit mp nano pdfedit scite scribus xman xpdf zedit "
-	var PKG_CAT_Calculate=" acct calcoo cgtkcalc expensetracker galculator gmeasures gnumeric grisbi homebank moneymanagerx ycalc xcalc "
+	var PKG_CAT_Calculate=" acct calcoo cgtkcalc expensetracker galculator gmeasures gnumeric grisbi homebank moneymanagerx planner ycalc xcalc "
 	var PKG_CAT_Personal=" datakiosk didiwiki dlume evolution fpm2 notecase osmo pplog pstopwatch ptimer "
 	var PKG_CAT_Network=" autoconnect bind file_sharing-curlftpfs-mpscan fwbuilder gfilemanager gnome-ppp gpptp john linux_firewall monkey mtr nmap pnethood pppoeconf_pup pure_ftpd pwireless rp_pppoe_cli superscan wifi-radar wireshark wvdial "
-	var PKG_CAT_Internet=" alpine axel ayttm bareftp bitchx dillo ekiga elinks elm epic4 fetchmail filezilla firefox flashplayer flock gajim gcurl getmail gftp gtkmoz gurlchecker jags lftp ihu licq links lynx mailx mcabber mldonkey mozilla-firefox mozilla-thunderbird msmtp mutt ncftp netsurf nn pan pctorrent pidgin pidgin_perl psip puppy-podcast-grabber pwget seamonkey seamonkey seamonkey_addons sendmail skipstone ssh_gui sylpheed urlgfe wengophone xchat "
-	var PKG_CAT_Multimedia=" amarok amp asunder audacious audacity aumix cdw cinelerra dkop gecko-mediaplayer grafburn gtkam gxine madplay mhwaveedit mpg321 mplayer mplayer_codecs_basic mplayer_codecs_full mplayer-fonts mplayerplug-in pburn pburn_theme_pburn_original pcdripper pdvdrsab pmetatagger pmusic pmusic_THEME_pmusic_original pupdvdtool ripoff sgmixer simpleburn timidity++ workbone xfmedia xfreecd xine-ui xsane zmixer "
+	var PKG_CAT_Internet=" alpine axel ayttm bareftp bitchx chromium dillo ekiga elinks elm epic4 fetchmail filezilla firefox flashplayer flock gajim gcurl getmail gftp gtkmoz gurlchecker jags lftp ihu licq links lynx mailx mcabber mldonkey mozilla-firefox mozilla-thunderbird msmtp mutt ncftp netsurf nn pan pctorrent pidgin pidgin_perl psip puppy-podcast-grabber pwget seamonkey seamonkey seamonkey_addons sendmail skipstone ssh_gui sylpheed urlgfe wengophone xchat "
+	var PKG_CAT_Multimedia=" amarok amp asunder audacious audacity aumix cdw cinelerra dkop gecko-mediaplayer gnome-mplayer grafburn gtkam gxine madplay mhwaveedit mpg321 mplayer mplayer_codecs_basic mplayer_codecs_full mplayer-fonts mplayerplug-in pburn pburn_theme_pburn_original pcdripper pdvdrsab pmetatagger pmusic pmusic_THEME_pmusic_original pupdvdtool ripoff sgmixer simpleburn timidity++ workbone xfmedia xfreecd xine-ui xsane zmixer "
 	var PKG_CAT_Fun=" frozen-bubble gnuchess gtans lincity picpuz rubix supertux tile vitetris wesnoth wormux xinvaders xsoldier "
 	var PKG_CAT_Develop=" anjuta boo clisp cmake cvs gambas lua mercurial mono nant ocaml nasm poedit ruby subversion svn vala valgrind "
 	var PKG_CAT_BuildingBlock=" 915resolution a2ps a52dec acl alsa-lib alsa-utils atk audiofile aufs autocutsel autologin bash bbc_provided bc bcrypt bdb bin boehm-gc bogofilter bridge-utils busybox buttondialog bzip2 cairo cairomm cddetect cdp cdparanoia cdrdao cdrkit cdrtools chmlib coreutils cpio ctorrent cups cups cups_pdf curl ddcprobe device_mapper dhcp dhcpcd dhcp_client dialog dialog dictd_client dietlibc diffstat diffutils disktype dmidecode docbook-xml dosfstools dotpuphandler dpkg-deb dvdauthor dvd+rwtools e2fsprogs ed edid eject elspci enchant exiv2 expat faac faad2 ffmpeg file findutils flac foomatic-filters freetype fribidi fuse gail gawk gcc gdbm getdir gettext ghostscript ghostscript gifsicle gins glib glibc glibc_i18n_en glibc_locales glibmm gnome_menus goffice goffice7 grep grub gtk+ gtk+ gtkdialog gtkdialog2 gtkdialog3 gtklist04mu gtklogfileviewer gtkmm guess_fs gutenprint gutenprint gxmessage gzip hdparm hicolor-icon-theme hotplug2stdout hsfmodem id3lib ifplugd ifplugd_old inotail inotify-tools installwatch iptables jasper kbd lame lcms less libao libart libcap libcddb libcdio libdaemon libdvdcss libdvdnav libdvdplay libdvdread libexif libexif-gtk libexo libexo_lib libgd libgif libglade libgnomecanvas libgnomecanvasmm libgnomecups libgnomecups libgnomeprint libgnomeprint libgnomeprintui libgphoto2 libgsf libid3tag libidl libjpeg libmad libmng libogg libpng librsvg libsigc++ libsndfile libstdc++ libtiff libtool libungif libusb libvorbis libxfce4util libxfcegui4 libxml libxml_python libxscrnsaver libxslt libxslt_python linux-header metamail mimencode mirdir mktemp modem_stats module-init-tools module_init_tools mp3info mut2 ncompress ncurses ndiswrapper nenscript netpbm net-tools normalize ntfs-3g ntfsprogs openssh_client openssl pango parted pciutils pcmcia-cs pcmciautils pcre perl perl-compress-zlib perl-digest-sha1 perl-extutils-depends perl-extutils-pkgconfig perl-html-parser perl-uri perl-xml-parser perl-xml-simple pfilesearch pixman poppler popt ppp pptp procinfo procps programchooser psmisc pup_dock puppybasic puppyinputdetect puppyserialdetect qt4 readline reiserfsprogs replaceit rman rsync samba samba_client sane-backends sdparm sed setserial setvol sgml-base since sqlite squashfs_tools squashfs-tools startup-notification sysfsutils syslinux sysvinit tar time truncate udev udev_cut unclutter unionfs_utils unzip util-linux vamps vcdimager vorbis-tools waitmax wavplay wget wireless-tools wpa_supplicant wpa_supplicant wpa_supplicant wv wvdial x264 xclip xcut xdg_puppy xdialog xine-lib xine-plugin xmessage xorg_base xorg_really_base xorg_xfbdev xorg_xorg_base xorg_xorg_dri xorg_xorg_full_dri xorg_xorg_servers xorg_xvesa xvidcore yaf_splash zenity zip zlib "
 	var PKG_CAT_Help=" linux-faqs linux-howtos man-pages "
 

Changes to woof-distro/Packages-puppy-noarch-official

@@ -60,10 +60,11 @@
 pbackup-3.1.9|pbackup|3.1.9||Utility|240K||pbackup-3.1.9.pet|+xdialog,+gtkdialog3,+dvd+rwtools,+cdrkit,+curl|Pbackup Backup and Sync||||
 pburn-3.6.1|pburn|3.6.1||Multimedia|372K||pburn-3.6.1.pet|+gtkdialog,+core-utils,+cdrkit,+dvd+rw-tools,+ffmpeg,+pfilesearch,+dvdauthor,+vobcopy,+vamps,+vcdimager,+normalize,|Pburn CD/DVD/Blu-ray writer||||
 pcd-1.5|pcd|1.5||Multimedia|72K||pcd-1.5.pet|+gtkdialog3,+cdrkit|pCD CD-audio player||||
 pcdripper-3.9.3|pcdripper|3.9.3||Multimedia|96K||pcdripper-3.9.3.pet|+xdialog,+gtkdialog3,+cdrkit|Audio CD song ripper||||
 pctorrent-1.4|pctorrent|1.4||Internet|64K||pctorrent-1.4.pet|+ctorrent,+gtkdialog3|torrent client gui||||
+pcurlftp_file_sharing-0.2|pcurlftp_file_sharing|0.2||Network|116K||pcurlftp_file_sharing-0.2.pet|+pure-ftpd,+curlftpfs,+mpscan,+xdialog,+fuse|connect to ftp servers, share files||||
 pdvdrsab-0.1|pdvdrsab|0.1||Multimedia|52K||pdvdrsab-0.1.pet|+gtkdialog3,+dvdauthor,+vobcopy,+vamps,+ffmpeg|dvd rip,shrink,author,burn||||
 peasypdf-1.4|peasypdf|1.4||Document|52K||peasypdf-1.4.pet||Build multi-page PDF documents||||
 peasyprint-1.8|peasyprint|1.8||Graphic|60K||peasyprint-1.8.pet|+gphotofs,+gtkdialog3|PeasyPrint graphic/photo printing||||
 pfilesearch-1.30|pfilesearch|1.30||BuildingBlock|104K||pfilesearch-1.30.pet|+gtkdialog4|file finder engine|||official|
 pfind-5.0|pfind|5.0||Filesystem|176K||pfind-5.0.pet|+gtkdialog4,+pfilesearch,|Pfind file finder|||official|
@@ -108,7 +109,8 @@
 woo-ff-0.1.1|woo-ff|0.1.1||Multimedia|48K||woo-ff-0.1.1.pet|+ffmpeg,+gtkdialog3|woo-ff - multimedia converter||||
 xkbconfigmanager-1.1-1|xkbconfigmanager|1.1-1||Desktop|144K||xkbconfigmanager-1.1-1.pet|+xorg|xorg keyboard manager||||
 xlock_gui-0.2-6|xlock_gui|0.2-6||Desktop|68K||xlock_gui-0.2-6.pet|+xlockmore|screen lock and screensaver||||
 you2pup-2.1.4-520|you2pup|2.1.4-520||Internet|60K||you2pup-2.1.4-520.pet|+gtkdialog3,+urxvt|You2pup YouTube downloader||||
 z_geany_bacon_hack-1.4|z_geany_bacon_hack|1.4||Document|40K||z_geany_bacon_hack-1.4.pet|+geany|temp hack for geany text editor for BaCon highlighting, stealing Freebasic category, created by big_bass||||
+z_lowresource_hack-20120707|z_lowresource_hack|20120707||BuildingBlock|20K||z_lowresource_hack-20120707.pet||reduce resource usage and writes to flash when booting off flash memory||||
 zz_t2_fixup-20120222|zz_t2_fixup|20120222||BuildingBlock|304K||zz_t2_fixup-20120222.pet||hack to get t2 pkgs to build a puppy, mostly workarounds for xorg in /usr/X11R7||||
 zz_ubuntu_precise_fixup-20120522|zz_ubuntu_precise_fixup|20120522||BuildingBlock|24K||zz_ubuntu_precise_fixup-20120522.pet||some hacks for compat-distro ubuntu precise pangolin||||

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

@@ -14,10 +14,12 @@
 coreutils-6.12-static-armv6|coreutils|6.12-static-armv6||BuildingBlock|1740K||coreutils-6.12-static-armv6.pet||core utilities, compiled statically||||
 cups-1.3.11-armv6|cups|1.3.11-armv6||BuildingBlock|4412K||cups-1.3.11-armv6.pet||Common Unix Printing System|puppy|||
 cups_DEV-1.3.11-armv6|cups_DEV|1.3.11-armv6||BuildingBlock|152K||cups_DEV-1.3.11-armv6.pet|+cups|common unix printing system|puppy|||
 cups_DOC-1.3.11-armv6|cups_DOC|1.3.11-armv6||BuildingBlock|4592K||cups_DOC-1.3.11-armv6.pet||common unix printing system||||
 cups_NLS-1.3.11-armv6|cups_NLS|1.3.11-armv6||BuildingBlock|2012K||cups_NLS-1.3.11-armv6.pet|+cups|common unix printing system||||
+curlftpfs-0.9.2-armv6|curlftpfs|0.9.2-armv6||BuildingBlock|56K||curlftpfs-0.9.2-armv6.pet||curl ftp program|debian|squeeze||
+curlftpfs_DOC-0.9.2-armv6|curlftpfs_DOC|0.9.2-armv6||BuildingBlock|32K||curlftpfs_DOC-0.9.2-armv6.pet||curlftpfs docs||||
 dbus-1.2.4.2permissive-patched1-armv6|dbus|1.2.4.2permissive-patched1-armv6||BuildingBlock|812K||dbus-1.2.4.2permissive-patched1-armv6.pet||inter-process messaging|puppy|||
 dbus_DEV-1.2.4.2permissive-patched1-armv6|dbus_DEV|1.2.4.2permissive-patched1-armv6||BuildingBlock|856K||dbus_DEV-1.2.4.2permissive-patched1-armv6.pet|+dbus|daemon thingy|puppy|||
 dbus_DOC-1.2.4.2permissive-patched1-armv6|dbus_DOC|1.2.4.2permissive-patched1-armv6||BuildingBlock|72K||dbus_DOC-1.2.4.2permissive-patched1-armv6.pet||daemon||||
 dbus-glib-0.82-armv6|dbus-glib|0.82-armv6||BuildingBlock|244K||dbus-glib-0.82-armv6.pet|+dbus|dbus glib binding|puppy|||
 dbus-glib_DEV-0.82-armv6|dbus-glib_DEV|0.82-armv6||BuildingBlock|304K||dbus-glib_DEV-0.82-armv6.pet|+dbus-glib|dbus glib binding|puppy|||
@@ -70,11 +72,11 @@
 gpptp-0.2-armv6|gpptp|0.2-armv6||Network|40K||gpptp-0.2-armv6.pet|+pptp,+gtk+|PPTP VPN client gui, modified by jafadmin (see puppy forum)|puppy|||
 gtkdialog3-0.7.20-patched_pe1_arm-sap6|gtkdialog3|0.7.20-patched_pe1_arm-sap6||BuildingBlock|164K||gtkdialog3-0.7.20-patched_pe1_arm-sap6.pet|+gtk+|gui for shell scripts, older version, may be installed alongside gtkdialog4|debian|squeeze||
 gtkdialog3_DOC-0.7.20-patched_pe1_arm-sap6|gtkdialog3_DOC|0.7.20-patched_pe1_arm-sap6||BuildingBlock|164K||gtkdialog3_DOC-0.7.20-patched_pe1_arm-sap6.pet|+gtk+|gui for shell scripts, older version, may be installed alongside gtkdialog4||||
 gtkdialog4-0.8.0-patched_arm-sap6|gtkdialog4|0.8.0-patched_arm-sap6||BuildingBlock|196K||gtkdialog4-0.8.0-patched_arm-sap6.pet|+gtk+|gui for shell scripts|debian|squeeze||
 gtkdialog4_DOC-0.8.0-patched_arm-sap6|gtkdialog4_DOC|0.8.0-patched_arm-sap6||BuildingBlock|648K||gtkdialog4_DOC-0.8.0-patched_arm-sap6.pet||gui for shell scripts||||
-guess_fs-20090512-static-armv6|guess_fs|20090512-static-armv6||BuildingBlock|52K||guess_fs-20090512-static-armv6.pet||determine filesystem of a partition||||
+guess_fs-20120705-armv6|guess_fs|20120705-armv6||BuildingBlock|20K||guess_fs-20120705-armv6.pet||determine filesystem of a partition|debian|squeeze||
 gwhere-0.2.3-patched_4-armv6|gwhere|0.2.3-patched_4-armv6||Filesystem|688K||gwhere-0.2.3-patched_4-armv6.pet|+gtk+|disk cataloger|puppy|||
 gwhere_DEV-0.2.3-patched_4-armv6|gwhere_DEV|0.2.3-patched_4-armv6||Filesystem|3036K||gwhere_DEV-0.2.3-patched_4-armv6.pet|+gwhere|disk cataloger|puppy|||
 gwhere_DOC-0.2.3-patched_4-armv6|gwhere_DOC|0.2.3-patched_4-armv6||Filesystem|20K||gwhere_DOC-0.2.3-patched_4-armv6.pet||disk cataloger||||
 gwhere_NLS-0.2.3-patched_4-armv6|gwhere_NLS|0.2.3-patched_4-armv6||Filesystem|656K||gwhere_NLS-0.2.3-patched_4-armv6.pet|+gwhere|disk cataloger||||
 gxmessage-2.12.4-armv6|gxmessage|2.12.4-armv6||BuildingBlock|64K||gxmessage-2.12.4-armv6.pet|+gtk+|simple gui for shell scripts|puppy|||
@@ -143,10 +145,11 @@
 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|||
 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||||
 netpbm-10.34-sap6|netpbm|10.34-sap6||BuildingBlock|728K||netpbm-10.34-sap6.pet|+libxml|Collection of primitive graphics tools converters etc, note later versions have bug|debian|squeeze||
 netpbm_DEV-10.34-sap6|netpbm_DEV|10.34-sap6||BuildingBlock|340K||netpbm_DEV-10.34-sap6.pet|+netpbm|Collection of primitive graphics tools converters etc|debian|squeeze||
 network_tray-2.5-armv6|network_tray|2.5-armv6||Desktop|64K||network_tray-2.5-armv6.pet|+gtk+|network monitor for tray|puppy|||
@@ -172,15 +175,20 @@
 picocom_DOC-1.2-armv6|picocom_DOC|1.2-armv6||Utility|28K||picocom_DOC-1.2-armv6.pet||serial port comms utility||||
 picpuz-2.4-armv6|picpuz|2.4-armv6||Fun|336K||picpuz-2.4-armv6.pet|+gtk+|Break any image into pieces, reassemble with the mouse||||
 picpuz_DOC-2.4-armv6|picpuz_DOC|2.4-armv6||Fun|220K||picpuz_DOC-2.4-armv6.pet||jigsaw puzzle||||
 picpuz_NLS-2.4-armv6|picpuz_NLS|2.4-armv6||Fun|84K||picpuz_NLS-2.4-armv6.pet|+picpuz|jigsaw puzzle||||
 picscale-0.1b-armv6|picscale|0.1b-armv6||BuildingBlock|52K||picscale-0.1b-armv6.pet|+gtk+|cli scale images, used by pPicona, SimpleWALL, created by vovchik|puppy|||
+planner-0.14.5-patched1-sap6|planner|0.14.5-patched1-sap6||Business|1596K||planner-0.14.5-patched1-sap6.pet|+gtk+|Planner Project Management|debian|squeeze||
+planner_DOC-0.14.5-patched1-sap6|planner_DOC|0.14.5-patched1-sap6||Business|3184K||planner_DOC-0.14.5-patched1-sap6.pet||Planner project management||||
+planner_NLS-0.14.5-patched1-sap6|planner_NLS|0.14.5-patched1-sap6||Business|2892K||planner_NLS-0.14.5-patched1-sap6.pet|+planner|Planner project management||||
 pmusic_tray-0.1-armv6|pmusic_tray|0.1-armv6||BuildingBlock|24K||pmusic_tray-0.1-armv6.pet|+pmusic|Pmusic tray app|puppy|||
 powerapplet_tray-2.5-armv6|powerapplet_tray|2.5-armv6||Desktop|24K||powerapplet_tray-2.5-armv6.pet|+gtk+|display battery status in tray|puppy|||
 puppyinputdetect-1.1i-armv6|puppyinputdetect|1.1i-armv6||BuildingBlock|7K||puppyinputdetect-1.1i-armv6.pet||detect mouse, keyboard|puppy|||
 puppyphone-1.2-psip-sap6|puppyphone|1.2-psip-sap6||Internet|1576K||puppyphone-1.2-psip-sap6.pet|+gtk+|Psip PuppyPhone Internet telephone|debian|squeeze||
 puppyserialdetect-1.1h-armv6|puppyserialdetect|1.1h-armv6||BuildingBlock|36K||puppyserialdetect-1.1h-armv6.pet||detects mouse, keyboard and modem, created by jesse|puppy|||
+pure-ftpd-1.0.36-armv6|pure-ftpd|1.0.36-armv6||BuildingBlock|260K||pure-ftpd-1.0.36-armv6.pet||ftp program|debian|squeeze||
+pure-ftpd_DOC-1.0.36-armv6|pure-ftpd_DOC|1.0.36-armv6||BuildingBlock|92K||pure-ftpd_DOC-1.0.36-armv6.pet||pure-ftpd documentation||||
 pwallpaper-1.1.2-1-sap6|pwallpaper|1.1.2-1-sap6||Desktop|72K||pwallpaper-1.1.2-1-sap6.pet|+gtk+|Set backdrop image|debian|squeeze||
 retrovol-0.12-sap6|retrovol|0.12-sap6||Multimedia|128K||retrovol-0.12-sap6.pet|+gtk+,+alsa-lib|Retrovol sound mixer and tray applet, created by pizzasgood|debian|squeeze||
 retrovol_NLS-0.12-sap6|retrovol_NLS|0.12-sap6||Multimedia|48K||retrovol_NLS-0.12-sap6.pet|+retrovol|volume and mixer for tray||||
 rox_filer-20111022-patched3-armv6|rox_filer|20111022-patched3-armv6||Filesystem|1464K||rox_filer-20111022-patched3-armv6.pet|+gtk+|ROX-Filer file manager|puppy|||
 rp_pppoe_cli-3.10-armv6|rp_pppoe_cli|3.10-armv6||Network|448K||rp_pppoe_cli-3.10-armv6.pet||roaring penguin pppoe internet connection|puppy|||

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

@@ -84,10 +84,11 @@
 no|cpu-scaling-ondemand||exe
 yes|ctorrent|ctorrent|exe,dev>null,doc,nls
 yes|cups|cups-bsd,cups,cups-common,cups-client,cups-ppdc,libcups2,libcups2-dev,libcupsimage2,libcupsimage2-dev,libcupsdriver1,libcupsdriver1-dev,libcupsppdc1,libcupsppdc1-dev,libcupscgi1,libcupscgi1-dev,libcupsmime1,libcupsmime1-dev|exe,dev,doc>exe,nls
 yes|cups_pdf||exe,dev,doc,nls
 yes|curl|curl,libcurl3,libcurl4-openssl-dev,libcurl3-gnutls|exe,dev,doc,nls
+yes|curlftpfs||exe,dev,doc,nls| #needed by pcurlftp_file_sharing
 yes|cvs|cvs|exe>dev,dev,doc,nls
 yes|cyrus-sasl2|libsasl2-2,libsasl2-dev|exe,dev,doc,nls
 no|dbus|dbus,libdbus-1-3,libdbus-1-dev|exe,dev,doc,nls|+lsb-base
 no|dbus-glib|libdbus-glib-1-2,libdbus-glib-1-dev|exe,dev,doc,nls|+dbus
 no|dbus-x11|dbus-x11|exe,dev,doc,nls
@@ -107,15 +108,16 @@
 yes|dialog|dialog|exe,dev>null,doc,nls
 no|dictd_client||exe
 yes|didiwiki||exe,dev,doc,nls
 no|dietlibc|dietlibc-dev|exe>dev,dev,doc,nls| #no ARMEL deb
 yes|diffstat|diffstat|exe,dev>null,doc,nls
-yes|diffutils|diff|exe,dev>null,doc,nls
+yes|diffutils|diffutils|exe,dev>null,doc,nls
 yes|dirac|libdirac-encoder0,libdirac-decoder0,libdirac-dev|exe,dev,doc,nls
 yes|directfb|libdirectfb-1.2-9,libdirectfb-bin,libdirectfb-dev,libdirectfb-extra|exe,dev,doc,nls|+libts
 yes|disktype||exe,dev>null,doc,nls
 no|dmidecode|dmidecode|exe,dev>null,doc,nls| #no ARMEL deb
+yes|docbook-xml|docbook-xml|exe>dev,dev,doc>dev,nls
 yes|dosfstools|dosfstools|exe,dev>null,doc,nls
 yes|dpkg-deb|dpkg|exe,dev>null,doc,nls
 yes|dvdauthor|dvdauthor|exe,dev,doc,nls
 yes|dvd+rwtools|dvd+rw-tools|exe,dev,doc,nls
 yes|e2fsprogs|e2fsprogs,e2fslibs,e2fslibs-dev,libblkid1,libblkid-dev,libcomerr2,comerr-dev,libss2,ss-dev,libuuid1,uuid-dev|exe,dev,doc,nls
@@ -428,10 +430,11 @@
 no|mountcifs||exe
 no|mp|mped|exe,dev>null,doc,nls| #no, the gtk mode of this mp is awful, use my curses-only pkg.
 yes|mp||exe,dev,doc,nls
 yes|mpfr|libmpfr4,libmpfr-dev|exe>dev,dev,doc,nls
 yes|mplayer|mplayer,mplayer-skin-blue,mplayer-gui,libaa1,libcaca0,libenca0,libesd0,libfribidi0,libjack-jackd2-0,liblircclient0,liblzo2-2,libopenal1,libpulse0,libsmbclient|exe,dev,doc,nls| #i dont know difference between mplayer and mplayer-gui.
+yes|mpscan||exe,dev,doc,nls| #needed by pcurlftp_file_sharing.
 no|ms-sys||exe
 yes|mscw||exe,dev,doc,nls
 yes|mtpaint|mtpaint|exe,dev,doc,nls
 no|mtr||exe
 yes|nas|libaudio2|exe,dev,doc,nls
@@ -455,18 +458,18 @@
 yes|ntfs-3g|libntfs-3g75,libntfs-3g-dev|exe,dev,doc,nls
 yes|ntfsprogs|ntfsprogs,libntfs10,libntfs-dev|exe,dev,doc,nls
 yes|ntpdate||exe,dev,doc,nls| #needed by psync.
 yes|numlockx||exe| #needed by shinobars firstrun.
 no|obconf||exe,dev>null,doc,nls|+openbox
-yes|obmixer_tray||exe,dev,doc,nls| #alternative to retrovol.
+no|obmixer_tray||exe,dev,doc,nls| #alternative to retrovol.
 no|openbox||exe,dev>null,doc,nls
 yes|openjpeg|libopenjpeg2,libopenjpeg-dev|exe,dev,doc,nls
 yes|openldap|libldap-2.4-2,libldap2-dev|exe,dev,doc,nls
 no|openoffice|openoffice.org-writer,openoffice.org-math,openoffice.org-impress,openoffice.org-draw,openoffice.org-calc,openoffice.org-core,ure,lp-solve,openoffice.org-common,ttf-opensymbol,libgraphite3,libgstreamer-plugins-base0.10-0,libgstreamer0.10-0,libhyphen0,libicu44,libmythes-1.2-0,libneon27-gnutls,libnspr4-0d,libnss3-1d,librdf0,libwpd8c2a,libwpg-0.1-1,openoffice.org-gtk,openoffice.org-hyphenation-en-us,dictionaries-common,openoffice.org-pdfimport,libtext-iconv-perl,uno-libs3,libcolamd2.7.1|exe,dev,doc,nls
 yes|openslp|libslp1,libslp-dev|exe,dev,doc,nls
 no|opensp|libosp5|exe,dev,doc,nls
-no|opensp|opensp,libosp-dev|exe>dev,dev,doc,nls|+sgml-base,+sgml-data,+xml-core
+no|opensp|opensp,libosp-dev|exe>dev,dev,doc,nls|
 yes|openssh_client|openssh-client|exe,dev,doc,nls
 yes|openssl|openssl,libssl0.9.8,libssl-dev|exe,dev,doc,nls
 yes|openssl1||exe,dev>null,doc,nls| #some armv6 apps compiled in gentoo gap6 need this. see also liblzma5, libtiff5
 yes|orbit2|liborbit2,liborbit2-dev|exe,dev,doc,nls
 yes|orc|liborc-0.4-0,liborc-0.4-dev|exe,dev,doc,nls
@@ -487,10 +490,11 @@
 yes|pcdripper||exe
 yes|pciutils|pciutils,libpci3,libpci-dev|exe,dev,doc,nls
 yes|pcmciautils|pcmciautils|exe,dev,doc,nls
 yes|pcre|libpcre3,libpcre3-dev,libpcrecpp0|exe,dev,doc,nls
 yes|pctorrent||exe
+yes|pcurlftp_file_sharing||exe
 yes|pdvdrsab||exe
 yes|perl|perl,perl-base,perl-modules|exe>dev,dev,doc,nls
 yes|perl_tiny|perl,perl-base,perl-modules|exe,dev>null,doc>null,nls>null
 yes|perl-compress-zlib|libcompress-zlib-perl|exe>dev,dev,doc,nls
 yes|perl-digest-sha1|libdigest-sha1-perl|exe>dev,dev,doc,nls
@@ -509,10 +513,11 @@
 yes|picpuz||exe,dev,doc,nls
 yes|picscale||exe,dev,doc,nls
 no|pictureviewer||exe
 yes|pixman|libpixman-1-0,libpixman-1-dev|exe,dev,doc,nls
 yes|pkgconfig|pkg-config|exe>dev,dev,doc,nls
+yes|planner||exe,dev,doc,nls
 yes|pmetatagger||exe
 yes|pmirror||exe
 yes|pmirrorget||exe
 no|pmusic||exe,dev,doc,nls
 yes|pmusic1||exe,dev,doc,nls| #need use old version for ffmpeg less than or equal to 0.7.x --debian has 0.5.6.
@@ -543,23 +548,24 @@
 yes|puppy-podcast-grabber||exe
 yes|puppyserialdetect||exe
 yes|pupradio||exe,dev,doc,nls
 no|puptv||exe
 yes|pupx||exe
-no|pure_ftpd||exe,dev,doc,nls
+yes|pure-ftpd||exe,dev,doc,nls| #needed by pcurlftp_file_sharing.
 yes|pwallpaper||exe
 no|pwget||exe
 no|pwireless||exe
 yes|pwsget||exe
 yes|python|python,python2.5-minimal,python2.5|exe>dev,dev,doc,nls
 yes|python-libxml2|python-libxml2|exe>dev,dev,doc,nls|+libxml2
 yes|pzchmview||exe
 no|quisp||exe,dev,doc>dev,nls
+yes|rarian|rarian-compat,librarian0,librarian-dev,scrollkeeper|exe>dev,dev,doc>dev,nls| #replacement for scrollkeeper.
 no|readline|libreadline5,libreadline5-dev|exe,dev,doc,nls
 yes|readline|libreadline6,libreadline-dev,libreadline6-dev|exe,dev,doc,nls
 no|replaceit||exe
-no|retrovol||exe,dev,doc,nls| #alternative to obmixer_tray.
+yes|retrovol||exe,dev,doc,nls| #alternative to obmixer_tray.
 no|ripoff|ripoff,libripoff0,ripoff-mp3-plugin|exe,dev>null,doc,nls| #debian does not have this.
 no|ripoff||exe
 yes|rman|rman|exe>dev,dev,doc,nls
 yes|rox_filer||exe,dev,doc,nls
 yes|rp_pppoe_cli||exe,dev,doc,nls
@@ -586,14 +592,14 @@
 no|searchmonkey||exe
 yes|sed|sed|exe,dev>null,doc,nls
 yes|setserial|setserial|exe,dev>null,doc,nls
 yes|setvol||exe,dev,doc,nls
 yes|sfs-converter||exe
-yes|sfs_load||exe,dev,doc,nls
+no|sfs_load||exe,dev,doc,nls
 no|sgmixer||exe
-yes|sgml-base|sgml-base|exe>dev,dev,doc,nls
-yes|sgml-data|sgml-data|exe>dev,dev,doc,nls
+yes|sgml-base|sgml-base|exe>dev,dev,doc>dev,nls
+yes|sgml-data|sgml-data|exe>dev,dev,doc>dev,nls
 yes|shared-mime-info||exe,dev
 no|sox||exe,dev,doc,nls
 no|soxgui||exe
 yes|speex|speex,libspeex1,libspeex-dev|exe,dev,doc,nls
 yes|sqlite|sqlite3,libsqlite3-0,libsqlite3-dev|exe,dev,doc,nls
@@ -646,11 +652,11 @@
 yes|vobcopy|vobcopy|exe,dev,doc,nls
 yes|vorbis-tools|vorbis-tools|exe,dev,doc,nls
 no|waitmax||exe
 no|wallpaper||exe
 no|wavplay||exe
-yes|wcpufreq||exe
+no|wcpufreq||exe
 no|webkit|libwebkit-1.0-common,libwebkit-1.0-2,libwebkit-dev|exe,dev,doc,nls
 yes|wget|wget|exe,dev>null,doc,nls
 yes|wireless-tools|wireless-tools,libiw30,libiw-dev|exe,dev,doc,nls
 yes|wpa_supplicant|wpasupplicant|exe,dev>null,doc,nls
 yes|wv|libwv-1.2-3,libwv-dev|exe,dev,doc,nls
@@ -705,6 +711,7 @@
 no|you2pup||exe
 no|zfind||exe
 yes|z_geany_bacon_hack||exe
 yes|zip|zip|exe,dev>null,doc,nls
 yes|zlib|zlib1g,zlib1g-dev|exe,dev,doc,nls
+yes|z_lowresource_hack||exe| #noarch. disables system-log, reduces chromium writes to flash.
 '

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

@@ -1,9 +1,9 @@
 #One or more words that identify this distribution:
 DISTRO_NAME='Squeezed Arm Puppy'
 #version number of this distribution:
-DISTRO_VERSION=5.97
+DISTRO_VERSION=5.100
 #The distro whose binary packages were used to build this distribution:
 DISTRO_BINARY_COMPAT='debian'
 #Prefix for some filenames: exs: sqzdsave.2fs, sqzd-4.99.0.sfs
 DISTRO_FILE_PREFIX='sap6'
 #The version of the distro whose binary packages were used to build this distro:

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

@@ -83,10 +83,11 @@
 no|cpu-scaling-ondemand||exe
 no|ctorrent||exe,dev>null,doc,nls
 yes|cups|cups|exe,dev,doc>exe,nls
 yes|cups_pdf||exe
 yes|curl|curl|exe,dev,doc,nls
+yes|curlftpfs||exe,dev,doc,nls| #needed by pcurlftp_file_sharing
 no|cvs|cvs|exe>dev,dev,doc,nls
 no|dbus|dbus|exe,dev,doc,nls|
 no|dbus-glib|dbus-glib|exe,dev,doc,nls|
 yes|dbus||exe,dev,doc,nls
 yes|dbus-glib||exe,dev,doc,nls
@@ -361,10 +362,11 @@
 yes|mpfr|mpfr|exe>dev,dev,doc,nls
 no|mplayer_gui||exe
 no|mplayer_nogui||exe,doc,nls
 no|mplayerplug-in||exe
 no|mplayer_codecs_basic||exe
+yes|mpscan||exe,dev,doc,nls| #needed by pcurlftp_file_sharing.
 no|ms-sys||exe
 yes|mscw||exe| #kirks multiple sound card wizard
 no|mtpaint||exe,dev,doc,nls
 no|mtr|mtr|exe
 no|nbtscan||exe
@@ -410,10 +412,11 @@
 no|pclock||exe
 yes|pciutils|pciutils|exe,dev,doc,nls
 no|pcmciautils|pcmciautils|exe,dev,doc,nls
 no|pcre|pcre|exe,dev,doc,nls| #see libpcre
 no|pctorrent||exe
+yes|pcurlftp_file_sharing||exe
 yes|pdvdrsab||exe
 yes|peasypdf||exe
 no|peasyscan||exe
 yes|perl|perl|exe>dev,dev,doc,nls
 yes|perl_tiny|perl|exe,dev>null,doc>null,nls>null|
@@ -433,10 +436,11 @@
 yes|phash||exe,dev,doc,nls| #see also ghasher.
 yes|picocom||exe,dev,doc,nls
 yes|picpuz||exe
 yes|pixman|pixman|exe,dev,doc,nls
 yes|pkgconfig|pkgconfig|exe>dev,dev,doc,nls
+yes|planner||exe,dev,doc,nls
 no|pmetatagger||exe
 no|pmirc||exe
 yes|pmirror||exe
 yes|pmirrorget||exe
 yes|pmusic||exe
@@ -471,11 +475,11 @@
 no|puppy-podcast-grabber||exe
 yes|puppyserialdetect||exe
 yes|pupradio||exe,nls
 no|puptv||exe
 yes|pupx||exe
-no|pure_ftpd||exe,dev,doc,nls
+yes|pure-ftpd||exe,dev,doc,nls| #needed by pcurlftp_file_sharing.
 yes|pwallpaper||exe
 no|pwget||exe
 no|pwireless||exe
 no|pwireless2||exe
 yes|pwsget||exe
@@ -617,6 +621,7 @@
 no|you2pup||exe
 no|zfind||exe
 yes|z_geany_bacon_hack||exe
 yes|zip|zip|exe,dev>null,doc,nls
 yes|zlib|zlib|exe,dev,doc,nls
+yes|z_lowresource_hack||exe| #noarch. disables system-log, reduces chromium writes to flash.
 '

Changes to woof-distro/arm/ubuntu/precise/DISTRO_PKGS_SPECS-ubuntu-precise

@@ -88,10 +88,11 @@
 yes|cups||exe,dev,doc,nls
 no|cups|cups-bsd,cups,cups-common,cups-client,cups-ppdc,libcups2,libcups2-dev,libcupsimage2,libcupsimage2-dev,libcupsmime1,libcupsmime1-dev,libcupscgi1,libcupscgi1-dev,libcupsdriver1,libcupsdriver1-dev,libcupsppdc1,libcupsppdc1-dev|exe,dev,doc>exe,nls
 no|cups-filters|cups-filters,libcupsfilters1,libcupsfilters-dev|exe,dev,doc,nls| #extra cups filters, especially pdftops.
 yes|cups-pdf|cups-pdf|exe,dev,doc,nls
 yes|curl|curl,libcurl3,libcurl4-openssl-dev|exe,dev,doc,nls
+yes|curlftpfs||exe,dev,doc,nls| #needed by pcurlftp_file_sharing
 yes|cvs|cvs|exe>dev,dev,doc,nls
 yes|cyrus-sasl2|libsasl2-2,libsasl2-dev|exe,dev,doc,nls
 yes|dash|dash|exe>dev,dev,doc,nls
 no|dbus|dbus,libdbus-1-3,libdbus-1-dev|exe,dev,doc,nls|+lsb-base
 no|dbus-glib|libdbus-glib-1-2,libdbus-glib-1-dev|exe,dev,doc,nls|+dbus
@@ -119,10 +120,11 @@
 no|diffutils||exe
 yes|directfb|libdirectfb-1.2-9,libdirectfb-dev,libdirectfb-extra|exe,dev,doc,nls|+libts
 no|disktype|disktype|exe,dev>null,doc,nls| #broken, need my pet.
 yes|disktype||exe,dev,doc,nls
 no|dmidecode|dmidecode|exe,dev>null,doc,nls
+yes|docbook-xml|docbook-xml|exe>dev,dev,doc>dev,nls
 yes|dosfstools|dosfstools|exe,dev>null,doc,nls
 yes|dpkg-deb|dpkg|exe,dev>null,doc,nls
 yes|dvdauthor|dvdauthor|exe,dev,doc,nls
 yes|dvd+rwtools|dvd+rw-tools,growisofs|exe,dev,doc,nls
 yes|e2fsprogs|e2fsprogs,e2fslibs,e2fslibs-dev,libblkid1,libblkid-dev,libcomerr2,comerr-dev,libss2,ss-dev,libuuid1,uuid-dev|exe,dev,doc,nls
@@ -454,10 +456,11 @@
 yes|mpeg2dec|libmpeg2-4,libmpeg2-4-dev|exe,dev,doc,nls| #needed by mplayer.
 yes|mpfr|libmpfr4|exe>dev,dev,doc,nls
 no|mplayerplug-in||exe,dev,doc,nls
 yes|mplayer|mplayer,libaa1,libaudio2,libcaca0,libenca0,libesd0,libgpm2,libjack0,liblzo2-2,libmpcdec6,libopenal1,libpostproc52,libpulse0,libschroedinger-1.0-0,libsdl1.2debian,libsmbclient,libspeex1,libsvga1,libswscale2,libtalloc2,libwbclient0,libwrap0,libx264-120,libxvidcore4,libxvmc1,libxxf86dga1|exe,dev,doc,nls
 yes|mplayer_codecs_basic||exe
+yes|mpscan||exe,dev,doc,nls| #needed by pcurlftp_file_sharing.
 yes|mscw||exe| #multiple sound card wizard.
 no|ms-sys||exe
 yes|mtdev|libmtdev1,libmtdev-dev|exe,dev,doc,nls| #needed by synaptics_drv.so in xorg.
 yes|mtpaint|mtpaint|exe,dev,doc,nls
 no|mtpaint||exe
@@ -488,11 +491,11 @@
 no|obconf||exe,dev>null,doc,nls|+openbox
 no|openbox||exe,dev>null,doc,nls
 yes|openldap|libldap-2.4-2,libldap2-dev|exe,dev,doc,nls
 yes|openslp|libslp1,libslp-dev|exe,dev,doc,nls
 yes|opensp-runtime|libosp5|exe,dev,doc,nls| #needed by libofx and homebank.
-yes|opensp|opensp,libosp-dev|exe>dev,dev,doc,nls|+sgml-base,+sgml-data,+xml-core
+yes|opensp|opensp,libosp-dev|exe>dev,dev,doc,nls|
 yes|openssh_client|openssh-client|exe,dev,doc,nls
 yes|openssl0|libssl0.9.8|exe,dev>null,doc,nls| #old version.
 yes|openssl|openssl,libssl1.0.0,libssl-dev|exe,dev,doc,nls
 yes|optipng|optipng|exe>dev,dev,doc,nls
 yes|orbit2|liborbit2,liborbit2-dev|exe,dev,doc,nls
@@ -513,10 +516,11 @@
 yes|pcdripper||exe
 yes|pciutils|pciutils,libpci3,libpci-dev|exe,dev,doc,nls
 yes|pcmciautils|pcmciautils|exe,dev,doc,nls
 yes|pcre|libpcre3,libpcre3-dev,libpcrecpp0|exe,dev,doc,nls
 yes|pctorrent||exe
+yes|pcurlftp_file_sharing||exe
 yes|pdvdrsab||exe
 yes|peasypdf||exe,dev,doc,nls
 yes|peasyprint||exe,dev,doc,nls
 no|peasyscan||exe,dev,doc,nls| #need to compile for arm.
 yes|perl|perl,perl-base,perl-modules|exe>dev,dev,doc,nls
@@ -538,10 +542,11 @@
 yes|picpuz||exe
 yes|picscale||exe|
 no|pictureviewer||exe
 yes|pixman|libpixman-1-0,libpixman-1-dev|exe,dev,doc,nls
 yes|pkgconfig|pkg-config|exe>dev,dev,doc,nls
+yes|planner||exe,dev,doc,nls
 yes|pmetatagger||exe
 yes|pmirror||exe
 yes|pmirrorget||exe
 yes|pmusic||exe
 yes|pmusic_tray||exe,dev,doc,nls
@@ -572,18 +577,19 @@
 yes|puppy-podcast-grabber||exe
 yes|puppyserialdetect||exe
 yes|pupradio||exe,dev,doc,nls
 no|puptv||exe
 yes|pupx||exe
-no|pure_ftpd||exe
+yes|pure-ftpd||exe,dev,doc,nls| #needed by pcurlftp_file_sharing.
 yes|pwallpaper||exe
 no|pwget||exe
 yes|pwsget||exe
 no|pwireless||exe
 yes|python|python,python2.7-minimal,python2.7|exe>dev,dev,doc,nls
 yes|python-libxml2|python-libxml2|exe>dev,dev,doc,nls|+libxml2
 yes|pzchmview||exe,dev,doc,nls
+yes|rarian|rarian-compat,librarian0,librarian-dev,scrollkeeper|exe>dev,dev,doc>dev,nls| #replacement for scrollkeeper.
 yes|readline|libreadline6,libreadline6-dev,readline-common|exe,dev,doc,nls
 no|replaceit||exe
 yes|retrovol||exe
 no|ripoff|ripoff,libripoff0,ripoff-mp3-plugin|exe,dev>null,doc,nls
 yes|rman|rman|exe>dev,dev,doc,nls
@@ -611,12 +617,12 @@
 yes|setserial|setserial|exe,dev>null,doc,nls
 yes|setvol||exe
 yes|sfs-converter||exe
 yes|sfs_load||exe,dev,doc,nls
 no|sgmixer||exe
-yes|sgml-base|sgml-base|exe>dev,dev,doc,nls
-yes|sgml-data|sgml-data|exe>dev,dev,doc,nls
+yes|sgml-base|sgml-base|exe>dev,dev,doc>dev,nls
+yes|sgml-data|sgml-data|exe>dev,dev,doc>dev,nls
 yes|shared-mime-info||exe,dev
 no|smplayer||exe,dev,doc,nls
 yes|snap2||exe,dev,doc,nls
 yes|sqlite|sqlite3,libsqlite3-0,libsqlite3-dev|exe,dev,doc,nls
 no|squashfs-tools|squashfs-tools|exe,dev>null,doc,nls
@@ -732,6 +738,7 @@
 yes|z_geany_bacon_hack||exe
 yes|zip|zip|exe,dev>null,doc,nls
 yes|zlib|zlib1g,zlib1g-dev|exe,dev,doc,nls
 no|zmixer||exe
 yes|zz_ubuntu_precise_fixup||exe,dev,doc,nls
+yes|z_lowresource_hack||exe| #noarch. disables system-log, reduces chromium writes to flash.
 '

Changes to woof-distro/x86/Packages-puppy-common-official

@@ -148,11 +148,11 @@
 gtk_theme_phacile_blue-1.3|gtk_theme_phacile_blue|1.3||Desktop|480K||gtk_theme_phacile_blue-1.3.pet|+gtk+|gtk blue-grey theme||||
 gtk_theme_polished_blue-1.2.3|gtk_theme_polished_blue|1.2.3||Desktop|156K||gtk_theme_polished_blue-1.2.3.pet|+gtk+|grey blue 3d gtk theme||||
 gtk_theme_stardust_zigbert-0.5|gtk_theme_stardust_zigbert|0.5||Desktop|45K||gtk_theme_stardust_zigbert-0.5.pet|+gtk+|gtk light blue 3d theme||||
 gtk_theme_stark-1|gtk_theme_stark|1||Desktop|48K||gtk_theme_stark-1.pet|+gtk+|stark black/white theme for gtk, with faint colours and bright orange splashes||||
 gtrayicon_network-1.1-q1|gtrayicon_network|1.1-q1||BuildingBlock|36K||gtrayicon_network-1.1-q1.pet|+gtk+|trayicon used by pwireless2|t2|8.0rc||
-guess_fs-20090512|guess_fs|20090512||BuildingBlock|21K||guess_fs-20090512.pet||report filesystem type. created by jesse, compiled statically||||
+guess_fs-20120705|guess_fs|20120705||BuildingBlock|21K||guess_fs-20120705.pet||report filesystem type. created by jesse, compiled statically||||
 guvcview-1.5.0-w5c|guvcview|1.5.0-w5c||Multimedia|8072K||guvcview-1.5.0-w5c.pet||A video viewer and capturer for the linux uvc driver|puppy|wary5||
 gview-0.9.1a|gview|0.9.1a||Graphic|9K||gview-0.9.1a.pet|+gtk+|very basic image viewer|puppy|4||
 gwhere-0.2.3-1|gwhere|0.2.3-1||Filesystem|688K||gwhere-0.2.3-1.pet|+gtk+|disk cataloger|puppy|4||
 gxmessage-2.12.4-1-w5c|gxmessage|2.12.4-1-w5c||Develop|36K||gxmessage-2.12.4-1-w5c.pet|+gtk+|simple message-boxes called from scripts, replaces xlib-only xmessage|puppy|wary5||
 gxmessage_DOC-2.12.4-1-w5c|gxmessage_DOC|2.12.4-1-w5c||Develop|76K||gxmessage_DOC-2.12.4-1-w5c.pet||simple gui message boxes, replaces xmessage||||