Check-in [edebc7e525]
Not logged in

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

Overview

SHA1 Hash:edebc7e52590eba97caadb4f275400a0f7e0d21a
Date: 2012-02-17 23:49:39
User: BarryK
Comment:MoManager bug fixes, thanks to L18L and rodin.s

Tags And Properties
Changes

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

@@ -60,14 +60,15 @@
 #111107 ldolse: unmount network shares before taking down the network
 #120103 karl godt: error unmounting stray partitions. 120103 karl godt: more tweaks.
 #120129 karl godt: need to rearrange order, refer http://murga-linux.com/puppy/viewtopic.php?t=71767&start=405.
 #120129 karl godt: improved ZOMBIES, see http://www.murga-linux.com/puppy/viewtopic.php?t=73122
 #120130 rodin.s: update for gettext (line 91).
+#120218 changed TEXTDOMAIN=etcrcd___rc.shutdown to TEXTDOMAIN=rc.shutdown (unlikely to be any other file same name in $PATH).
 
 #110923
 . /usr/bin/gettext.sh # enables use of eval_gettext (several named variables) and ngettext (plurals)
-export TEXTDOMAIN=etcrcd___rc.shutdown
+export TEXTDOMAIN=rc.shutdown
 export OUTPUT_CHARSET=UTF-8
 
 clear
 exec 1> /dev/null 2>&1
 

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

@@ -7,10 +7,11 @@
 #101117 url sanity check. more download size check.
 #101118 for ftp connection have to get size differently.
 #101126 not sure, it seems that wget now defaults to ipv6, fails for some users, use '-4' to force ipv4.
 #101206 fix find filesize ftp://ftp.lug.udel.edu/pub/puppylinux ...
 #120201 rodin.s: internationalized. Add LANG=C to 1-st wget for proper work
+#120218 removed a LANG=C line (line 43).
 
 # adding gettext
 export TEXTDOMAINDIR=/usr/share/locale
 export TEXTDOMAIN=download_file
 eval_gettext () {
@@ -38,11 +39,10 @@
  PID1=$!
  LANG=C wget -4 -t 2 -T 20 --waitretry=20 --spider -S "${URLSPEC}" > /tmp/download_file_spider.log1 2>&1 #
  if [ $? -ne 0 ];then
   Xdialog --wmclass "gtkdialog2" --title "$(gettext 'Puppy File Downloader')" --screen-center --cr-wrap --ok-label "$(gettext 'TEST AGAIN')" --cancel-label "$(gettext 'GIVE UP')" --icon "/usr/local/lib/X11/pixmaps/error.xpm" --yesno "$(gettext 'Tested if remote file exists, but failed, see log top-left of screen.
 Do you want to test again, or give up?')" 0 0
- LANG=C #110602
   REPLY1=$?
   kill $PID1
   [ $REPLY1 -eq 0 ] && continue
   exit 1
  fi

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

@@ -19,10 +19,11 @@
 #120213 added management of binary executables.
 #120214 generate a langpack PET package.
 #120215 added management of initrd files (initrd_strings SSS domain).
 #120217 small message fixes.
 #120217 support poeditor.
+#120218 LANG=${ORIGLANG} prefix needed various places.
 
 #***MOMANAGER IS ENGLISH ONLY (NOT GETTEXT'ED)***
 #it is for use by developers/translators with knowledge of english.
 
 PARAM1=""
@@ -678,15 +679,15 @@
   yaf-splash -bg yellow -placement top -timeout 9 -text "The .mo file has been converted to an editable .po file. Edit, then Save, then Quit text editor..."
   ' > /tmp/momanager/yafmsg
   chmod 755 /tmp/momanager/yafmsg
   /tmp/momanager/yafmsg & #msg has delay so will appear on top of text editor window.
   if [ "$POEDITOR" ];then
-   ${POEDITOR} /tmp/momanager/${ATEXTDOMAIN}.po
+   LANG=${ORIGLANG} ${POEDITOR} /tmp/momanager/${ATEXTDOMAIN}.po
   else
    killall geany 2> /dev/null #otherwise geany will return immediately and continue executing this script.
    sleep 0.5
-   defaulttexteditor /tmp/momanager/${ATEXTDOMAIN}.po
+   LANG=${ORIGLANG} defaulttexteditor /tmp/momanager/${ATEXTDOMAIN}.po
   fi
   rxvt -e msgfmt --check --output-file=/tmp/momanager/${ATEXTDOMAIN}.mo /tmp/momanager/${ATEXTDOMAIN}.po
   pupdialog --background yellow --colors --backtitle "MoManager: post-edit mo" --yes-label "OK" --no-label "Cancel" --yesno "The file /tmp/momanager/${ATEXTDOMAIN}.po has been edited and converted to /tmp/momanager/${ATEXTDOMAIN}.mo. If all went well, click the \ZbOK\ZB button to copy it to \Zb${AMOSPEC}\ZB. Note, as a precaution, the old mo file is at /tmp/momanager/${ATEXTDOMAIN}.moOLD." 0 0
   if [ $? -eq 0 ];then
    cp -f /tmp/momanager/${ATEXTDOMAIN}.mo "${AMOSPEC}"
@@ -769,15 +770,15 @@
   yaf-splash -bg yellow -placement top -timeout 9 -text "The translation file is now open in a text editor. Edit, then Save, then Quit text editor..."
   ' > /tmp/momanager/yafmsg2
   chmod 755 /tmp/momanager/yafmsg2
   /tmp/momanager/yafmsg2 & #msg has delay so will appear on top of text editor window.
   if [ "$POEDITOR" ];then
-   ${POEDITOR} /tmp/momanager/${ATEXTDOMAIN}.po
+   LANG=${ORIGLANG} ${POEDITOR} /tmp/momanager/${ATEXTDOMAIN}.po
   else
    killall geany 2> /dev/null #otherwise geany will return immediately and continue executing this script.
    sleep 0.5
-   defaulttexteditor /tmp/momanager/${ATEXTDOMAIN}.po
+   LANG=${ORIGLANG} defaulttexteditor /tmp/momanager/${ATEXTDOMAIN}.po
   fi
   rxvt -e msgfmt --check --output-file=/tmp/momanager/${ATEXTDOMAIN}.mo /tmp/momanager/${ATEXTDOMAIN}.po
   pupdialog --background yellow --colors --backtitle "MoManager: post-edit mo" --yes-label "OK" --no-label "Cancel" --yesno "The file /tmp/momanager/${ATEXTDOMAIN}.po has been edited and converted to /tmp/momanager/${ATEXTDOMAIN}.mo (the former being the editable translation file and the latter being the compiled translation file). If all went well, click the \ZbOK\ZB button to copy it to \Zb${AMOSPEC}\ZB." 0 0
   if [ $? -eq 0 ];then
    cp -f /tmp/momanager/${ATEXTDOMAIN}.mo "${AMOSPEC}"
@@ -835,11 +836,11 @@
   chmod 755 /tmp/momanager/yafmsg3
   /tmp/momanager/yafmsg3 & #msg has delay so will appear on top of text editor window.
   ASTAT="`stat --format=%y "/usr/share/applications/$DESKFILE" | cut -f 1 -d ' ' | tr -d '-' `" #so can check against file version in latest Woof.
   [ -f ${PATHPREFIX}/usr/share/applications/$DESKFILE ] && ASTAT="`stat --format=%y "${PATHPREFIX}/usr/share/applications/$DESKFILE" | cut -f 1 -d ' ' | tr -d '-' `" #get orig modify date.
   xASTAT1="`stat --format=%Y "/usr/share/applications/$DESKFILE"`" #seconds since epoch.
-  defaulttexteditor /usr/share/applications/$DESKFILE
+  LANG=${ORIGLANG} defaulttexteditor /usr/share/applications/$DESKFILE
   xASTAT2="`stat --format=%Y "/usr/share/applications/$DESKFILE"`" #seconds since epoch.
   if [ "`grep 'PLEASE INSERT YOUR TRANSLATION HERE' /usr/share/applications/$DESKFILE`" != "" ];then
    mv -f /tmp/momanager/$DESKFILE /usr/share/applications/
    xASTAT2="$xASTAT1"
   fi
@@ -850,13 +851,13 @@
   yaf-splash -bg '#80FF80' -timeout 3 -text "The menu is being updated..." &
   LANG=$ORIGLANG /usr/sbin/fixmenus
   if [ "`pidof jwm`" != "" ];then
    JWMVER=`jwm -v|head -n1|cut -d ' ' -f2|cut -d - -f2`
    if vercmp $JWMVER lt 574;then
-    jwm -restart
+    LANG=${ORIGLANG} jwm -restart
    else
-    jwm -reload
+    LANG=${ORIGLANG} jwm -reload
    fi
   fi
   cp -f /usr/share/applications/$DESKFILE /root/
   #add translation to tarball that user can email to pkg author...
   cd /root
@@ -903,11 +904,11 @@
   chmod 755 /tmp/momanager/yafmsg4
   /tmp/momanager/yafmsg4 & #msg has delay so will appear on top of text editor window.
   ASTAT="`stat --format=%y "/usr/share/desktop-directories/$TOPFILE" | cut -f 1 -d ' ' | tr -d '-' `" #so can check against file version in latest Woof.
   [ -f ${PATHPREFIX}/usr/share/desktop-directories/$TOPFILE ] && ASTAT="`stat --format=%y "${PATHPREFIX}/usr/share/desktop-directories/$TOPFILE" | cut -f 1 -d ' ' | tr -d '-' `" #get orig modify date.
   xASTAT1="`stat --format=%Y "/usr/share/desktop-directories/$TOPFILE"`" #seconds since epoch.
-  defaulttexteditor /usr/share/desktop-directories/$TOPFILE
+  LANG=${ORIGLANG} defaulttexteditor /usr/share/desktop-directories/$TOPFILE
   xASTAT2="`stat --format=%Y "/usr/share/desktop-directories/$TOPFILE"`" #seconds since epoch.
 
   if [ "`grep 'PLEASE INSERT YOUR TRANSLATION HERE' /usr/share/desktop-directories/$TOPFILE`" != "" ];then
    mv -f /tmp/momanager/$TOPFILE /usr/share/desktop-directories/
    xASTAT2="$xASTAT1"
@@ -919,13 +920,13 @@
   yaf-splash -bg '#80FF80' -timeout 3 -text "The menu is being updated..." &
   LANG=$ORIGLANG /usr/sbin/fixmenus
   if [ "`pidof jwm`" != "" ];then
    JWMVER=`jwm -v|head -n1|cut -d ' ' -f2|cut -d - -f2`
    if vercmp $JWMVER lt 574;then
-    jwm -restart
+    LANG=${ORIGLANG} jwm -restart
    else
-    jwm -reload
+    LANG=${ORIGLANG} jwm -reload
    fi
   fi
   cp -f /usr/share/desktop-directories/$TOPFILE /root/
   #add translation to tarball that user can email to pkg author...
   cd /root
@@ -966,11 +967,11 @@
   chmod 755 /tmp/momanager/yafmsg5
   /tmp/momanager/yafmsg5 & #msg has delay so will appear on top of text editor window.
   ASTAT="`stat --format=%y "/usr/share/sss/$SSSFILE/$SSSFILE" | cut -f 1 -d ' ' | tr -d '-'`" #so can check against file version in latest Woof.
   [ -f ${PATHPREFIX}/usr/share/sss/$SSSFILE/$SSSFILE ] && ASTAT="`stat --format=%y "${PATHPREFIX}/usr/share/sss/$SSSFILE/$SSSFILE" | cut -f 1 -d ' ' | tr -d '-' `" #get orig modify date.
   xASTAT1="`stat --format=%Y "/tmp/momanager/$SSSFILE.$ORIGLANG1"`" #seconds since epoch.
-  defaulttexteditor /tmp/momanager/$SSSFILE.$ORIGLANG1
+  LANG=${ORIGLANG} defaulttexteditor /tmp/momanager/$SSSFILE.$ORIGLANG1
   xASTAT2="`stat --format=%Y "/tmp/momanager/$SSSFILE.$ORIGLANG1"`" #seconds since epoch.
   if [ "$xASTAT1" = "$xASTAT2" ];then
    export LANG=$ORIGLANG
    exec momanager reenter
   fi
@@ -982,13 +983,13 @@
   yaf-splash -bg '#80FF80' -timeout 3 -text "The desktop and menus are being updated..." &
   LANG=$ORIGLANG /usr/sbin/fixmenus
   if [ "`pidof jwm`" != "" ];then
    JWMVER=`jwm -v|head -n1|cut -d ' ' -f2|cut -d - -f2`
    if vercmp $JWMVER lt 574;then
-    jwm -restart
+    LANG=${ORIGLANG} jwm -restart
    else
-    jwm -reload
+    LANG=${ORIGLANG} jwm -reload
    fi
   fi
   echo "MACTION=${EXIT} TODAY_DATE=${ADATE} ORIG_DATE_FILE=${ASTAT} SSS_FILE='/usr/share/sss/${SSSFILE}/${SSSFILE}.${ORIGLANG1}' AUTHOR='${AUTHORSPECS}'" >> /root/MoManager-${ORIGLANG12}-${APKGNAME}/write.log
   mkdir -p /root/MoManager-${ORIGLANG12}-${APKGNAME}/usr/share/sss/${SSSFILE}/
   cp -f /tmp/momanager/$SSSFILE.$ORIGLANG1 /root/MoManager-${ORIGLANG12}-${APKGNAME}/usr/share/sss/${SSSFILE}/
@@ -1088,11 +1089,11 @@
   chmod 755 /tmp/momanager/yafmsg5
   /tmp/momanager/yafmsg5 & #msg has delay so will appear on top of text editor window.
   ASTAT="`stat --format=%y "/usr/share/sss/$SSSFILE/$SSSFILE.$ORIGLANG1" | cut -f 1 -d ' ' | tr -d '-'`" #so can check against file version in latest Woof.
   [ -f ${PATHPREFIX}/usr/share/sss/$SSSFILE/$SSSFILE.$ORIGLANG1 ] && ASTAT="`stat --format=%y "${PATHPREFIX}/usr/share/sss/$SSSFILE/$SSSFILE.$ORIGLANG1" | cut -f 1 -d ' ' | tr -d '-' `" #get orig modify date.
   xASTAT1="`stat --format=%Y "/tmp/momanager/$SSSFILE.$ORIGLANG1"`" #seconds since epoch.
-  defaulttexteditor /tmp/momanager/$SSSFILE.$ORIGLANG1
+  LANG=${ORIGLANG} defaulttexteditor /tmp/momanager/$SSSFILE.$ORIGLANG1
   xASTAT2="`stat --format=%Y "/tmp/momanager/$SSSFILE.$ORIGLANG1"`" #seconds since epoch.
   if [ "$xASTAT1" = "$xASTAT2" ];then
    export LANG=$ORIGLANG
    exec momanager reenter
   fi
@@ -1104,13 +1105,13 @@
   yaf-splash -bg '#80FF80' -timeout 3 -text "The desktop and menus are being updated..." &
   LANG=$ORIGLANG /usr/sbin/fixmenus
   if [ "`pidof jwm`" != "" ];then
    JWMVER=`jwm -v|head -n1|cut -d ' ' -f2|cut -d - -f2`
    if vercmp $JWMVER lt 574;then
-    jwm -restart
+    LANG=${ORIGLANG} jwm -restart
    else
-    jwm -reload
+    LANG=${ORIGLANG} jwm -reload
    fi
   fi
   echo "MACTION=${EXIT} TODAY_DATE=${ADATE} ORIG_DATE_FILE=${ASTAT} SSS_FILE='/usr/share/sss/${SSSFILE}/${SSSFILE}.${ORIGLANG1}' AUTHOR='${AUTHORSPECS}'" >> /root/MoManager-${ORIGLANG12}-${APKGNAME}/write.log
   mkdir -p /root/MoManager-${ORIGLANG12}-${APKGNAME}/usr/share/sss/${SSSFILE}/
   cp -f /tmp/momanager/$SSSFILE.$ORIGLANG1 /root/MoManager-${ORIGLANG12}-${APKGNAME}/usr/share/sss/${SSSFILE}/
@@ -1158,11 +1159,11 @@
   chmod 755 /tmp/momanager/yafmsg7
   /tmp/momanager/yafmsg7 & #msg has delay so will appear on top of text editor window.
   ASTAT="`stat --format=%y "$XMLFILE" | cut -f 1 -d ' ' | tr -d '-' `" #so can check against file version in latest Woof.
   [ -f "${PATHPREFIX}${XMLFILE}" ] && ASTAT="`stat --format=%y "${PATHPREFIX}${XMLFILE}" | cut -f 1 -d ' ' | tr -d '-' `" #get orig modify date.
   xASTAT1="`stat --format=%Y "${XMLFILE}"`" #seconds since epoch.
-  defaulttexteditor "${XMLFILE}"
+  LANG=${ORIGLANG} defaulttexteditor "${XMLFILE}"
   xASTAT2="`stat --format=%Y "${XMLFILE}"`" #seconds since epoch.
   if [ "$xASTAT1" = "$xASTAT2" ];then
    export LANG=$ORIGLANG
    exec momanager reenter
   fi
@@ -1241,11 +1242,11 @@
   if [ "$POEDITOR" ];then
    ${POEDITOR} /tmp/momanager/${ATEXTDOMAIN}.po
   else
    killall geany 2> /dev/null #otherwise geany will return immediately and continue executing this script.
    sleep 0.5
-   defaulttexteditor /tmp/momanager/${ATEXTDOMAIN}.po
+   LANG=${ORIGLANG} defaulttexteditor /tmp/momanager/${ATEXTDOMAIN}.po
   fi
   rxvt -e msgfmt --check --output-file=/tmp/momanager/${ATEXTDOMAIN}.mo /tmp/momanager/${ATEXTDOMAIN}.po
   pupdialog --background yellow --colors --backtitle "MoManager: post-edit mo" --yes-label "OK" --no-label "Cancel" --yesno "The file /tmp/momanager/${ATEXTDOMAIN}.po has been edited and converted to /tmp/momanager/${ATEXTDOMAIN}.mo. If all went well, click the \ZbOK\ZB button to copy it to \Zb${AMOSPEC}\ZB. Note, as a precaution, the old mo file is at /tmp/momanager/${ATEXTDOMAIN}.moOLD." 0 0
   if [ $? -eq 0 ];then
    cp -f /tmp/momanager/${ATEXTDOMAIN}.mo "${AMOSPEC}"

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

@@ -120,11 +120,11 @@
 gparted-0.7.0-staticgtkmm-1-w5|gparted|0.7.0-staticgtkmm-1-w5||System|3348K||gparted-0.7.0-staticgtkmm-1-w5.pet|+parted,+gtk+,+boehm-gc,+libsigc++,+e2fsprogs,+dosfstools|GParted partition manager, does not need gtkmm packages|puppy|wary5||
 gparted_DOC-0.7.0-staticgtkmm-1-w5|gparted_DOC|0.7.0-staticgtkmm-1-w5||BuildingBlock|24K||gparted_DOC-0.7.0-staticgtkmm-1-w5.pet||drive partition manager||||
 gparted_NLS-0.7.0-staticgtkmm-1-w5|gparted_NLS|0.7.0-staticgtkmm-1-w5||BuildingBlock|1920K||gparted_NLS-0.7.0-staticgtkmm-1-w5.pet||drive partition manager||||
 gpptp-0.2|gpptp|0.2||Network|40K||gpptp-0.2.pet|+pptp,+gtk+|PPTP VPN client gui, modified by jafadmin (see puppy forum)|puppy|wary5||
 grub-0.97-29ubuntu53|grub|0.97-29ubuntu53||BuildingBlock|552K||grub-0.97-29ubuntu53.pet||grand unified bootloader, legacy edition||||
-grub4dos-0.4.4.v1.7.2|grub4dos|0.4.4.v1.7.2||System|448K||grub4dos-0.4.4.v1.7.2.pet||Grub4Dos bootloader config||||
+grub4dos-0.4.4.v1.7.2-1|grub4dos|0.4.4.v1.7.2-1||System|448K||grub4dos-0.4.4.v1.7.2-1.pet||Grub4Dos bootloader config||||
 gtk-chtheme-0.3.1|gtk-chtheme|0.3.1||Desktop|48K||gtk-chtheme-0.3.1.pet|+gtk+|gtk theme chooser|puppy|4||
 gtkdialog2-0.59.8|gtkdialog2|0.59.8||BuildingBlock|128K||gtkdialog2-0.59.8.pet|+gtk+|Dialogs for shell scripts. older gtkdialog2 executable, some scripts still use this|puppy|4||
 gtkdialog3-0.7.20-patriot-e-2|gtkdialog3|0.7.20-patriot-e-2||BuildingBlock|164K||gtkdialog3-0.7.20-patriot-e-2.pet|+gtk+|gtk gui for shell scripts|t2|8.0rc||
 gtkdialog3_DEV-0.7.20-patriot-e-2|gtkdialog3_DEV|0.7.20-patriot-e-2||Utility|308K||gtkdialog3_DEV-0.7.20-patriot-e-2.pet|+gtkdialog3|gui for shell scripts|t2|8.0rc||
 gtkdialog4-0.8.0-w5c|gtkdialog4|0.8.0-w5c||BuildingBlock|192K||gtkdialog4-0.8.0-w5c.pet|+gtk+|gui for scripts, gtkdialog4 is thunors advanced version|puppy|wary5||
@@ -147,10 +147,12 @@
 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||||
 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||||
 hal-0.5.11|hal|0.5.11||BuildingBlock|1092K||hal-0.5.11.pet||hardware abstraction layer. tried to make this pet as useless as possible||||
 hardinfo-0.5.1-p4|hardinfo|0.5.1-p4||System|632K||hardinfo-0.5.1-p4.pet|+gtk+|HardInfo hardware information|puppy|4||
 helpsurfer-0.0.7-q1|helpsurfer|0.0.7-q1||BuildingBlock|272K||helpsurfer-0.0.7-q1.pet|+gtk+|simple html viewer -- no css or javascript, no menu either|t2|8.0rc||
 hiawatha-6.17.1-1-p4|hiawatha|6.17.1-1-p4||Network|340K||hiawatha-6.17.1-1-p4.pet||powerful secure web server|puppy|4||
 hicolor-icon-theme-0.5-w5|hicolor-icon-theme|0.5-w5||BuildingBlock|860K||hicolor-icon-theme-0.5-w5.pet|+geany|Default icon theme|puppy|wary5||

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

@@ -422,12 +422,10 @@
 gtkterm_NLS-0.99.7-rc1-w5c|gtkterm_NLS|0.99.7-rc1-w5c||Utility|64K||gtkterm_NLS-0.99.7-rc1-w5c.pet|+gtkterm|serial terminal||||
 gutenprint-5.2.7-w5c|gutenprint|5.2.7-w5c||BuildingBlock|8880K||gutenprint-5.2.7-w5c.pet|+cairo,+gtk+|High quality drivers for Canon Epson Lexmark Sony Olympus and PCL|puppy|wary5||
 gutenprint_DEV-5.2.7-w5c|gutenprint_DEV|5.2.7-w5c||BuildingBlock|1336K||gutenprint_DEV-5.2.7-w5c.pet|+gutenprint|High quality drivers for Canon Epson Lexmark Sony Olympus and PCL|puppy|wary5||
 gutenprint_DOC-5.2.7-w5c|gutenprint_DOC|5.2.7-w5c||BuildingBlock|3208K||gutenprint_DOC-5.2.7-w5c.pet||High quality drivers for Canon Epson Lexmark Sony Olympus and PCL|puppy|wary5||
 gutenprint_NLS-5.2.7-w5c|gutenprint_NLS|5.2.7-w5c||BuildingBlock|10764K||gutenprint_NLS-5.2.7-w5c.pet|+gutenprint|High quality drivers for Canon Epson Lexmark Sony Olympus and PCL|puppy|wary5||
-gxmessage-2.12.4-w5c|gxmessage|2.12.4-w5c||Develop|36K||gxmessage-2.12.4-w5c.pet|+gtk+|simple message-boxes fcalled from scripts, replaces xlib-only xmessage|puppy|wary5||
-gxmessage_DOC-2.12.4-w5c|gxmessage_DOC|2.12.4-w5c||Develop|76K||gxmessage_DOC-2.12.4-w5c.pet||simple gui message boxes||||
 gzip-1.4-w5c|gzip|1.4-w5c||BuildingBlock|212K||gzip-1.4-w5c.pet||The zip compression utility|puppy|wary5||
 gzip_DOC-1.4-w5c|gzip_DOC|1.4-w5c||BuildingBlock|132K||gzip_DOC-1.4-w5c.pet||The zip compression utility|puppy|wary5||
 hdparm-9.37-w5c|hdparm|9.37-w5c||BuildingBlock|92K||hdparm-9.37-w5c.pet||Getset hard disk parameters|puppy|wary5||
 hdparm_DOC-9.37-w5c|hdparm_DOC|9.37-w5c||BuildingBlock|56K||hdparm_DOC-9.37-w5c.pet||Getset hard disk parameters|puppy|wary5||
 hfsutils-3.2.6-w5c|hfsutils|3.2.6-w5c||Filesystem|1136K||hfsutils-3.2.6-w5c.pet||Utilities to access Macintosh disks in Unix|puppy|wary5||

Changes to woof-distro/x86/arch/rolling-release/DISTRO_PKGS_SPECS-arch

@@ -213,10 +213,11 @@
 yes|gutenprint|gutenprint|exe,dev,doc,nls
 yes|gview||exe
 yes|gwhere||exe
 no|gxine|gxine|exe,dev>null,doc,nls
 yes|gxine||exe
+yes|gxmessage||exe,dev,doc,nls| #use my pet, as has xmessage symlink to gxmessage.
 yes|gzip|gzip|exe,dev>null,doc,nls
 no|hal|hal|exe,dev,doc,nls|+udev,+libvolume-id,+lsb-base,+policykit
 yes|hal||exe,dev,doc,nls|+udev,+libvolume-id
 yes|hardinfo||exe,dev,doc,nls|+libsoup
 yes|hdparm|hdparm|exe,dev>null,doc,nls

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

@@ -231,10 +231,11 @@
 yes|guess_fs||exe
 yes|gutenprint|cups-driver-gutenprint,libgutenprint2,libgutenprint-dev,libgutenprintui2-1,libgutenprintui2-dev|exe,dev,doc,nls
 yes|gview||exe
 yes|gwhere|gwhere|exe
 no|gxine|gxine,gxineplugin|exe,dev>null,doc,nls
+yes|gxmessage||exe,dev,doc,nls| #use my pet, as has xmessage symlink to gxmessage.
 yes|gzip|gzip|exe,dev>null,doc,nls
 no|hal|hal,libhal1,libhal-dev,libhal-storage1,libhal-storage-dev|exe,dev,doc,nls|+udev,+libvolume-id,+lsb-base,+policykit
 yes|hal||exe,dev,doc,nls|+udev,+libvolume-id
 yes|hardinfo|hardinfo|exe,dev,doc,nls|+libsoup
 yes|hdparm|hdparm|exe,dev>null,doc,nls

Changes to woof-distro/x86/mageia/1/DISTRO_PKGS_SPECS-mageia-1

@@ -213,10 +213,11 @@
 no|gtrayicon||exe|
 yes|guess_fs||exe|
 yes|gutenprint|gutenprint-common,gutenprint-cups,gutenprint-escputil,gutenprint-gimp2,gutenprint-ijs,libgutenprint2,libgutenprint2-devel,libgutenprintui2_1,libgutenprintui2_1-devel|exe,dev,doc,nls|
 no|gview||exe| #very basic image viewer, but we are using viewnior.
 yes|gwhere||exe|
+yes|gxmessage||exe,dev,doc,nls| #use my pet, as has xmessage symlink to gxmessage.
 yes|gzip|gzip|exe,dev>null,doc,nls|
 yes|hal||exe,dev,doc,nls| #my cutdown pet. needs udev, libvolume-id
 yes|hardinfo||exe,dev,doc,nls|
 yes|hdparm|hdparm|exe,dev>null,doc,nls|
 yes|helpsurfer||exe|

Changes to woof-distro/x86/racy/testing/DISTRO_PKGS_SPECS-puppy-wary5

@@ -268,10 +268,11 @@
 no|gutenprint||exe,dev,doc,nls
 yes|gview||exe
 yes|gwhere||exe
 no|gxine|gxine|exe,dev>null,doc,nls
 no|gxine||exe
+yes|gxmessage||exe,dev,doc,nls| #use my pet, as has xmessage symlink to gxmessage.
 yes|gzip|gzip|exe,dev>null,doc,nls
 no|hal||exe,dev,doc,nls
 yes|hardinfo||exe,dev,doc,nls
 no|hdparm|hdparm|exe,dev>null,doc,nls
 no|heimdal|heimdal|exe,dev,doc,nls

Changes to woof-distro/x86/slackware/13.37/DISTRO_PKGS_SPECS-slackware-13.37

@@ -255,10 +255,11 @@
 yes|gutenprint||exe,dev,doc,nls
 yes|gview||exe
 yes|gwhere||exe
 no|gxine|gxine|exe,dev>null,doc,nls
 no|gxine||exe
+yes|gxmessage||exe,dev,doc,nls| #use my pet, as has xmessage symlink to gxmessage.
 yes|gzip|gzip|exe,dev>null,doc,nls
 no|HaikuPup||exe| #icon theme, Warren
 no|hal|hal|exe,dev,doc,nls|+udev,+libvolume-id,+lsb-base,+policykit
 yes|hal||exe,dev,doc,nls|+udev,+libvolume-id
 yes|hardinfo||exe,dev,doc,nls|+libsoup

Changes to woof-distro/x86/ubuntu/lucid/DISTRO_PKGS_SPECS-ubuntu-lucid

@@ -283,10 +283,11 @@
 no|gutenprint||exe,dev,doc>exe,nls>exe
 yes|gview||exe
 yes|gwhere|gwhere|exe
 no|gxine|gxine,gxineplugin|exe,dev>null,doc,nls
 no|gxine||exe
+yes|gxmessage||exe,dev,doc,nls| #use my pet, as has xmessage symlink to gxmessage.
 yes|gzip|gzip|exe,dev>null,doc,nls
 no|hal|hal,libhal1,libhal-dev,libhal-storage1,libhal-storage-dev|exe,dev,doc,nls|+udev,+libvolume-id,+lsb-base,+policykit
 yes|hal||exe,dev,doc,nls
 yes|hardinfo|hardinfo|exe,dev,doc,nls
 yes|hdparm|hdparm|exe,dev>null,doc,nls

Changes to woof-distro/x86/wary/testing/DISTRO_PKGS_SPECS-puppy-wary5

@@ -268,10 +268,11 @@
 no|gutenprint||exe,dev,doc,nls
 yes|gview||exe
 yes|gwhere||exe
 no|gxine|gxine|exe,dev>null,doc,nls
 no|gxine||exe
+yes|gxmessage||exe,dev,doc,nls| #use my pet, as has xmessage symlink to gxmessage.
 yes|gzip|gzip|exe,dev>null,doc,nls
 no|hal||exe,dev,doc,nls
 yes|hardinfo||exe,dev,doc,nls
 no|hdparm|hdparm|exe,dev>null,doc,nls
 no|heimdal|heimdal|exe,dev,doc,nls