Check-in [7d52a93d7b]
Not logged in

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

Overview

SHA1 Hash:7d52a93d7b38b242bee4174df48e3567cfcdf1a6
Date: 2012-03-01 07:53:16
User: BarryK
Comment:need to reload console font every time exit from X, also earlier in bootup rc.sysinit

Tags And Properties
Changes

Changes to woof-code/kernel-skeleton/lib/modules/all-firmware/pgprs/usr/bin/pgprs-setup

@@ -3,10 +3,11 @@
 #(c) Copyright Aug. 2008 Lloyd Standish www.voluntary-simplicity.org/linux
 #2007 Lesser GPL licence v2 (http://www.fsf.org/licensing/licenses/lgpl.html)
 # version 1.3 Aug. 16, 2008
 #101204 Dejan: if there's no pin gtkdialog has errors, put 1234 instead blank.
 #120131 rodin.s: i18n
+#120228 fix errors in gettext.
 
 export TEXTDOMAIN=pgprs-setup
 export OUTPUT_CHARSET=UTF-8
 . gettext.sh
 
@@ -91,11 +92,11 @@
 	DETECTED="$(gettext 'detected devices:') $DETECTED"
 fi
 export MAIN_DIALOG="
  <vbox>
 <text use-markup=\"true\"> <label>\"<b>$(gettext 'PGPRS MODEM SETUP')</b>\"</label></text>
-<text><label>$(gettext \"If your GPRS ISP does not require a username/password, you should leave the defaults. If you do not know your ISP's APN or the phone number to dial for connection, you can exit and run this setup program again later (click the 'connect' icon on the desktop) The default APN, 'icecelular', is correct only for Costa Rica.\")</label></text>
+<text><label>$(gettext "If your GPRS ISP does not require a username/password, you should leave the defaults. If you do not know your ISP's APN or the phone number to dial for connection, you can exit and run this setup program again later (click the 'connect' icon on the desktop) The default APN, 'icecelular', is correct only for Costa Rica.")</label></text>
   <hbox>
     <text>
       <label>$(gettext 'Serial Modem Device File:')</label>
     </text>
     <entry>
@@ -162,11 +163,11 @@
    <button>
    		<label>$(gettext 'RE-PROBE MODEMS')</label>
    	</button>
   </hbox>
  </vbox>
-"
+" #'geany fix
 I=$IFS; IFS=""
 for STATEMENTS in  $(gtkdialog3 --program=MAIN_DIALOG); do
 	eval $STATEMENTS
 done
 IFS=$I
@@ -205,9 +206,9 @@
 	chmod 600 /etc/ppp/pap-secrets
 	wordreplace /etc/ppp/peers/gprs-connect-chatmm "${RGPHONE}" "ATD${PHONE}"
 	wordreplace /etc/ppp/peers/gprs-connect-chatmm "$RGAPN" "AT+CGDCONT=1,\"IP\",\"$APN\""
 	wordreplace /etc/ppp/peers/gprs-connect-chatmm "$RGPIN" "AT+CPIN=\"$PIN\""
 	chmod 700 /etc/ppp/peers/gprs-connect-chatmm
-	xmessage -center -title "$(gettext 'PGPRS SETUP')" "$(gettext \"Connect to the Internet using 'PGPRS Connect' in the 'Network' menu.\")"
+	xmessage -center -title "$(gettext 'PGPRS SETUP')" "$(gettext "Connect to the Internet using 'PGPRS Connect' in the 'Network' menu.")"
 fi
 break
 done

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

@@ -66,10 +66,11 @@
 #110814 kernel with inbuilt usb drivers, usbfs was not mounting on /proc/bus/usb.
 #110823 mavrothal: Check if it is an OLPC XO and add the devices.
 #120124 tracing problem of b43 firmware not loading, peebee posted udev trace, determined ssb uevent replay missing, found test for <2.6.24 kernel broken for 3.x.
 #120216 slight mods to make sss translation easy (see /usr/share/sss/script_strings).
 #120217 improvement for full hd install, non-english.
+#120301 need to load console font earlier.
 
 #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
@@ -126,10 +127,14 @@
 . /etc/rc.d/MODULESCONFIG #modules loading configuration.
 PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/X11R7/bin
 [ $loglevel ] && LOGLEVEL=$loglevel #boot param.
 [ $pmedia ] && PMEDIA=$pmedia #boot parameter, broad category of boot media. ex: cd.
 [ $pdev1 ] && PDEV1=$pdev1    #boot parameter, partition have booted off. ex: hda3
+
+load_consolefont #120301 if this was done in initrd then it would carry through, and this would not be needed.
+#...this is done in rc.country, but needs to be move above all the o/p to /dev/console.
+
 STATUS=0
 
 ##############MAKE FILESYSTEM USABLE################
 #echo "MAKE FILESYSTEM USABLE"
 echo -n "Making the filesystem usable..." >/dev/console #making filesystem usable. need this redirection!

Changes to woof-code/rootfs-skeleton/sbin/load_consolefont

@@ -1,1 +1,23 @@
+#!/bin/sh
+#(c) Copyright Barry Kauler 2012, license GPL3 (usr/share/doc/legal)
+#a console font gets loaded in the initrd, or failing that in rc.country.
+#i was also loading it in /usr/sbin/quicksetup is locale is changed.
+#however, we have problems with it getting "dropped", which seems to happen when run X.
+#so, i have created this script that will call whenever we exit from X, such as
+#in xwin and in xorgwizard. thanks to L18L for investigating this.
+
+#note, en locale will have empty /etc/fontmap...
+[ ! -s /etc/fontmap ] && exit
+
+FONTMAP="`cat /etc/fontmap`"
+
+case $FONTMAP in
+ LatArCyrHeb-16.psfu)
+  setfont /lib/consolefonts/${FONTMAP}.gz -C /dev/tty1
+ ;;
+ *) #LatGrkCyr-8x16.psfu
+  zcat /lib/consolefonts/${FONTMAP}.gz | loadfont
+ ;;
+esac
 
+###END###

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

@@ -26,10 +26,11 @@
 #110622 fix handling of DISTRO_XORG_AUTO.
 #110721 o/p to /dev/null when modprobe modules that are builtin to kernel.
 #110804 /etc/profile has fix for double-login. need to output '# ' when exit xwin.
 #110807 revert 110804
 #120131 rodin.s: internationalized.
+#120301 load console font on exit from X.
 
 export TEXTDOMAIN=xwin
 export OUTPUT_CHARSET=UTF-8
 eval_gettext () {
   local myMESSAGE=$(gettext "$1")
@@ -541,10 +542,12 @@
   /usr/bin/xinit /root/.xinitrc --  > /tmp/xerrs.log 2>&1
   ;;
 esac
 echo -n "false" > /etc/.XLOADED #see note above.
 #...if PC hung, run xorgwizard at next bootup (see further up).
+
+load_consolefont #120301 seems have to do this on exit from X. (new script)
 
 #unicode_start #i18n rodin.s for unicode start after exit from X. ??????what is this??????
 #120224 ...console font is loaded in quicksetup if locale changed.
 echo ''$(gettext 'Exited from X. Type "xwin [fvwm95|jwm]" to restart X ([ ] mean optional).')''
 echo ''$(gettext '(To shutdown PC type "poweroff", to reboot PC type "reboot")')''

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

@@ -1,8 +1,8 @@
 #!/bin/sh
 #(c) Copyright Barry Kauler 2012, license GPL3 (/usr/share/doc/legal)
-#call from: /usr/sbin/delayedrun,
+#call from: /usr/sbin/delayedrun, quicksetup, ...
 
 export LANG=C
 
 IFCONFIG="`ifconfig | grep '^[pwe]' | grep -v 'wmaster'`"
 [ ! "$IFCONFIG" ] && exit 1 #no network connection.

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

@@ -23,10 +23,11 @@
 #120217 support poeditor.
 #120218 LANG=${ORIGLANG} prefix needed various places. 120219 a few more.
 #120220 need 'head -n1' ex: /usr/local/petget/ui_Classic has export TEXTDOMAIN in two places.
 #120224 add 'doc_strings' sss domain, for translating entire files (typically documentation files). 120225 improvements.
 #120225 checkbox window to select what documentation files to edit. modify edit-complete message.
+#120228 sync doc_strings sss file.
 
 #***MOMANAGER IS ENGLISH ONLY (NOT GETTEXT'ED)***
 #it is for use by developers/translators with knowledge of english.
 
 PARAM1=""
@@ -372,10 +373,11 @@
 do
 
  #120224 doc_strings is a special case, the translated file is elsewhere...
  if [ -f /usr/share/sss/${ASSSDOMAIN}/${ASSSDOMAIN}.${ORIGLANG1} ];then
   if [ "$ASSSDOMAIN" = "doc_strings" ];then
+   cp -f /usr/share/sss/${ASSSDOMAIN}/${ASSSDOMAIN} /usr/share/sss/${ASSSDOMAIN}/${ASSSDOMAIN}.${ORIGLANG1} #120228 must always be same as orig.
    TRANSFLAG='fail'
    TRANSLATEDFILES="`grep '^SSS_TRANSLATION_RULE' /usr/share/sss/${ASSSDOMAIN}/${ASSSDOMAIN}.${ORIGLANG1} | cut -f 2 -d "'" | sed -e "s%SSSLANG1MARKER%${ORIGLANG1}%" | tr '\n' ' '`" #'geanyfix
    for ATRANSLATEDFILE in $TRANSLATEDFILES
    do
     if [ -f $ATRANSLATEDFILE ];then
@@ -1371,11 +1373,11 @@
  create_pet) #create a langpack PET
   mv -f /root/langpack_${GENLANG}-${ADATE}.pet /root/langpack_${GENLANG}-${ADATE}.petOLD 2>/dev/null
   [ -d /root/langpack_${GENLANG}-${ADATE} ] && rm -rf /root/langpack_${GENLANG}-${ADATE}
   mkdir /root/langpack_${GENLANG}-${ADATE}
   cp -a -f /usr/share/doc/langpack-template/* /root/langpack_${GENLANG}-${ADATE}/
-  echo "langpack_${GENLANG}-${ADATE}|langpack_${GENLANG}|${ADATE}||Setup|1104K||langpack_${GENLANG}-${ADATE}.pet||${GENLANG} language-pack for Puppy Linux, for any Puppy built from Woof later than Feb. 16, 2012||||" > /root/langpack_${GENLANG}-${ADATE}/pet.specs
+  echo "langpack_${GENLANG}-${ADATE}|langpack_${GENLANG}|${ADATE}||Setup|1104K||langpack_${GENLANG}-${ADATE}.pet||${GENLANG} language-pack for Puppy Linux, for any Puppy built from Woof later than Feb. 28, 2012||||" > /root/langpack_${GENLANG}-${ADATE}/pet.specs
   sed -i -e "s%TARGETLANG%${ORIGLANG1}%" /root/langpack_${GENLANG}-${ADATE}/pinstall.sh
   LANG=$ORIGLANG POSTMSG="`pupdialog --background "#80FFFF" --backtitle "Post-install message" --colors --stdout --inputbox "A post-install message is required for the PET. Please translate the following into your own language:
 \ZbLanguage pack installed, but requires restart of X to take full effect\ZB" 0 0`"
   if [ "$POSTMSG" ];then
    sed -i -e "s%POSTINSTALLMSG%${POSTMSG}%" /root/langpack_${GENLANG}-${ADATE}/pinstall.sh

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

@@ -27,10 +27,12 @@
 #120216 insert /PUPPYKEYMAP into initrd. moved SET_KEYBOARD before SET_LOCALE processing.
 #120216 call 'lang2initrd'
 #120224 load console font. (code based on that in 'init')
 #120226 redraw desktop drive icons when resolution changes (or may change, in the case of running xorgwizard).
 #120227 set hostname, but only if ethernet auto-connected at 1st boot.
+#120228 L18L: enabling adding locale without utf8 using regexp.
+#120301 no, don't load console font here. seems to get dropped on exit from X. (instead, do it in xwin. now have /sbin/load_consolefont)
 
 [ "`whoami`" != "root" ] && exec sudo -A ${0} ${@}
 
 export TEXTDOMAIN=quicksetup
 export OUTPUT_CHARSET=UTF-8
@@ -858,11 +860,11 @@
   xUTF8="$UTF8"
   if [ "$UTF8" != "" ];then #111022
    NEWLANGLINE="LANG=${LANGCHOICE}"'.UTF-8'
    xUTF8='.utf8'
   fi
-  if [ "`locale -a | grep "${LANGCHOICE}${xUTF8}"`" = "" ];then
+  if [ "`locale -a | grep "${LANGCHOICE}${xUTF8}$"`" = "" ];then #120228 L18L bugfix.
    if [ "$UTF8" = "" ];then
     lcPATTERN='^'"${LANGCHOICE}"' '
     CHARMAP="`grep "$lcPATTERN" /usr/share/i18n/SUPPORTED | head -n 1 | cut -f 2 -d ' '`"
     if [ "$CHARMAP" != "" ];then #make sure have it...
      cPATTERN="$CHARMAP"'\.gz'
@@ -900,22 +902,23 @@
    #langPATTERN="s/${OLDLANGLINE}/${NEWLANGLINE}/"
    langPATTERN="s%^LANG=.*%${NEWLANGLINE}%" #111022
    sed -i -e "$langPATTERN" /etc/profile
 
    #120224 load console font... (code based on that in 'init')
+   #120301 no, don't load console font here. seems to get dropped on exit from X. (instead, do it in xwin. now have /sbin/load_consolefont)
    case $NEWLANG in
     en*)
      #er, no, really want to unload all console fonts.
-     zcat /lib/consolefonts/lat1-12.psfu.gz | loadfont
+     #zcat /lib/consolefonts/lat1-12.psfu.gz | loadfont
      echo -n "" > /etc/fontmap #well, next boot, no font will be loaded.
     ;;
     ar*|iw*) #L18L no Greek
-     setfont /lib/consolefonts/LatArCyrHeb-16.psfu.gz -C /dev/tty1
+     #setfont /lib/consolefonts/LatArCyrHeb-16.psfu.gz -C /dev/tty1
      echo -n 'LatArCyrHeb-16.psfu' > /etc/fontmap
     ;;
     *) #L18L All European languages; new default ?!
-     zcat /lib/consolefonts/LatGrkCyr-8x16.psfu.gz | loadfont
+     #zcat /lib/consolefonts/LatGrkCyr-8x16.psfu.gz | loadfont
      echo -n 'LatGrkCyr-8x16.psfu' > /etc/fontmap
     ;;
    esac
 
    #120213 need language-pack...

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

@@ -62,10 +62,11 @@
 #120130 rodin.s: i18n internationalise script. BK: note, edited all changes manually, as script from rodin.s had some differences.
 #120131 rodin.s: added a couple more translations.
 #120213 /var/local/pup_event_icon_change_flag path changed from /tmp (see /sbin/clean_desk_icons)
 #120213 rodin.s: removed LANG=C prefix when run xinitrc_test.
 #120226 01micko: bugfix, call new script 'nouveau_unload'.
+#120301 it seems have to reload console font after exit from X.
 
 [ "`whoami`" != "root" ] && exec sudo -A ${0} ${@} #110505
 
 export TEXTDOMAIN=xorgwizard
 export OUTPUT_CHARSET=UTF-8
@@ -1552,10 +1553,12 @@
  export MONCHOICES
  xinit /usr/sbin/xinitrc_test -- /usr/bin/Xorg :0 #101224 added LANG=C. 120213 removed LANG=C prefix.
 
  eval "`cat /tmp/xorgwizard_initrc_test_results`" #results from xinitrc_test
 #...XTEST, YTEST, HSTEST, VRTEST.
+
+ load_consolefont #120301 it seems have to reload console font after exit from X.
 
  if [ -e /usr/bin/Xvesa ];then
   TWKMSG="$(gettext "Note: If you have tweaked away, to no avail, choose \"FINISHED\" and you
       will get one final chance to fall back to using Xvesa.
 Note: If display has only minor displacement or proportions error, run

Changes to woof-code/rootfs-skeleton/usr/share/doc/HOWTO_modem.htm

@@ -1,6 +1,6 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html><head>
 
 
 
 
@@ -236,11 +236,11 @@
           </tr>
           <tr>
             <td style="vertical-align: top;">Telstra<br>
             </td>
             <td style="vertical-align: top;">Access number: *99#<br>
-APN:<br>
+APN: telstra.internet<br>
             </td>
           </tr>
         </tbody>
       </table>
       <br>
@@ -248,10 +248,13 @@
 'Username' and 'Password' fields do not matter, so leave them as they
 are -- <span style="font-weight: bold;">do not set them to empty</span> as the wvdial executable objects.
 Usually, everything else can be left as-is, and you just click the
 'Connect' button.<br>
       <br>
+if you live in Australia, this page is particularly useful. It has APN's for all the 3G vendors:<br>
+<a href="http://www.unlockguru.com/2011/06/australia-3g-apn-setting/">http://www.unlockguru.com/2011/06/australia-3g-apn-setting/</a> <br>
+<br>
 When PupDial is started and a new/changed modem is detected, PupDial
 tests that the modem responds and tries to determine a suitable
 "initialization string" -- these are commands that are sent to the
 modem, known as Hayes Commands. These are also used for analog modems,
 but with some extensions. This wikipedia page is a good introduction,

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

@@ -35,10 +35,11 @@
 jwmconfig2-20111110|jwmconfig2|20111110||Desktop|256K||jwmconfig2-20111110.pet|+jwm2,+gtkdialog3|JWM configuration. note, theme font spec different from shinobars pet. note, designed to work with jwm 500+||||
 jwm_theme_bluevariety-1|jwm_theme_bluevariety|1||Desktop|32K||jwm_theme_bluevariety-1.pet|+jwm2|jwm window manager theme, many shades and gradients of blue||||
 jwm_theme_deepbluebold-1|jwm_theme_deepbluebold|1||Desktop|36K||jwm_theme_deepbluebold-1.pet|+jwm2|Theme for JWM window manager, deep blue, white bold text||||
 jwmthememaker-1.5|jwmthememaker|1.5||Desktop|36K||jwmthememaker-1.5.pet||JWM Theme Maker|ubuntu|lucid||
 jwm_theme_stark-1|jwm_theme_stark|1||Desktop|36K||jwm_theme_stark-1.pet|+jwm2|stark black-white with bits of colour theme for jwm window manager||||
+langpack_de-20120227|langpack_de|20120227||Setup|1104K||langpack_de-20120227.pet||de language-pack for Puppy Linux, for any Puppy built from Woof later than Feb. 27, 2012||||
 langpack_ru-20120219|langpack_ru|20120219||Setup|4408K||langpack_ru-20120219.pet||Russian language-pack for Puppy Linux, for any Puppy built from Woof later than Feb. 14, 2012||||
 lhp_sys_info-0.6|lhp_sys_info|0.6||System|156K||lhp_sys_info-0.6.pet||Hardware and Video Reporting Tool, created by tazoc||||
 linux_firewall-2.0rc9-puppy2|linux_firewall|2.0rc9-puppy2||Network|132K||linux_firewall-2.0rc9-puppy2.pet||Firewall||||
 linux_firmware_dvb-1.20|linux_firmware_dvb|1.20||BuildingBlock|48K||linux_firmware_dvb-1.20.pet||dvb usb kernel firmware||||
 mplayer_codecs_basic-20071007|mplayer_codecs_basic|20071007||Multimedia|612K||mplayer_codecs_basic-20071007.pet||minimum essential codecs||||

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

@@ -330,10 +330,12 @@
 glade3_DOC-3.6.7-w5c|glade3_DOC|3.6.7-w5c||BuildingBlock|1236K||glade3_DOC-3.6.7-w5c.pet||A User Interface Builder for Gtk+ and Gnome|puppy|wary5||
 glade3_NLS-3.6.7-w5c|glade3_NLS|3.6.7-w5c||BuildingBlock|4000K||glade3_NLS-3.6.7-w5c.pet|+glade3|A User Interface Builder for Gtk+ and Gnome|puppy|wary5||
 gle-3.1.0-w5c|gle|3.1.0-w5c||BuildingBlock|104K||gle-3.1.0-w5c.pet|+freeglut|A library package of C functions that draws 3D surfaces|puppy|wary5||
 gle_DEV-3.1.0-w5c|gle_DEV|3.1.0-w5c||BuildingBlock|156K||gle_DEV-3.1.0-w5c.pet|+gle|A library package of C functions that draws 3D surfaces|puppy|wary5||
 gle_DOC-3.1.0-w5c|gle_DOC|3.1.0-w5c||BuildingBlock|980K||gle_DOC-3.1.0-w5c.pet||A library package of C functions that draws 3D surfaces|puppy|wary5||
+glew-1.7.0-w5c|glew|1.7.0-w5c||BuildingBlock|496K||glew-1.7.0-w5c.pet|+opengl|OpenGL Extension Wrangler Library|puppy|wary5||
+glew_DEV-1.7.0-w5c|glew_DEV|1.7.0-w5c||BuildingBlock|1428K||glew_DEV-1.7.0-w5c.pet|+glew|OpenGL Extension Wrangler Library|puppy|wary5||
 glib-2.28.8-w5c|glib|2.28.8-w5c||BuildingBlock|1872K||glib-2.28.8-w5c.pet|+gdb|C support library|puppy|wary5||
 glibc-2.10.1-w5c|glibc|2.10.1-w5c||BuildingBlock|5344K||glibc-2.10.1-w5c.pet||The GNU C library|puppy|wary5||
 glibc_dev-2.10.1-w5c|glibc_dev|2.10.1-w5c||BuildingBlock|4K||glibc_dev-2.10.1-w5c.pet||The GNU C library|puppy|wary5||
 glibc_DEV-2.10.1-w5c|glibc_DEV|2.10.1-w5c||BuildingBlock|7920K||glibc_DEV-2.10.1-w5c.pet|+glibc|The GNU C library|puppy|wary5||
 glibc_dev_DEV-2.10.1-w5c|glibc_dev_DEV|2.10.1-w5c||BuildingBlock|17888K||glibc_dev_DEV-2.10.1-w5c.pet|+glibc_dev|The GNU C library|puppy|wary5||
@@ -729,15 +731,14 @@
 libxkbfile-1.0.4-w5c|libxkbfile|1.0.4-w5c||BuildingBlock|132K||libxkbfile-1.0.4-w5c.pet||X11 keyboard file manipulation library|puppy|wary5||
 libxkbfile_DEV-1.0.4-w5c|libxkbfile_DEV|1.0.4-w5c||BuildingBlock|224K||libxkbfile_DEV-1.0.4-w5c.pet|+libxkbfile|X11 keyboard file manipulation library|puppy|wary5||
 libxkbui-1.0.2-w5c|libxkbui|1.0.2-w5c||BuildingBlock|32K||libxkbui-1.0.2-w5c.pet||X11 keyboard UI presentation library|puppy|wary5||
 libxkbui_DEV-1.0.2-w5c|libxkbui_DEV|1.0.2-w5c||BuildingBlock|56K||libxkbui_DEV-1.0.2-w5c.pet|+libxkbui|X11 keyboard UI presentation library|puppy|wary5||
 libxml2-2.7.8-w5c|libxml2|2.7.8-w5c||BuildingBlock|1684K||libxml2-2.7.8-w5c.pet||XML parser library for Gnome|puppy|wary5||
-libxml-2.7.8-w5c|libxml|2.7.8-w5c||BuildingBlock|1684K||libxml-2.7.8-w5c.pet||add widescreen resolutions to video bios, intel video chips only|puppy|wary5||
 libxml2_DEV-2.7.8-w5c|libxml2_DEV|2.7.8-w5c||BuildingBlock|2172K||libxml2_DEV-2.7.8-w5c.pet|+libxml2|XML parser library for Gnome|puppy|wary5||
 libxml2_DOC-2.7.8-w5c|libxml2_DOC|2.7.8-w5c||BuildingBlock|6596K||libxml2_DOC-2.7.8-w5c.pet||XML parser library for Gnome|puppy|wary5||
-libxml_DEV-2.7.8-w5c|libxml_DEV|2.7.8-w5c||BuildingBlock|2172K||libxml_DEV-2.7.8-w5c.pet|+libxml|add widescreen resolutions to video bios, intel video chips only|puppy|wary5||
-libxml_DOC-2.7.8-w5c|libxml_DOC|2.7.8-w5c||BuildingBlock|6596K||libxml_DOC-2.7.8-w5c.pet||add widescreen resolutions to video bios, intel video chips only|puppy|wary5||
+libxml++-2.35.1-w5c|libxml++|2.35.1-w5c||BuildingBlock|216K||libxml++-2.35.1-w5c.pet|+libxml2,+glibmm|C++ interface to XML files|puppy|wary5||
+libxml++_DEV-2.35.1-w5c|libxml++_DEV|2.35.1-w5c||BuildingBlock|224K||libxml++_DEV-2.35.1-w5c.pet|+libxml++|C++ interface to XML files|puppy|wary5||
 libxmu-1.0.3-w5c|libxmu|1.0.3-w5c||BuildingBlock|108K||libxmu-1.0.3-w5c.pet||X11 miscellaneous utility library|puppy|wary5||
 libxmu_DEV-1.0.3-w5c|libxmu_DEV|1.0.3-w5c||BuildingBlock|288K||libxmu_DEV-1.0.3-w5c.pet|+libxmu|X11 miscellaneous utility library|puppy|wary5||
 libxp-1.0.0-w5c|libxp|1.0.0-w5c||BuildingBlock|44K||libxp-1.0.0-w5c.pet||X Print Library|puppy|wary5||
 libxp_DEV-1.0.0-w5c|libxp_DEV|1.0.0-w5c||BuildingBlock|64K||libxp_DEV-1.0.0-w5c.pet|+libxp|X Print Library|puppy|wary5||
 libxp_DOC-1.0.0-w5c|libxp_DOC|1.0.0-w5c||BuildingBlock|216K||libxp_DOC-1.0.0-w5c.pet||X Print Library|puppy|wary5||
@@ -807,10 +808,13 @@
 linux_kernel-3.0.7-pae-i686-unionfs-w5|linux_kernel|3.0.7-pae-i686-unionfs-w5||BuildingBlock|66452K||linux_kernel-3.0.7-pae-i686-unionfs-w5.pet||Linux kernel 3.0.7 compiled in Wary Puppy version 5.1.2|puppy|wary5||
 linux_kernel-3.0.17-pae-i686-unionfs-w5|linux_kernel|3.0.17-pae-i686-unionfs-w5||BuildingBlock|66468K||linux_kernel-3.0.17-pae-i686-unionfs-w5.pet||Linux kernel 3.0.17 compiled in Wary Puppy version 5.1.2|puppy|wary5||
 linuxwacom-0.8.8-10-w5|linuxwacom|0.8.8-10-w5||Multimedia|280K||linuxwacom-0.8.8-10-w5.pet|+xorg_base|X driver for wacom tablet input device|puppy|wary5||
 linuxwacom_DEV-0.8.8-10-w5|linuxwacom_DEV|0.8.8-10-w5||Multimedia|56K||linuxwacom_DEV-0.8.8-10-w5.pet|+linuxwacom|X driver for wacom tablet|puppy|wary5||
 linuxwacom_DOC-0.8.8-10-w5|linuxwacom_DOC|0.8.8-10-w5||Multimedia|40K||linuxwacom_DOC-0.8.8-10-w5.pet||X driver for wacom tablet||||
+llvm_clang-2.8-w5c|llvm_clang|2.8-w5c||Develop|90892K||llvm_clang-2.8-w5c.pet||Low Level Virtual Machine, including Clang compiler|puppy|wary5||
+llvm_clang_DEV-2.8-w5c|llvm_clang_DEV|2.8-w5c||Develop|45264K||llvm_clang_DEV-2.8-w5c.pet|+llvm_clang|Low Level Virtual Machine, including Clang compiler|puppy|wary5||
+llvm_clang_DOC-2.8-w5c|llvm_clang_DOC|2.8-w5c||Develop|4412K||llvm_clang_DOC-2.8-w5c.pet||Low Level Virtual Machine, including Clang compiler||||
 lpairs-1.0.4-i686|lpairs|1.0.4-i686||Fun|2480K||lpairs-1.0.4-i686.pet|+SDL|game|puppy|wary5||
 ltris-1.0.15-i686|ltris|1.0.15-i686||Fun|1064K||ltris-1.0.15-i686.pet|+SDL,+SDL_mixer|Falling Blocks Game|puppy|wary5||
 lxterminal-0.1.9-i686|lxterminal|0.1.9-i686||Utility|804K||lxterminal-0.1.9-i686.pet|+vte|terminal emulator, use the command line|puppy|wary5||
 lynx2-8-7-i486|lynx2|8-7-i486||Internet|1356K||lynx2-8-7-i486.pet||Text Web Browser|puppy|wary5||
 lynx2_DOC-8-7-i486|lynx2_DOC|8-7-i486||BuildingBlock|40K||lynx2_DOC-8-7-i486.pet||text web browser||||
@@ -1076,10 +1080,11 @@
 rxvt-unicode-9.05-1|rxvt-unicode|9.05-1||Utility|308K||rxvt-unicode-9.05-1.pet||Urxvt terminal emulator|puppy|wary5||
 samba-3.5.9-w5c|samba|3.5.9-w5c||BuildingBlock|96120K||samba-3.5.9-w5c.pet||The free SMB  CIFS fileserver and client|puppy|wary5||
 samba_DEV-3.5.9-w5c|samba_DEV|3.5.9-w5c||BuildingBlock|304K||samba_DEV-3.5.9-w5c.pet|+samba|The free SMB  CIFS fileserver and client|puppy|wary5||
 samba_DOC-3.5.9-w5c|samba_DOC|3.5.9-w5c||BuildingBlock|9356K||samba_DOC-3.5.9-w5c.pet||The free SMB  CIFS fileserver and client|puppy|wary5||
 samba_NLS-3.5.9-w5c|samba_NLS|3.5.9-w5c||BuildingBlock|300K||samba_NLS-3.5.9-w5c.pet|+samba|The free SMB  CIFS fileserver and client|puppy|wary5||
+samba_full-3.5.12-wary-racy|samba_full|3.5.12-wary-racy||Network|113448K||samba_full-3.5.12-wary-racy.pet||Samba Simple Management|puppy|wary5||
 sane-backends-1.0.22-w52|sane-backends|1.0.22-w52||BuildingBlock|9461K||sane-backends-1.0.22-w52.pet||scanner library, used by xsane|puppy|wary5||
 sane-backends_DEV-1.0.22-w52|sane-backends_DEV|1.0.22-w52||BuildingBlock|9461K||sane-backends_DEV-1.0.22-w52.pet|+sane-backends|scanner library|puppy|wary5||
 sane-backends_DOC-1.0.22-w52|sane-backends_DOC|1.0.22-w52||BuildingBlock|9461K||sane-backends_DOC-1.0.22-w52.pet||scanner library|puppy|wary5||
 sane-frontends-1.0.14-patched_debian9_bk-w5|sane-frontends|1.0.14-patched_debian9_bk-w5||Multimedia|200K||sane-frontends-1.0.14-patched_debian9_bk-w5.pet|+sane-backends,+gtk+|scanner utilities|puppy|wary5||
 sane-frontends_DOC-1.0.14-patched_debian9_bk-w5|sane-frontends_DOC|1.0.14-patched_debian9_bk-w5||Multimedia|36K||sane-frontends_DOC-1.0.14-patched_debian9_bk-w5.pet||scanner utilities||||
@@ -1520,10 +1525,12 @@
 xterm-250-w5c|xterm|250-w5c||Utility|364K||xterm-250-w5c.pet||A terminal emulator for the X Window System|puppy|wary5||
 xterm_DOC-250-w5c|xterm_DOC|250-w5c||Utility|220K||xterm_DOC-250-w5c.pet||A terminal emulator for the X Window System|puppy|wary5||
 xtrans_DEV-1.0.4-w5c|xtrans_DEV|1.0.4-w5c||Network|352K||xtrans_DEV-1.0.4-w5c.pet|+xtrans|Abstract network code for X|puppy|wary5||
 xtrap-1.0.2-w5c|xtrap|1.0.2-w5c||BuildingBlock|72K||xtrap-1.0.2-w5c.pet||X Trap Library|puppy|wary5||
 xtrap_DOC-1.0.2-w5c|xtrap_DOC|1.0.2-w5c||BuildingBlock|56K||xtrap_DOC-1.0.2-w5c.pet||X Trap Library|puppy|wary5||
+xulrunner-10.0.2-w5c|xulrunner|10.0.2-w5c||BuildingBlock|25012K||xulrunner-10.0.2-w5c.pet|+sqlite,+hunspell,+libvpx,+pixman,+cairo,+gtk+|embed mozilla technologies into other applications|puppy|wary5||
+xulrunner_DEV-10.0.2-w5c|xulrunner_DEV|10.0.2-w5c||BuildingBlock|58592K||xulrunner_DEV-10.0.2-w5c.pet|+xulrunner|embed mozilla technologies into other applications|puppy|wary5||
 xvidcore-1.2.2-1-w5c|xvidcore|1.2.2-1-w5c||BuildingBlock|580K||xvidcore-1.2.2-1-w5c.pet||A high performance and high quality MPEG4 video deencoding library|puppy|wary5||
 xvidcore_DEV-1.2.2-1-w5c|xvidcore_DEV|1.2.2-1-w5c||BuildingBlock|768K||xvidcore_DEV-1.2.2-1-w5c.pet|+xvidcore|A high performance and high quality MPEG4 video deencoding library|puppy|wary5||
 xvidtune-1.0.1-w5c|xvidtune|1.0.1-w5c||BuildingBlock|64K||xvidtune-1.0.1-w5c.pet||Video mode tuner for Xorg|puppy|wary5||
 xvidtune_DOC-1.0.1-w5c|xvidtune_DOC|1.0.1-w5c||BuildingBlock|28K||xvidtune_DOC-1.0.1-w5c.pet||Video mode tuner for Xorg|puppy|wary5||
 xwininfo-1.0.3-w5c|xwininfo|1.0.3-w5c||Desktop|40K||xwininfo-1.0.3-w5c.pet||Window information utility for X|puppy|wary5||