Check-in [0364d17677]
Not logged in

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

Overview

SHA1 Hash:0364d176770a2688c201aa2f76cb8fc4fcf0f6cb
Date: 2012-05-23 17:32:08
User: BarryK
Comment:lots of fixes, refer bkhome.org/blog/?viewDetailed=02839

Tags And Properties
Changes

Changes to woof-code/3builddistro

@@ -110,10 +110,11 @@
 #120506 support creation of SD-card image (for arm build).
 #120506b check that sd card big enough.
 #120510 offer to resize 2nd partition of SD card to fill card.
 #120521 for SD-image build, copy-only console fonts and keyboard layouts to initrd, copy-only kernel modules to initrd.
 #120522 precise puppy, seamonkey was crashing. needed /usr/share/glib-2.0/schemas/apps.gecko-mediaplayer.preferences, also must be compiled.
+#120523 precise puppy, may also need to run gio-querymodules. (refer also installpkg.sh, rc.update)
 
 #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
 
@@ -2352,10 +2353,14 @@
 # but also needs this compile operation...
 # ***NOTICE*** cross-build, this will have to be executed at first boot...
 if [ "$WOOF_HOSTARCH" = "$WOOF_TARGETARCH" ];then
  if [ -d rootfs-complete/usr/share/glib-2.0/schemas ];then
   [ -e rootfs-complete/usr/bin/glib-compile-schemas ] && chroot rootfs-complete /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
+ fi
+ #120523 seems need this too...
+ if [ -d rootfs-complete/usr/lib/gio/modules ];then
+  [ -e rootfs-complete/usr/bin/gio-querymodules ] && chroot rootfs-complete /usr/bin/gio-querymodules /usr/lib/gio/modules
  fi
 fi
 
 ###########
 #build the rootfs-complete sfs...

Changes to woof-code/kernel-skeleton/etc/modules/firmware.dep

@@ -25,11 +25,11 @@
 b43:b43.ko
 b43legacy:b43legacy.ko
 brcm:brcmfmac.ko,brcmsmac.ko
 carl9170:carl9170.ko
 hostap-0.5.7:hostap.ko,hostap_pci.ko,hostap_plx.ko,hostap_cs.ko
-iwlwifi:iwl3945.ko,iwl4965.ko,iwlagn.ko
+iwlwifi:iwl3945.ko,iwl4965.ko,iwlagn.ko,iwlwifi.ko
 ipw2100_firmware-1.3:ipw2100.ko
 ipw2200_firmware-3.0:ipw2200.ko
 libertas_firmware:libertas_cs.ko,libertas_sdio.ko,usb8xxx.ko
 libertas_tf:libertas_tf_usb.ko
 linux-wlan-ng:prism2_usb.ko
@@ -43,10 +43,11 @@
 rtl8188_8192su:r8192s_usb.ko
 RTL8192E:r8192e_pci.ko
 rtl8192se:rtl8192se.ko
 RTL8192U:r8192u_usb.ko
 rtlwifi:rtl8192ce.ko,rtl8192cu.ko,rtl8192se.ko,r8712u.ko
+wl:wl.ko
 zd1201_firmware:zd1201.ko
 zd1211_firmware:zd1211rw.ko
 #media drivers...
 qc-usb-messenger:qcmessenger.ko
 dvb-usb-firmware:dvb-usb-a800.ko,dvb-usb-af9005.ko,dvb-usb-au6610.ko,dvb-usb-cxusb.ko,dvb-usb-dib0700.ko,dvb-usb-dibusb-mb.ko,dvb-usb-dibusb-mc.ko,dvb-usb-digitv.ko,dvb-usb-dtt200u.ko,dvb-usb-gl861.ko,dvb-usb-gp8psk.ko,dvb-usb-m920x.ko,dvb-usb-nova-t-usb2.ko,dvb-usb-opera.ko,dvb-usb-ttusb2.ko,dvb-usb-umt-010.ko,dvb-usb-vp702x.ko,dvb-usb-vp7045.ko

Changes to woof-code/kernel-skeleton/lib/modules/all-firmware/iwlwifi/lib/firmware/iwlwifi-1000-5.ucode

cannot compute difference between binary files

Changes to woof-code/kernel-skeleton/lib/modules/all-firmware/iwlwifi/lib/firmware/iwlwifi-105-6.ucode

cannot compute difference between binary files

Changes to woof-code/kernel-skeleton/lib/modules/all-firmware/iwlwifi/lib/firmware/iwlwifi-135-6.ucode

cannot compute difference between binary files

Changes to woof-code/kernel-skeleton/lib/modules/all-firmware/iwlwifi/lib/firmware/iwlwifi-2000-6.ucode

cannot compute difference between binary files

Changes to woof-code/kernel-skeleton/lib/modules/all-firmware/iwlwifi/lib/firmware/iwlwifi-2030-6.ucode

cannot compute difference between binary files

Changes to woof-code/kernel-skeleton/lib/modules/all-firmware/iwlwifi/lib/firmware/iwlwifi-5000-5.ucode

cannot compute difference between binary files

Changes to woof-code/kernel-skeleton/lib/modules/all-firmware/iwlwifi/lib/firmware/iwlwifi-6000g2b-6.ucode

cannot compute difference between binary files

Changes to woof-code/packages-templates/glibc/usr/share/zoneinfo/America/PLUSEXTRAFILES


Changes to woof-code/packages-templates/glibc/usr/share/zoneinfo/Indian/PLUSEXTRAFILES


Changes to woof-code/packages-templates/gparted/usr/bin/PLUSEXTRAFILES


Deleted woof-code/packages-templates/gparted/usr/bin/gparted

Deleted woof-code/packages-templates/gparted/usr/bin/gpartedbin

Changes to woof-code/packages-templates/gparted/usr/sbin/PLUSEXTRAFILES


Changes to woof-code/packages-templates/pciutils/lib/PLUSEXTRADIRS


Changes to woof-code/packages-templates/pciutils/lib/PLUSEXTRAFILES


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

@@ -34,7 +34,7 @@
 #here we can specify a preference. Each entry here is of the form
 #'module1:module2' where module2 is the preferred choice.
 #101218 format can have multiple ':', ex: 8139cp:8139too:8139xx (last is most preferred).
 #note, list needs a space char at beginning and at end.
 #w471 removed: ath5k:ath_pci martian_dev:ltserial r8169:r8101
-#101209: added 8139cp:8139too  110204 modified
-PREFLIST=' 8139cp:8139too rtl8180:r8180 rtl8187:r8187 rt2500usb:rt73usb orinoco_nortel:hostap_plx orinoco_plx:hostap_plx orinoco_tmd:hostap_plx orinoco_pci:hostap_pci bcm43xx:ssb prism54:p54pci tulip:dmfe option:hso hcfpcihw:hsfpcibasic2 cdc_acm:dgcusbdcp slamr:snd_intel8x0m:snd_via82xx_modem '
+#101209: added 8139cp:8139too  110204 modified  120523 added ssb:wl
+PREFLIST=' 8139cp:8139too rtl8180:r8180 rtl8187:r8187 rt2500usb:rt73usb orinoco_nortel:hostap_plx orinoco_plx:hostap_plx orinoco_tmd:hostap_plx orinoco_pci:hostap_pci bcm43xx:ssb prism54:p54pci tulip:dmfe option:hso hcfpcihw:hsfpcibasic2 cdc_acm:dgcusbdcp slamr:snd_intel8x0m:snd_via82xx_modem ssb:wl '

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

@@ -29,10 +29,11 @@
 #120209 append LANG when call fixmenus. also run fixdesk, fixscripts
 #120225 fix non-english PuppyPin when layers change.
 #120323 shinobar: need some more operations when unionfs layers change.
 #120505 PUPMODE==2, need to consider situation of a full-hd install that is not pre-setup.
 #120522 ubuntu precise puppy must have the schemas compiled (otherwise seamonkey crashed) (normally done in 3builddistro).
+#120523 precise puppy, may also need to run gio-querymodules. (refer also installpkg.sh, 3builddistro)
 
 #This script is called by /etc/rc.d/rc.sysinit. the purpose is to perform
 #any required updates to files when a new version of Puppy is booted.
 
 #this script can also be called by /usr/sbin/puppyinstaller, when doing a full install
@@ -90,10 +91,12 @@
     PANGOMODULES="`find /etc/pango -type f -name pango.modules`"
     [ "$PANGOMODULES" = "" ] && PANGOMODULES='/etc/pango/pango.modules'
     [ ! -s ${PANGOMODULES} ] && pango-querymodules > ${PANGOMODULES}
     #120522 ubuntu precise puppy must have the schemas compiled (otherwise seamonkey crashed)...
     [ -d /usr/share/glib-2.0/schemas ] && [ -e /usr/bin/glib-compile-schemas ] && /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
+    #120523 this too...
+    [ -d /usr/lib/gio/modules ] && [ -e /usr/bin/gio-querymodules ] && /usr/bin/gio-querymodules /usr/lib/gio/modules
    fi
   fi
   NEWPVERSION="`grep '^DISTRO_VERSION' /etc/DISTRO_SPECS | cut -f 2 -d '=' | cut -f 2 -d '"' | cut -f 2 -d "'" | cut -f 1 -d ' '`" #110422
   #w001 generate /etc/networkmodules...
   echo -n " network-drivers-list" >/dev/console
@@ -136,10 +139,12 @@
     PANGOMODULES="`find /etc/pango -type f -name pango.modules`"
     [ "$PANGOMODULES" = "" ] && PANGOMODULES='/etc/pango/pango.modules'
     [ ! -s ${PANGOMODULES} ] && pango-querymodules > ${PANGOMODULES}
     #120522 ubuntu precise puppy must have the schemas compiled (otherwise seamonkey crashed)...
     [ -d /usr/share/glib-2.0/schemas ] && [ -e /usr/bin/glib-compile-schemas ] && /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
+    #120523 this too...
+    [ -d /usr/lib/gio/modules ] && [ -e /usr/bin/gio-querymodules ] && /usr/bin/gio-querymodules /usr/lib/gio/modules
    fi
   fi
   NEWPVERSION="`grep '^DISTRO_VERSION' /etc/DISTRO_SPECS | cut -f 2 -d '=' | cut -f 2 -d '"' | cut -f 2 -d "'" | cut -f 1 -d ' '`" #110422
   #w001 generate /etc/networkmodules...
   echo -n " network-drivers-list" >/dev/console

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

@@ -25,10 +25,11 @@
 #111229 /usr/local/petget/removepreview.sh when uninstalling a pkg, may have copied a file from sfs-layer to top, check.
 #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)
 
 #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"
@@ -492,8 +493,16 @@
  grep -E '^/var|^/root|^/etc' /root/.packages/${DLPKG_NAME}.files |
  while read FILELINE
  do
   busybox chown ${HOMEUSER}:users "${FILELINE}"
  done
+fi
+
+#120523 precise puppy needs this... (refer also rc.update and 3builddistro)
+if [ "`grep '/usr/share/glib-2.0/schemas' /root/.packages/${DLPKG_NAME}.files`" != "" ];then
+ [ -e /usr/bin/glib-compile-schemas ] && /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
+fi
+if [ "`grep '/usr/lib/gio/modules' /root/.packages/${DLPKG_NAME}.files`" != "" ];then
+ [ -e /usr/bin/gio-querymodules ] && /usr/bin/gio-querymodules /usr/lib/gio/modules
 fi
 
 ###END###

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

@@ -13,11 +13,12 @@
 desk_icon_theme_original-1|desk_icon_theme_original|1||Desktop|252K||desk_icon_theme_original-1.pet||desktop and menu icons||||
 desk_icon_theme_silver_marble-1|desk_icon_theme_silver_marble|1||Desktop|304K||desk_icon_theme_silver_marble-1.pet||desktop icons||||
 desk_icon_theme_smooth_color-1|desk_icon_theme_smooth_color|1||Desktop|276K||desk_icon_theme_smooth_color-1.pet||desktop and menu icons||||
 desk_icon_theme_stardust-2|desk_icon_theme_stardust|2||Desktop|292K||desk_icon_theme_stardust-2.pet||desktop and menu icons||||
 desk_icon_theme_stark042-1|desk_icon_theme_stark042|1||Desktop|492K||desk_icon_theme_stark042-1.pet|+gtk+|black-white-orange line-art style icons, based on area042 icons||||
-ffconvert-1.2|ffconvert|1.2||Multimedia|240K||ffconvert-1.2.pet|+ffmpeg|FFConvert multimedia converter||||
+ffconvert-1.2.2|ffconvert|1.2.2||Multimedia|312K||ffconvert-1.2.2.pet|+ffmpeg|FFConvert multimedia converter||||
+ffconvert_NLS-1.2.1|ffconvert_NLS|1.2.1||Multimedia|304K||ffconvert_NLS-1.2.1.pet|ffconvert|FFConvert multimedia converter||||
 gtk_theme_citrus_cut-1.2|gtk_theme_citrus_cut|1.2||Desktop|172K||gtk_theme_citrus_cut-1.2.pet|+gtk+|gtk2 orangy theme||||
 gtk_theme_delicate_blue-1|gtk_theme_delicate_blue|1||Desktop|48K||gtk_theme_delicate_blue-1.pet|+gtk+|gtk theme, light blue/grey, graduated blue buttons||||
 gtk_theme_fishing_the_sky-0.4|gtk_theme_fishing_the_sky|0.4||Desktop|116K||gtk_theme_fishing_the_sky-0.4.pet|+gtk+|gtk theme, small grey||||
 gtk_theme_fishpie-0.11|gtk_theme_fishpie|0.11||Desktop|304K||gtk_theme_fishpie-0.11.pet|+gtk+|gtk theme||||
 gtk_theme_flatbluecontrast-1|gtk_theme_flatbluecontrast|1||Desktop|48K||gtk_theme_flatbluecontrast-1.pet|+gtk+|Theme for GTK, flat blue, contrasting shades||||
@@ -56,19 +57,18 @@
 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||||
 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||||
-peasyscan-1.7|peasyscan|1.7||Graphic|164K||peasyscan-1.7.pet|+sane-backends,+gtkdialog3|Peasyscan simple image scanner, created by rcrsn51||||
 pfilesearch-1.28|pfilesearch|1.28||BuildingBlock|84K||pfilesearch-1.28.pet|+gtkdialog|needed by pburn, pfind||||
 pfind-4.24|pfind|4.24||Filesystem|188K||pfind-4.24.pet|+gtkdialog3,+pfilesearch|Pfind file finder||||
 phash-2|phash|2||Desktop|24K||phash-2.pet|+rox_filer|adds to rox right-click menu, calc md5sum/sha1sum of a file||||
 pmetatagger-2.1|pmetatagger|2.1||Multimedia|80K||pmetatagger-2.1.pet|+gtkdialog3,+id3lib,+vorbis-tools|audio file tag editor||||
 pmirror-0.5|pmirror|0.5||Utility|44K||pmirror-0.5.pet|+gtkdialog3,+mirdir|Pmirror backup a directory||||
 pmirrorget-0.1.1|pmirrorget|0.1.1||Internet|28K||pmirrorget-0.1.1.pet|+gtkdialog3|Website File Grabber||||
 pmusic1-1.8.3-1|pmusic1|1.8.3-1||Multimedia|424K||pmusic1-1.8.3-1.pet|+gtkdialog3,+ffmpeg|Pmusic audio player, old version, works with gtkdialog3 in some less-recent puppies||||
-pmusic-2.5.3|pmusic|2.5.3||Multimedia|668K||pmusic-2.5.3.pet|+gtkdialog4,+ffmpeg,+cdrkit,+wget,+pschedule,+pburn,+streamripper,+pfilesearch|-Player -Manaager -Grabber|||official|
+pmusic-2.6.1|pmusic|2.6.1||Multimedia|812K||pmusic-2.6.1.pet|+gtkdialog4,+ffmpeg,+cdrkit,+wget,+pschedule,+pburn,+streamripper,+pfilesearch|-player -manager -grabber|||official|
 pmusic_index_radio-2011.06.26-1|pmusic_index_radio|2011.06.26-1||Multimedia|544K||pmusic_index_radio-2011.06.26-1.pet|+pmusic|Pmusic radio index||||
 pnethood-0.6.8-2|pnethood|0.6.8-2||Network|100K||pnethood-0.6.8-2.pet|+nbtscan,+mountcifs,+gtkdialog4,+samba_client|connect to samba shares||||
 pplog-1.1.3|pplog|1.1.3||Personal|188K||pplog-1.1.3.pet|+perl_tiny,+httpd|PPLOG personal blog, forked from the official 1.1.2 pplog project||||
 pprocess-2.2.4-1|pprocess|2.2.4-1||System|60K||pprocess-2.2.4-1.pet|+gtkdialog4|Pprocess process manager||||
 precord-7.0.1|precord|7.0.1||Multimedia|88K||precord-7.0.1.pet|+ffmpeg,+gtkdialog3,+vorbis-tools,+lame,+alsa-utils|Precord mp3 recorder/player||||

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

@@ -42,10 +42,11 @@
 yes|alsa-base|alsa-base|exe,dev,doc,nls
 yes|alsa-utils|alsa-utils|exe,dev,doc,nls
 no|asapm||exe
 yes|asunder|asunder|exe,dev,doc,nls
 yes|atk|libatk1.0-0,libatk1.0-dev|exe,dev,doc,nls
+yes|atkmm|libatkmm-1.6-1,libatkmm-1.6-dev|exe,dev,doc,nls
 yes|attr|libattr1,libattr1-dev|exe,dev,doc,nls
 yes|audiofile|libaudiofile1,libaudiofile-dev|exe,dev,doc,nls
 no|aufs|aufs-tools|exe,dev,doc,nls
 no|aufs2-util||exe
 yes|autoconf|autoconf|exe>dev,dev,doc,nls
@@ -77,16 +78,17 @@
 no|chmlib||exe,dev,doc,nls
 yes|chmlib|libchm1,libchm-bin|exe,dev,doc,nls| #pzchmview is gui frontend.
 no|chmsee||exe,dev>null,doc,nls
 no|close||exe| #i think could not compile this.
 yes|coreutils|coreutils|exe,dev>null,doc,nls
-yes|cmake|cmake|exe>dev,dev,doc,nls
+yes|cmake|cmake,cmake-data|exe>dev,dev,doc,nls
 yes|cpio|cpio|exe,dev>null,doc,nls
 no|cpu-scaling-ondemand||exe| #um, using wcpufreq - which is better?
 yes|ctorrent|ctorrent|exe,dev>null,doc,nls
 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|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
@@ -117,11 +119,11 @@
 yes|disktype|disktype|exe,dev>null,doc,nls
 no|dmidecode|dmidecode|exe,dev>null,doc,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|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
 yes|ed|ed|exe,dev>null,doc,nls
 yes|edid|read-edid|exe,dev>null,doc,nls
 yes|eject|eject|exe,dev>null,doc,nls
 yes|elfutils|libelf1,libelf-dev|exe,dev,doc,nls| #note, libelf is a different pkg.
@@ -172,11 +174,11 @@
 yes|gcc_lib|libgcc1,libgomp1|exe,dev,doc,nls
 no|gccmakedep||exe>dev,dev,doc,nls
 no|gcolor2|gcolor2|exe,dev>null,doc,nls
 yes|gcolorsel||exe,dev>null,doc,nls
 no|gconf|gconf2-common,gconf2,libgconf2-4,libgconf2-dev|exe,dev,doc,nls
-yes|gconf|gconf2-common,gconf2,libgconf2-4,libgconf2-dev,libgconf-2-4,gconf-service|exe,dev,doc,nls
+yes|gconf|gconf2-common,gconf2,libgconf2-4,libgconf2-dev,libgconf-2-4,gconf-service,gconf-service-backend|exe,dev,doc,nls
 yes|gdb|gdb|exe>dev,dev,doc,nls
 yes|gdbm|libgdbm3,libgdbm-dev|exe,dev,doc,nls
 yes|gdk-pixbuf|libgdk-pixbuf2.0-0,libgdk-pixbuf2.0-common,libgdk-pixbuf2.0-dev|exe,dev,doc,nls
 yes|gdmap|gdmap|exe,dev>null,doc,nls
 yes|geany|geany|exe,dev>null,doc,nls
@@ -247,11 +249,11 @@
 no|gtksourceview||exe,dev,doc,nls
 yes|gtksourceview|libgtksourceview2.0-0,libgtksourceview2.0-common,libgtksourceview2.0-dev|exe,dev,doc,nls
 yes|gtkspell|libgtkspell0,libgtkspell-dev|exe,dev,doc,nls
 no|gtrayicon||exe
 yes|guess_fs||exe
-yes|gutenprint|ijsgutenprint,cups-driver-gutenprint,libgutenprint2,libgutenprint-dev,libgutenprintui2-1,libgutenprintui2-dev|exe,dev,doc,nls
+yes|gutenprint|ijsgutenprint,cups-driver-gutenprint,libgutenprint2,libgutenprint-dev,libgutenprintui2-1,libgutenprintui2-dev,printer-driver-gutenprint|exe,dev,doc,nls
 no|gutenprint||exe,dev,doc>exe,nls>exe
 no|gview||exe
 no|gwhere|gwhere|exe
 yes|gwhere||exe
 no|gxine|gxine,gxineplugin|exe,dev>null,doc,nls
@@ -299,10 +301,11 @@
 yes|leafpad||exe,dev>null,doc,nls
 yes|less|less|exe,dev>null,doc,nls
 yes|lhp_sys_info||exe
 yes|libaacs|libaacs0,libaacs-dev|exe,dev,doc,nls| #mplayer needs this.
 yes|libao|libao4,libao-common,libao-dev|exe,dev,doc,nls
+yes|libarchive|libarchive12|exe,dev,doc,nls| #needed by cmake.
 yes|libart|libart-2.0-2,libart-2.0-dev|exe,dev,doc,nls
 yes|libasyncns|libasyncns0,libasyncns-dev|exe,dev,doc,nls| #needed by mplayer.
 yes|libav|libav-tools|exe,dev,doc,nls
 yes|libbluray|libbluray1,libbluray-dev|exe,dev,doc,nls| #needed by mplayer.
 yes|libbonobo|libbonobo2-0,libbonobo2-dev,libbonoboui2-0,libbonoboui2-dev|exe,dev,doc,nls
@@ -380,11 +383,11 @@
 yes|libsigsegv|libsigsegv2,libsigsegv-dev|exe,dev,doc,nls
 yes|libslang|libslang2|exe,dev>null,doc,nls
 yes|libsndfile|libsndfile1,libsndfile1-dev,sndfile-programs|exe,dev,doc,nls
 yes|libsoup|libsoup2.4-1,libsoup2.4-dev|exe,dev,doc,nls
 no|libstdc++||exe,dev>null,doc>null,nls>null| #old libstdc++.so.5. some video codecs (/usr/lib/codecs) need it...
-yes|libstdc++6|libstdc++6,libstdc++6-4.4-dev|exe,dev,doc,nls
+yes|libstdc++6|libstdc++6,libstdc++6-4.6-dev|exe,dev,doc,nls
 yes|libtasn1|libtasn1-3,libtasn1-3-dev|exe,dev,doc,nls
 yes|libthai|libthai0|exe,dev,doc,nls| #have left out libthai-data and libthai-dev.
 yes|libtheora|libtheora0,libtheora-dev|exe,dev,doc,nls
 yes|libtiff|libtiff4,libtiff4-dev|exe,dev,doc,nls
 yes|libtool|libtool,autotools-dev|exe>dev,dev,doc,nls
@@ -458,10 +461,11 @@
 no|netpbm|netpbm,libnetpbm10,libnetpbm10-dev|exe,dev,doc,nls
 yes|netpbm||exe
 yes|net_setup||exe
 yes|net-tools|net-tools|exe,dev,doc,nls
 no|netsurf2||exe,dev,doc,nls
+yes|nettle|libnettle4|exe,dev,doc,nls| #needed by libarchive.
 yes|network_tray||exe
 no|nicoedit||exe
 yes|normalize|normalize-audio|exe,dev,doc,nls
 no|notecase|notecase|exe,dev,doc,nls
 yes|nspr|libnspr4-0d,libnspr4-dev|exe,dev,doc,nls| #using seamonkey pkg with these built-in...
@@ -498,11 +502,12 @@
 yes|pcmciautils|pcmciautils|exe,dev,doc,nls
 yes|pcre|libpcre3,libpcre3-dev,libpcrecpp0|exe,dev,doc,nls
 yes|pctorrent||exe
 yes|pdvdrsab||exe
 yes|peasypdf||exe,dev,doc,nls
-yes|peasyscan||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
 yes|perl_tiny|perl,perl-base,perl-modules|exe,dev>null,doc>null,nls>null
 yes|perl-compress-zlib|libcompress-raw-zlib-perl|exe>dev,dev,doc,nls
 yes|perl-digest-sha1|libdigest-sha-perl|exe>dev,dev,doc,nls
 yes|perl-digest-sha1|libdigest-sha-perl|exe,dev>null,doc>null,nls>null

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

@@ -250,11 +250,11 @@
 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||||
 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||||
-peasyscan-1.7|peasyscan|1.7||Graphic|164K||peasyscan-1.7.pet|+sane-backends,+gtkdialog3|Peasyscan simple image scanner, created by rcrsn51||||
+peasyscan-2.0|peasyscan|2.0||Graphic|208K||peasyscan-2.0.pet||Peasyscan simple image scanner|t2|8.0rc||
 pfilesearch-1.27|pfilesearch|1.27||BuildingBlock|84K||pfilesearch-1.27.pet|+gtkdialog3|needed by pburn, pfind||||
 pfind-4.24|pfind|4.24||Filesystem|188K||pfind-4.24.pet|+gtkdialog3,+pfilesearch|Pfind file finder||||
 phash-2|phash|2||Desktop|24K||phash-2.pet|+rox_filer|adds to rox right-click menu, calc md5sum/sha1sum of a file||||
 picocom-1.2|picocom|1.2||Utility|56K||picocom-1.2.pet||Serial port comms|puppy|4||
 picscale-0.1b-w5|picscale|0.1b-w5||BuildingBlock|52K||picscale-0.1b-w5.pet|+gtk+|cli scale images, used by pPicona, SimpleWALL|puppy|wary5||

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

@@ -46,10 +46,11 @@
 yes|alsa-utils|alsa-utils|exe,dev,doc,nls
 no|asapm||exe
 no|asunder|asunder|exe,dev,doc,nls
 yes|asunder||exe,dev,doc,nls| #asunder compiled in luci
 yes|atk|libatk1.0-0,libatk1.0-dev|exe,dev,doc,nls
+yes|atkmm|libatkmm-1.6-1,libatkmm-1.6-dev|exe,dev,doc,nls
 yes|attr|libattr1,libattr1-dev|exe,dev,doc,nls
 yes|audiofile|libaudiofile1,libaudiofile-dev|exe,dev,doc,nls
 no|aufs|aufs-tools|exe,dev,doc,nls
 yes|aufs2-util||exe
 yes|autoconf|autoconf|exe>dev,dev,doc,nls
@@ -86,16 +87,17 @@
 no|chmlib||exe,dev,doc,nls
 no|chmsee||exe,dev>null,doc,nls
 yes|close-dvd+rwtools||exe
 yes|coreutils|coreutils|exe,dev>null,doc,nls
 no|coreutils||exe
-yes|cmake|cmake|exe>dev,dev,doc,nls
+yes|cmake|cmake,cmake-data|exe>dev,dev,doc,nls
 yes|cpio|cpio|exe,dev>null,doc,nls
 yes|cpu-scaling-ondemand||exe
 yes|ctorrent|ctorrent|exe,dev>null,doc,nls
 no|cups||exe,dev,doc,nls
 yes|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
+yes|cups-filters|cups-filters,libcupsfilters1,libcupsfilters-dev|exe,dev,doc,nls| #extra cups filters, especially pdftops.
 no|cups_lucid||exe,dev,doc>exe,nls>exe
 yes|cups_pdf||exe
 no|cups-fix||exe
 yes|curl|curl,libcurl3,libcurl4-openssl-dev|exe,dev,doc,nls
 yes|cvs|cvs|exe>dev,dev,doc,nls
@@ -127,11 +129,11 @@
 yes|disktype|disktype|exe,dev>null,doc,nls
 yes|dmidecode|dmidecode|exe,dev>null,doc,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|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| #note, strange ubuntu seems to have lost the dev component of libuuid.
 no|e3|e3|exe,dev>null,doc,nls| #the ubuntu e3 crashes.
 yes|e3||exe
 yes|ed|ed|exe,dev>null,doc,nls
 yes|edid|read-edid|exe,dev>null,doc,nls
@@ -179,11 +181,11 @@
 yes|gawk|gawk|exe,dev,doc,nls
 yes|gcc_dev|gcc-4.6-base,gcc,gcc-4.6,g++,g++-4.6,cpp,cpp-4.6|exe>dev,dev,doc,nls
 yes|gcc_lib|libgcc1,libgomp1,libquadmath0|exe,dev,doc,nls
 no|gccmakedep||exe>dev,dev,doc,nls
 yes|gcolor2|gcolor2|exe,dev>null,doc,nls
-yes|gconf|gconf2-common,gconf2,libgconf2-4,libgconf2-dev,libgconf-2-4,gconf-service|exe,dev,doc,nls
+yes|gconf|gconf2-common,gconf2,libgconf2-4,libgconf2-dev,libgconf-2-4,gconf-service,gconf-service-backend|exe,dev,doc,nls
 yes|gdb|gdb|exe>dev,dev,doc,nls
 yes|gdbm|libgdbm3,libgdbm-dev|exe,dev,doc,nls
 yes|gdk-pixbuf|libgdk-pixbuf2.0-0,libgdk-pixbuf2.0-common,libgdk-pixbuf2.0-dev|exe,dev,doc,nls
 yes|gdmap|gdmap|exe,dev>null,doc,nls
 yes|geany|geany,geany-common,geany-plugins-common,geany-plugin-addons,geany-plugin-codenav,geany-plugin-extrasel,geany-plugin-numberedbookmarks,geany-plugin-prettyprinter,geany-plugin-spellcheck,geany-plugin-treebrowser,geany-plugin-xmlsnippets|exe,dev>null,doc,nls
@@ -251,11 +253,11 @@
 no|gtksourceview||exe,dev,doc,nls| #my pet with genie.lang added... no, now in template.
 yes|gtksourceview|libgtksourceview2.0-0,libgtksourceview2.0-common,libgtksourceview2.0-dev|exe,dev,doc,nls
 yes|gtkspell|libgtkspell0,libgtkspell-dev|exe,dev,doc,nls
 no|gtrayicon||exe
 yes|guess_fs||exe
-yes|gutenprint|ijsgutenprint,cups-driver-gutenprint,libgutenprint2,libgutenprint-dev,libgutenprintui2-1,libgutenprintui2-dev|exe,dev,doc,nls
+yes|gutenprint|ijsgutenprint,cups-driver-gutenprint,libgutenprint2,libgutenprint-dev,libgutenprintui2-1,libgutenprintui2-dev,printer-driver-gutenprint|exe,dev,doc,nls
 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
@@ -303,10 +305,11 @@
 yes|leafpad|leafpad|exe,dev>null,doc,nls
 yes|less|less|exe,dev>null,doc,nls
 yes|lhp_sys_info||exe
 yes|libaacs|libaacs0,libaacs-dev|exe,dev,doc,nls| #mplayer needs this.
 yes|libao|libao4,libao-common,libao-dev|exe,dev,doc,nls
+yes|libarchive|libarchive12|exe,dev,doc,nls| #needed by cmake.
 yes|libart|libart-2.0-2,libart-2.0-dev|exe,dev,doc,nls
 yes|libasyncns|libasyncns0,libasyncns-dev|exe,dev,doc,nls| #needed by mplayer.
 yes|libav|libav-tools|exe,dev,doc,nls
 yes|libbluray|libbluray1,libbluray-dev|exe,dev,doc,nls| #needed by mplayer.
 yes|libbonobo|libbonobo2-0,libbonobo2-dev,libbonoboui2-0,libbonoboui2-dev|exe,dev,doc,nls
@@ -385,11 +388,11 @@
 yes|libsigsegv|libsigsegv2,libsigsegv-dev|exe,dev,doc,nls
 yes|libslang|libslang2|exe,dev>null,doc,nls
 yes|libsndfile|libsndfile1,libsndfile1-dev,sndfile-programs|exe,dev,doc,nls
 yes|libsoup|libsoup2.4-1,libsoup2.4-dev|exe,dev,doc,nls
 yes|libstdc++||exe,dev>null,doc>null,nls>null| #old libstdc++.so.5. some video codecs (/usr/lib/codecs) need it.
-yes|libstdc++6|libstdc++6,libstdc++6-4.4-dev|exe,dev,doc,nls
+yes|libstdc++6|libstdc++6,libstdc++6-4.6-dev|exe,dev,doc,nls
 yes|libtasn1|libtasn1-3,libtasn1-3-dev|exe,dev,doc,nls
 yes|libthai|libthai0|exe,dev,doc,nls| #have left out libthai-data and libthai-dev.
 yes|libtheora|libtheora0,libtheora-dev|exe,dev,doc,nls
 yes|libtiff|libtiff4,libtiff4-dev|exe,dev,doc,nls
 yes|libtool|libtool,autotools-dev|exe>dev,dev,doc,nls
@@ -418,10 +421,11 @@
 yes|linux_headers||exe>dev,dev,doc,nls
 yes|lirc|liblircclient0,liblircclient-dev|exe,dev,doc,nls
 yes|lsb-base|lsb-base|exe,dev,doc,nls
 no|lxpanel||exe,dev>null,doc,nls
 yes|lzma|lzma,lzma-dev|exe,dev,doc,nls
+yes|lzo2|liblzo2-2,liblzo2-dev|exe,dev,doc,nls
 yes|m4|m4|exe>dev,dev,doc,nls
 yes|madplay|madplay|exe,dev,doc,nls
 yes|make|make|exe>dev,dev,doc,nls
 yes|makebootfat||exe| #must use my patched makebootfat.
 yes|man|man-db|exe>dev,dev,doc,nls
@@ -445,11 +449,11 @@
 yes|mp||exe
 yes|mpclib|libmpc2|exe>dev,dev,doc,nls
 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,libx86-1,libx264-120,libxvidcore4,libxvmc1,libxxf86dga1|exe,dev,doc,nls
+yes|mplayer|mplayer,libaa1,libaudio2,libcaca0,libenca0,libesd0,libgpm2,libjack0,libmpcdec6,libopenal1,libpostproc52,libpulse0,libschroedinger-1.0-0,libsdl1.2debian,libsmbclient,libspeex1,libsvga1,libswscale2,libtalloc2,libwbclient0,libwrap0,libx86-1,libx264-120,libxvidcore4,libxvmc1,libxxf86dga1|exe,dev,doc,nls
 no|mplayer_codecs_basic||exe
 yes|mscw||exe| #multiple sound card wizard.
 yes|ms-sys||exe
 yes|mtpaint|mtpaint|exe,dev,doc,nls
 no|mtpaint||exe
@@ -464,10 +468,11 @@
 yes|netpbm||exe
 yes|net_setup||exe
 no|net_setup_classic||exe
 yes|net-tools|net-tools|exe,dev,doc,nls
 no|netsurf2||exe,dev,doc,nls
+yes|nettle|libnettle4|exe,dev,doc,nls| #needed by libarchive.
 yes|network_tray||exe
 no|nicoedit||exe
 yes|normalize|normalize-audio|exe,dev,doc,nls
 yes|notecase||exe,dev,doc,nls
 yes|nspr|libnspr4-0d,libnspr4-dev|exe,dev,doc,nls| #using seamonkey pkg with these built-in.
@@ -504,10 +509,13 @@
 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|pdvdrsab||exe
+yes|peasypdf||exe,dev,doc,nls
+yes|peasyprint||exe,dev,doc,nls
+yes|peasyscan||exe,dev,doc,nls
 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-raw-zlib-perl|exe>dev,dev,doc,nls
 yes|perl-digest-sha1|libdigest-sha-perl|exe>dev,dev,doc,nls
 yes|perl-digest-sha1|libdigest-sha-perl|exe,dev>null,doc>null,nls>null
@@ -701,10 +709,11 @@
 no|xserver_xorg|xserver-xorg-dev,xserver-common,xserver-xorg,xserver-xorg-core,xserver-xorg-video-*,xserver-xorg-input-mouse,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-nouveau,-xserver-xorg-video-nsc,-xserver-xorg-video-tga,-xserver-xorg-video-vga,-xserver-xorg-video-vmware|exe,dev,doc,nls| #jaunty, xserver-xorg-video-intel restored... lucid, restored -radeonhd, -glint, removed -input-kbd, -video-vmware
 yes|xserver_xorg|xserver-xorg-dev,xserver-common,xserver-xorg,xserver-xorg-core,xserver-xorg-video-*,xserver-xorg-input-kbd,xserver-xorg-input-mouse,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-tga,-xserver-xorg-video-vga,-xserver-xorg-video-vmware|exe,dev,doc,nls| #for precise pangolin
 no|xserver_xvesa||exe
 yes|xsoldier||exe
 yes|xtrans|xtrans-dev|exe>dev,dev,doc,nls
+yes|xz|xz-utils,liblzma5,liblzma-dev|exe,dev,doc,nls
 yes|yad||exe,dev,doc,nls|
 yes|yaf_splash||exe
 yes|ycalc||exe
 no|you2pup||exe
 no|zfind||exe

Changes to woof-distro/x86/ubuntu/precise/DISTRO_SPECS

@@ -1,9 +1,9 @@
 #One or more words that identify this distribution:
 DISTRO_NAME='Precise Puppy'
 #version number of this distribution:
-DISTRO_VERSION=5.2.54
+DISTRO_VERSION=5.2.55
 #The distro whose binary packages were used to build this distribution:
 DISTRO_BINARY_COMPAT='ubuntu'
 #Prefix for some filenames: exs: precisesave.2fs, precise-4.99.0.sfs
 DISTRO_FILE_PREFIX='precise'
 #The version of the distro whose binary packages were used to build this distro: