Check-in [6bc0629099]
Not logged in

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

Overview

SHA1 Hash:6bc06290995c1bd7d80a50f12a156f5a2a49f51f
Date: 2012-06-28 12:02:53
User: BarryK
Comment:install a pkg, in woof or running pup with ppm, improved menu assignment

Tags And Properties
Changes

Changes to woof-code/2createpackages

@@ -28,10 +28,11 @@
 #111210 01micko: FIXUPHACK wasn't copied to packages/$(DISTRO_FILE_PREFIX}/$GENERICNAME/
 #120316 problems with ubuntu multiarch. also see 120315 in 3builddistro.
 #120502 do not strip if a cross-build.
 #120515 build from "gentoo" binary tarballs (refer support/gentoo).
 #120517 export DISTRO_BINARY_COMPAT so can reference in FIXUPHACK scripts.
+#120628 fix Categories= assignment in .desktop files. see also usr/local/petget/installpkg.sh.
 
 export LANG=C #faster.
 
 . /etc/xdg/menus/hierarchy #w478 has PUPHIERARCHY variable.
 
@@ -520,52 +521,61 @@
      continue
     fi
    ;;
   esac
 
-  #w019 fix .desktop files...
+  #w019 fix .desktop files... 120628 improve...
   DEFICON='Executable.xpm'
   FULLPKGNAME="`basename $ONEBINARYPKG`"
   fnPATTERN='|'"$FULLPKGNAME"'|'
   #DB_ENTRY="`cat $PKGLISTS_COMPAT | grep "$fnPATTERN" | head -n 1`"
   DB_ENTRY="`echo -n "$ONEDBENTRY" | cut -f 4-19 -d '|'`" #take GENERICNAME|PETorCOMPAT|DBFILE| off start.
   CATEGORY="`echo -n "$DB_ENTRY" | cut -f 5 -d '|'`"
   #see also /usr/local/petget/installpkg.sh...
   case $CATEGORY in
-   Desktop)    CATEGORY='Desktop;X-Desktop' ; DEFICON='mini.window3d.xpm' ;;
-   System)     CATEGORY='System' ; DEFICON='mini-term.xpm' ;;
-   Setup)      CATEGORY='Setup;X-SetupEntry' ; DEFICON='so.xpm' ;;
-   Utility)    CATEGORY='Utility' ; DEFICON='mini-hammer.xpm' ;;
-   Filesystem) CATEGORY='Filesystem;FileSystem' ; DEFICON='mini-filemgr.xpm' ;;
-   Graphic)    CATEGORY='Graphic;Presentation' ; DEFICON='image_2.xpm' ;;
-   Document)   CATEGORY='Document;X-Document' ; DEFICON='mini-doc1.xpm' ;;
-   Business)   CATEGORY='Business;X-Calculate' ; DEFICON='mini-calc.xpm' ;; #110821 Calculate is old name, now Business.
-   Personal)   CATEGORY='Personal;X-Personal' ; DEFICON='mini-book2.xpm' ;;
-   Network)    CATEGORY='Network' ; DEFICON='pc-2x.xpm' ;;
-   Internet)   CATEGORY='Internet;X-Internet' ; DEFICON='pc2www.xpm' ;;
-   Multimedia) CATEGORY='Multimedia;AudioVideo' ; DEFICON='Animation.xpm' ;;
-   Fun)        CATEGORY='Fun;Game' ; DEFICON='mini-maze.xpm' ;;
-   Develop)    CATEGORY='Utility' ; DEFICON='mini-hex.xpm' ;;
-   Help)       CATEGORY='Utility' ; DEFICON='info16.xpm' ;;
+   Desktop)    xCATEGORY='X-Desktop' ; DEFICON='mini.window3d.xpm' ;;
+   System)     xCATEGORY='System' ; DEFICON='mini-term.xpm' ;;
+   Setup)      xCATEGORY='X-SetupEntry' ; DEFICON='so.xpm' ;;
+   Utility)    xCATEGORY='Utility' ; DEFICON='mini-hammer.xpm' ;;
+   Filesystem) xCATEGORY='FileSystem' ; DEFICON='mini-filemgr.xpm' ;;
+   Graphic)    xCATEGORY='Presentation' ; DEFICON='image_2.xpm' ;;
+   Document)   xCATEGORY='X-Document' ; DEFICON='mini-doc1.xpm' ;;
+   Business)   xCATEGORY='X-Calculate' ; DEFICON='mini-calc.xpm' ;; #110821 Calculate is old name, now Business.
+   Calculate)  CATEGORY='Business' ; xCATEGORY='X-Calculate' ; DEFICON='mini-calc.xpm' ;; #110821 Calculate is old name, now Business.
+   Personal)   xCATEGORY='X-Personal' ; DEFICON='mini-book2.xpm' ;;
+   Network)    xCATEGORY='Network' ; DEFICON='pc-2x.xpm' ;;
+   Internet)   xCATEGORY='X-Internet' ; DEFICON='pc2www.xpm' ;;
+   Multimedia) xCATEGORY='AudioVideo' ; DEFICON='Animation.xpm' ;;
+   Fun)        xCATEGORY='Game' ; DEFICON='mini-maze.xpm' ;;
+   Develop)    CATEGORY='Utility' ; xCATEGORY='Utility' ; DEFICON='mini-hex.xpm' ;;
+   Help)       CATEGORY='Utility' ; xCATEGORY='Utility' ; DEFICON='info16.xpm' ;;
+   BuildingBlock) CATEGORY='Utility' ; xCATEGORY='Utility' ; DEFICON='mini-hex.xpm' ;; #unlikely to have a .desktop file.
+   *)          CATEGORY='Utility' ; xCATEGORY='Utility' ; DEFICON='mini-hex.xpm' ;;    #this should not happen.
   esac
   #echo "PKGLISTS_COMPAT=$PKGLISTS_COMPAT ONEBINARYPKG=$ONEBINARYPKG CATEGORY=$CATEGORY" #TEST
-  cPATTERN="s%^Categories=.*%Categories=${CATEGORY}%"
+  tPATTERN="^${CATEGORY} "
+  cPATTERN="s%^Categories=.*%Categories=${xCATEGORY}%"
   iPATTERN="s%^Icon=.*%Icon=${DEFICON}%"
   FND_DESKTOP="`find sandbox2/usr/share/applications sandbox2/usr/local/share/applications sandbox2/usr/X11R7/applications -type f -name \*.desktop 2>/dev/null | tr '\n' ' '`"
   for ONEDESKTOP in $FND_DESKTOP
   do
    #w478 find if category is already valid...
    CATFOUND="no"
-   for ONEORIGCAT in `cat $ONEDESKTOP | grep '^Categories=' | head -n 1 | cut -f 2 -d '=' | tr ';' ' '`
+   for ONEORIGCAT in `cat $ONEDESKTOP | grep '^Categories=' | head -n 1 | cut -f 2 -d '=' | tr ';' ' ' | rev` #search in reverse order.
    do
+    ONEORIGCAT="`echo -n "$ONEORIGCAT" | rev`" #restore rev of one word.
     oocPATTERN=' '"$ONEORIGCAT"' '
-    [ "`echo "$PUPHIERARCHY" | tr -s ' ' | cut -f 3 -d ' ' | tr ',' ' ' | sed -e 's%^% %' -e 's%$% %' | grep "$oocPATTERN"`" != "" ] && CATFOUND="yes"
+    [ "`echo "$PUPHIERARCHY" | tr -s ' ' | grep "$tPATTERN" | cut -f 3 -d ' ' | tr ',' ' ' | sed -e 's%^% %' -e 's%$% %' | grep "$oocPATTERN"`" != "" ] && CATFOUND="yes"
+    #got a problem with sylpheed, "Categories=GTK;Network;Email;News;" this displays in both Network and Internet menus...
+    if [ "$CATFOUND" = "yes" ];then
+     cPATTERN="s%^Categories=.*%Categories=${ONEORIGCAT}%"
+     break
+    fi
    done
-   if [ "$CATFOUND" = "no" ];then
-    sed -e "$cPATTERN" $ONEDESKTOP > /tmp/2createpackages-tmp
-    mv -f /tmp/2createpackages-tmp $ONEDESKTOP
-   fi
+   #if [ "$CATFOUND" = "no" ];then
+    sed -i -e "$cPATTERN" $ONEDESKTOP
+   #fi
    #does the icon exist?... fix .desktop... 110821 improve...
    ICON="`grep '^Icon=' $ONEDESKTOP | cut -f 2 -d '='`"
    if [ "$ICON" != "" ];then
     [ -e "sandbox2${ICON}" ] && continue #it may have a hardcoded path.
     [ -e "${ICON}" ] && continue #it may have a hardcoded path, look in running puppy.

Changes to woof-code/packages-templates/coreutils/FIXUPHACK

@@ -9,9 +9,10 @@
 DISABLE_POST_INSTALL_SCRIPT=yes
 
 #dunno why deb has to relocate 'head' in /usr/bin...
 if [ -f usr/bin/head ];then
  if [ ! -h usb/bin/head ];then #120516
-  mv -f --remove-destination usr/bin/head bin/head
+  cp -a -f --remove-destination usr/bin/head bin/head
+  rm -f usr/bin/head
   ln -s ../../bin/head usr/bin/head
  fi
 fi

Changes to woof-code/rootfs-skeleton/usr/local/petget/installpkg.sh

@@ -26,10 +26,11 @@
 #120102 install may have overwritten a symlink-to-dir.
 #120107 rerwin: need quotes around some paths in case of space chars. remove '--unlink-first' from tar (was introduced 120102, don't think necessary).
 #120126 noryb009: fix typo.
 #120219 was not properly internationalized (there was no TEXTDOMAIN).
 #120523 may need to run gio-query-modules and/or glib-compile-schemas. (refer also rc.update and 3builddistro)
+#120628 fix Categories= assignment in .desktop files. see also 2createpackages in woof.
 
 #information from 'labrador', to expand a .pet directly to '/':
 #NAME="a52dec-0.7.4"
 #pet2tgz "${NAME}.pet"
 #tar -C / --transform 's/^\(\.\/\)\?'"$NAME"'//g' -zxf "${NAME}.tar.gz"
@@ -349,53 +350,60 @@
  echo not equal sed ing now
  DB_ENTRY=`echo "$DB_ENTRY" |sed "s#$db_pkg_name#$DLPKG_NAME#"`
 fi
 ##+++2011-12-27 KRG
 
-#see if a .desktop file was installed, fix category...
+#see if a .desktop file was installed, fix category... 120628 improve...
 ONEDOT=""
 DEFICON='Executable.xpm'
 CATEGORY="`echo -n "$DB_ENTRY" | cut -f 5 -d '|'`"
 #fix category so finds a place in menu... (same code in woof 2createpackages)
 #i think allow field5 to specify a sub-category, 'category;subcategory'
 #if no sub-cat then it will come into one of these cases:
 case $CATEGORY in
- Desktop)    CATEGORY='Desktop;X-Desktop' ; DEFICON='mini.window3d.xpm' ;;
- System)     CATEGORY='System' ; DEFICON='mini-term.xpm' ;;
- Setup)      CATEGORY='Setup;X-SetupEntry' ; DEFICON='so.xpm' ;;
- Utility)    CATEGORY='Utility' ; DEFICON='mini-hammer.xpm' ;;
- Filesystem) CATEGORY='Filesystem;FileSystem' ; DEFICON='mini-filemgr.xpm' ;;
- Graphic)    CATEGORY='Graphic;Presentation' ; DEFICON='image_2.xpm' ;;
- Document)   CATEGORY='Document;X-Document' ; DEFICON='mini-doc1.xpm' ;;
- Calculate)  CATEGORY='Calculate;X-Calculate' ; DEFICON='mini-calc.xpm' ;;
- Business)   CATEGORY='Business;X-Calculate' ; DEFICON='mini-calc.xpm' ;; #110705 Calculate is old name, now Business.
- Personal)   CATEGORY='Personal;X-Personal' ; DEFICON='mini-book2.xpm' ;;
- Network)    CATEGORY='Network' ; DEFICON='pc-2x.xpm' ;;
- Internet)   CATEGORY='Internet;X-Internet' ; DEFICON='pc2www.xpm' ;;
- Multimedia) CATEGORY='Multimedia;AudioVideo' ; DEFICON='Animation.xpm' ;;
- Fun)        CATEGORY='Fun;Game' ; DEFICON='mini-maze.xpm' ;;
- Develop)    CATEGORY='Utility' ; DEFICON='mini-hex.xpm' ;;
- Help)       CATEGORY='Utility' ; DEFICON='info16.xpm' ;;
- *)          CATEGORY='BuildingBlock' ; DEFICON='Executable.xpm' ;; #w482
+ Desktop)    xCATEGORY='X-Desktop' ; DEFICON='mini.window3d.xpm' ;;
+ System)     xCATEGORY='System' ; DEFICON='mini-term.xpm' ;;
+ Setup)      xCATEGORY='X-SetupEntry' ; DEFICON='so.xpm' ;;
+ Utility)    xCATEGORY='Utility' ; DEFICON='mini-hammer.xpm' ;;
+ Filesystem) xCATEGORY='FileSystem' ; DEFICON='mini-filemgr.xpm' ;;
+ Graphic)    xCATEGORY='Presentation' ; DEFICON='image_2.xpm' ;;
+ Document)   xCATEGORY='X-Document' ; DEFICON='mini-doc1.xpm' ;;
+ Business)   xCATEGORY='X-Calculate' ; DEFICON='mini-calc.xpm' ;; #110821 Calculate is old name, now Business.
+ Calculate)  CATEGORY='Business' ; xCATEGORY='X-Calculate' ; DEFICON='mini-calc.xpm' ;; #110821 Calculate is old name, now Business.
+ Personal)   xCATEGORY='X-Personal' ; DEFICON='mini-book2.xpm' ;;
+ Network)    xCATEGORY='Network' ; DEFICON='pc-2x.xpm' ;;
+ Internet)   xCATEGORY='X-Internet' ; DEFICON='pc2www.xpm' ;;
+ Multimedia) xCATEGORY='AudioVideo' ; DEFICON='Animation.xpm' ;;
+ Fun)        xCATEGORY='Game' ; DEFICON='mini-maze.xpm' ;;
+ Develop)    CATEGORY='Utility' ; xCATEGORY='Utility' ; DEFICON='mini-hex.xpm' ;;
+ Help)       CATEGORY='Utility' ; xCATEGORY='Utility' ; DEFICON='info16.xpm' ;;
+ BuildingBlock) CATEGORY='Utility' ; xCATEGORY='Utility' ; DEFICON='mini-hex.xpm' ;; #unlikely to have a .desktop file.
+ *)          CATEGORY='Utility' ; xCATEGORY='Utility' ; DEFICON='mini-hex.xpm' ;;    #this should not happen.
 esac
-cPATTERN="s%^Categories=.*%Categories=${CATEGORY}%"
+tPATTERN="^${CATEGORY} "
+cPATTERN="s%^Categories=.*%Categories=${xCATEGORY}%"
 iPATTERN="s%^Icon=.*%Icon=${DEFICON}%"
 for ONEDOT in `grep '\.desktop$' /root/.packages/${DLPKG_NAME}.files | tr '\n' ' '`
 do
  #w478 find if category is already valid...
  CATFOUND="no"
- for ONEORIGCAT in `cat $ONEDOT | grep '^Categories=' | head -n 1 | cut -f 2 -d '=' | tr ';' ' '`
+ for ONEORIGCAT in `cat $ONEDOT | grep '^Categories=' | head -n 1 | cut -f 2 -d '=' | tr ';' ' ' | rev` #search in reverse order.
  do
+  ONEORIGCAT="`echo -n "$ONEORIGCAT" | rev`" #restore rev of one word.
   oocPATTERN=' '"$ONEORIGCAT"' '
-  [ "`echo "$PUPHIERARCHY" | tr -s ' ' | cut -f 3 -d ' ' | tr ',' ' ' | sed -e 's%^% %' -e 's%$% %' | grep "$oocPATTERN"`" != "" ] && CATFOUND="yes"
+  [ "`echo "$PUPHIERARCHY" | tr -s ' ' | grep "$tPATTERN" | cut -f 3 -d ' ' | tr ',' ' ' | sed -e 's%^% %' -e 's%$% %' | grep "$oocPATTERN"`" != "" ] && CATFOUND="yes"
+  #got a problem with sylpheed, "Categories=GTK;Network;Email;News;" this displays in both Network and Internet menus...
+  if [ "$CATFOUND" = "yes" ];then
+   cPATTERN="s%^Categories=.*%Categories=${ONEORIGCAT}%"
+   break
+  fi
  done
- if [ "$CATFOUND" = "no" ];then
-  sed -e "$cPATTERN" $ONEDOT > /tmp/petget_category
-  mv -f /tmp/petget_category $ONEDOT
- else
-  CATEGORY="`echo -n "$ONEORIGCAT" | rev | cut -f 1 -d ' ' | rev`" #w482
- fi
+ #if [ "$CATFOUND" = "no" ];then
+  sed -i -e "$cPATTERN" $ONEDOT
+ #else
+ # CATEGORY="`echo -n "$ONEORIGCAT" | rev | cut -f 1 -d ' ' | rev`" #w482
+ #fi
  #w019 does the icon exist?...
  ICON="`grep '^Icon=' $ONEDOT | cut -f 2 -d '='`"
  if [ "$ICON" != "" ];then
   [ -e "$ICON" ] && continue #it may have a hardcoded path.
   ICONBASE="`basename "$ICON"`"

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

@@ -93,10 +93,13 @@
 jasper_DOC-1.900.1-armv6|jasper_DOC|1.900.1-armv6||BuildingBlock|32K||jasper_DOC-1.900.1-armv6.pet||jpeg2000 library and utilities||||
 jimtcl-20120426-armv6|jimtcl|20120426-armv6||BuildingBlock|280K||jimtcl-20120426-armv6.pet||tiny tcl interpreter, used by usb_modeswitch|puppy|||
 jimtcl_DOC-20120426-armv6|jimtcl_DOC|20120426-armv6||BuildingBlock|348K||jimtcl_DOC-20120426-armv6.pet||tiny tcl interpreter||||
 jwm2-574-armv6|jwm2|574-armv6||Desktop|224K||jwm2-574-armv6.pet||joes window manager and tray|puppy|||
 jwm2_DOC-574-armv6|jwm2_DOC|574-armv6||Desktop|52K||jwm2_DOC-574-armv6.pet||joes window manager||||
+kbd-1.15.3-sap6|kbd|1.15.3-sap6||BuildingBlock|3336K||kbd-1.15.3-sap6.pet||console keyboard layout and screen fonts, this is the full package|debian|squeeze||
+kbd_DOC-1.15.3-sap6|kbd_DOC|1.15.3-sap6||BuildingBlock|156K||kbd_DOC-1.15.3-sap6.pet||console keyboard layout and screen fonts||||
+kbd_NLS-1.15.3-sap6|kbd_NLS|1.15.3-sap6||BuildingBlock|800K||kbd_NLS-1.15.3-sap6.pet|+kbd|console keyboard layout and screen fonts||||
 leafpad-0.8.18.1-armv6|leafpad|0.8.18.1-armv6||Document|128K||leafpad-0.8.18.1-armv6.pet|+gtk+|A GTK+ based simple text editor|puppy|||
 leafpad_NLS-0.8.18.1-armv6|leafpad_NLS|0.8.18.1-armv6||Document|592K||leafpad_NLS-0.8.18.1-armv6.pet|+leafpad|simple text editor||||
 libart-2.3.21-armv6|libart|2.3.21-armv6||BuildingBlock|92K||libart-2.3.21-armv6.pet||A library for highperformance 2D graphics|puppy|||
 libart_DEV-2.3.21-armv6|libart_DEV|2.3.21-armv6||BuildingBlock|416K||libart_DEV-2.3.21-armv6.pet|+libart|library for 2d graphics|puppy|||
 libcddb-1.3.2-armv6|libcddb|1.3.2-armv6||BuildingBlock|88K||libcddb-1.3.2-armv6.pet|+libcdio|Libcddb is a C library to access at a CDDB server|puppy|||
@@ -222,9 +225,10 @@
 xfdiff-cut-4.5.0-armv6|xfdiff-cut|4.5.0-armv6||Utility|104K||xfdiff-cut-4.5.0-armv6.pet|+gtk+|Xfdiff-cut compare two files|puppy|||
 xfdiff-cut_NLS-4.5.0-armv6|xfdiff-cut_NLS|4.5.0-armv6||Utility|704K||xfdiff-cut_NLS-4.5.0-armv6.pet|+xfdiff-cut|compare two files||||
 xload-1.1.0-armv6|xload|1.1.0-armv6||BuildingBlock|44K||xload-1.1.0-armv6.pet|+xorg|plot cpu load|puppy|||
 xlockmore-5.31-patched-armv6|xlockmore|5.31-patched-armv6||BuildingBlock|212K||xlockmore-5.31-patched-armv6.pet|+xorg_base|screen lock and screensaver|puppy|||
 xlockmore_DOC-5.31-patched-armv6|xlockmore_DOC|5.31-patched-armv6||BuildingBlock|84K||xlockmore_DOC-5.31-patched-armv6.pet||screen lock||||
+xwininfo-1.0.5-sap6|xwininfo|1.0.5-sap6||BuildingBlock|40K||xwininfo-1.0.5-sap6.pet|+xorg|get information about a window, such as its dimensions, including root window|debian|sap6||
 yad-0.17.1.1-armv6|yad|0.17.1.1-armv6||BuildingBlock|164K||yad-0.17.1.1-armv6.pet|+gtk+|gui for shell scripts|puppy|||
 yad_DOC-0.17.1.1-armv6|yad_DOC|0.17.1.1-armv6||BuildingBlock|44K||yad_DOC-0.17.1.1-armv6.pet||gui for shell scripts||||
 yad_NLS-0.17.1.1-armv6|yad_NLS|0.17.1.1-armv6||BuildingBlock|196K||yad_NLS-0.17.1.1-armv6.pet|+yad|gui for shell scripts||||
 yaf_splash-1.02-armv6|yaf_splash|1.02-armv6||BuildingBlock|60K||yaf_splash-1.02-armv6.pet|+xorg|text splash window|puppy|||

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

@@ -269,12 +269,12 @@
 yes|jbig2dec|libjbig2dec0,libjbig2dec0-dev|exe,dev,doc,nls
 yes|jimtcl||exe,dev,doc,nls
 yes|jwm2||exe,dev,doc,nls
 yes|jwmconfig2||exe,dev,doc,nls
 yes|jwmthememaker||exe,dev,doc,nls
-yes|kbd|kbd,console-data|exe,dev>exe,doc,nls| #dev>exe because of the include directory.
-no|kbd||exe,dev,doc,nls
+no|kbd|kbd,console-data|exe,dev>exe,doc,nls| #dev>exe because of the include directory.
+yes|kbd||exe,dev,doc,nls
 yes|keyutils|libkeyutils1|exe,dev>null,doc,nls
 yes|krb5|libkrb53,libkrb5-3,libkrb5-dev,libgssapi-krb5-2,libk5crypto3,libkrb5support0|exe,dev,doc,nls
 no|lame|lame,libmp3lame0,libmp3lame-dev|exe,dev,doc,nls
 no|lame||exe,dev,doc,nls
 yes|lcms|liblcms1,liblcms1-dev,liblcms-utils|exe,dev,doc,nls
@@ -381,11 +381,11 @@
 yes|libwavpack|libwavpack1,libwavpack-dev|exe,dev,doc,nls
 yes|libwmf|libwmf0.2-7,libwmf-dev|exe,dev,doc,nls
 yes|libwpg|libwpg-0.1-1|exe,dev>null,doc,nls
 yes|libwpd|libwpd8c2a,libwpd8-dev|exe,dev,doc,nls
 no|libx86|libx86-1,libx86-dev|exe,dev,doc,nls| #no ARMEL deb
-yes|libxcb_base|libxcb1,libxcb1-dev,libxcb-atom1,libxcb-atom1-dev,libxcb-aux0,libxcb-aux0-dev,libxcb-event1,libxcb-event1-dev,libxcb-render0,libxcb-render0-dev,libxcb-render-util0,libxcb-render-util0-dev|exe,dev,doc,nls
+yes|libxcb_base|libxcb1,libxcb1-dev,libxcb-atom1,libxcb-atom1-dev,libxcb-aux0,libxcb-aux0-dev,libxcb-event1,libxcb-event1-dev,libxcb-render0,libxcb-render0-dev,libxcb-render-util0,libxcb-render-util0-dev,libxcb-shape0,libxcb-shape0-dev|exe,dev,doc,nls
 no|libxfce4mcs|libxfce4mcs-client3,libxfce4mcs-manager3,libxfce4mcs-dev|exe,dev,doc,nls
 no|libxfce4util|libxfce4util4,libxfce4util-common,libxfce4util-dev|exe,dev,doc,nls
 no|libxfcegui4|libxfcegui4-4,libxfcegui4-dev,xfce-keyboard-shortcuts|exe,dev,doc,nls
 yes|libxml2|libxml2,libxml2-dev|exe,dev,doc,nls
 yes|libxml2|libxml2-utils|exe>dev,dev,doc,nls
@@ -591,11 +591,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
 yes|subversion|subversion,libsvn1,libdb4.6,libneon27-gnutls,libaprutil1,libpq5,libmysqlclient16,libapr1|exe>dev,dev,doc,nls
 no|superscan||exe
-yes|sylpheed|sylpheed,libcompfaceg1,libgpgme11,libldap-2.4-2,libonig2,libpisock9|exe,dev,doc,nls
+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.
 no|syslinux||exe
@@ -680,10 +680,11 @@
 no|xserver_xorg|xserver-xorg-dev,xserver-xorg,xserver-xorg-core,xserver-xorg-video-*,xserver-xorg-input-mouse,xserver-xorg-input-kbd,xserver-xorg-input-synaptics,xserver-xorg-input-evdev,xserver-xorg-input-wacom,-xserver-xorg-video-*-dbg,-xserver-xorg-video-dummy,-xserver-xorg-video-glint,-xserver-xorg-video-ivtv,-xserver-xorg-video-nsc,-xserver-xorg-video-radeonhd,-xserver-xorg-video-tga,-xserver-xorg-video-vga|exe,dev,doc,nls
 yes|xserver_xorg|xserver-xorg-dev,xserver-xorg,xserver-xorg-core,xserver-xorg-video-fbdev,xserver-xorg-video-omapfb,xserver-xorg-input-mouse,xserver-xorg-input-kbd,xserver-xorg-input-synaptics,xserver-xorg-input-evdev,xserver-xorg-input-wacom,xserver-xorg-input-synaptics|exe,dev,doc,nls| #cutdown for raspi.
 no|xserver_xvesa||exe
 no|xsoldier||exe
 yes|xtrans|xtrans-dev|exe>dev,dev,doc,nls
+yes|xwininfo||exe,dev,doc,nls
 yes|xz|xz-utils,liblzma2,liblzma-dev|exe,dev,doc,nls
 yes|yad||exe,dev,doc,nls|
 yes|yaf_splash||exe
 no|ycalc||exe,dev,doc,nls
 no|you2pup||exe

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.93
+DISTRO_VERSION=5.94
 #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/ubuntu/precise/DISTRO_PKGS_SPECS-ubuntu-precise

@@ -718,10 +718,11 @@
 yes|xserver_xorg|xserver-xorg-dev,xserver-common,xserver-xorg,xserver-xorg-core,xserver-xorg-input-synaptics,xserver-xorg-input-evdev,xserver-xorg-input-kbd,xserver-xorg-input-mouse,xserver-xorg-input-tslib,xserver-xorg-input-wacom,xserver-xorg-video-fbdev|exe,dev,doc,nls|
 no|xserver_xorg_input_old||exe| #-input-evdev supercedes these, but i am still stuck on using -input-mouse and -input-kbd, provided in this pet.
 no|xserver_xvesa||exe
 no|xsoldier||exe
 yes|xtrans|xtrans-dev|exe>dev,dev,doc,nls
+yes|xwininfo||exe,dev,doc,nls
 yes|xz|xz-utils,liblzma5,liblzma-dev|exe,dev,doc,nls
 no|yad||exe,dev,doc,nls|
 yes|yaf_splash||exe
 no|ycalc||exe
 no|you2pup||exe