Check-in [e2e7ebd871]
Not logged in

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

Overview

SHA1 Hash:e2e7ebd871c0ef69d9367b2f68e731b9da3c194c
Date: 2012-03-16 10:56:47
User: BarryK
Comment:builds from Ubuntu Precise Pangolin debs, commandline but no X yet

Tags And Properties
Changes

Changes to woof-code/2createpackages

@@ -24,10 +24,11 @@
 #111127 no longer check if host has 'printcols', 'vercmp', it is done in 'merge2out' script.
 #111204 do not use /var/local/woof, instead 'status' directory (better for running from different save-files).
 #111204 do not execute post-install script if FIXUPHACK has DISABLE_POST_INSTALL_SCRIPT=yes. (this existed before, but was broken)
 #111207 improve searching for menu icon.
 #111210 01micko: FIXUPHACK wasn't copied to packages/$(DISTRO_FILE_PREFIX}/$GENERICNAME/
+#120316 problems with ubuntu multiarch. also see 120315 in 3builddistro.
 
 export LANG=C #faster.
 
 . /etc/xdg/menus/hierarchy #w478 has PUPHIERARCHY variable.
 
@@ -39,10 +40,33 @@
 . ./DISTRO_PKGS_SPECS-${DISTRO_BINARY_COMPAT}-${DISTRO_COMPAT_VERSION} #has FALLBACKS_COMPAT_VERSIONS
 else
 . ./DISTRO_PKGS_SPECS-${DISTRO_BINARY_COMPAT} #has FALLBACKS_COMPAT_VERSIONS
 fi
 . ./DISTRO_PET_REPOS #has PET_REPOS, PACKAGELISTS_PET_ORDER
+
+if [ -f WOOFMERGEVARS ];then #120316
+. ./WOOFMERGEVARS #has variables WOOF_HOSTARCH, WOOF_TARGETARCH, WOOF_COMPATDISTRO, WOOF_COMPATVERSION
+else
+ echo 'File WOOFMERGEVARS does not exist. This is created by script
+merge2out. Your setup is wrong, quiting.'
+ exit
+fi
+#this is for ubuntu (Precise Pangolin) only so far...
+ARCHDIR=''
+if [ "$WOOF_COMPATDISTRO" = "ubuntu" ];then
+ case $WOOF_COMPATVERSION in
+  jaunty|karmic|lucid) #old releases.
+   true
+  ;;
+  *)
+   case $WOOF_TARGETARCH in
+    x86) ARCHDIR='i386-linux-gnu' ;;
+    x86_64) ARCHDIR='x86_64-linux-gnu' ;;
+   esac
+  ;;
+ esac
+fi
 
 #w469 modify compat-distro fallback list...
 if [ "$FALLBACKS_COMPAT_VERSIONS" != "" ];then
  FALLBACKS_COMPAT_VERSIONS="`echo -n "$FALLBACKS_COMPAT_VERSIONS" | grep -o "${DISTRO_COMPAT_VERSION}.*"`"
  #ex: 'koala jaunty intrepid' gets reduced to 'jaunty intrepid' if DISTRO_COMPAT_VERSION=jaunty
@@ -361,10 +385,25 @@
     mkdir sandbox2
     dpkg-deb -x $ONEBINARYPKG sandbox2/
     if [ $? -ne 0 ];then
      echo "ERROR: failed to unpack $PKGNAME"
      continue
+    fi
+    #120316 hack for multiarch, move libs to standard locations...
+    if [ "$ARCHDIR" ];then
+     if [ -d sandbox2/lib/$ARCHDIR ];then
+      cp -a -f --remove-destination sandbox2/lib/${ARCHDIR}/* sandbox2/lib/
+      sync
+      rm -rf sandbox2/lib/${ARCHDIR}
+      ln -s ./ sandbox2/lib/${ARCHDIR}
+     fi
+     if [ -d sandbox2/usr/lib/$ARCHDIR ];then
+      cp -a -f --remove-destination sandbox2/usr/lib/${ARCHDIR}/* sandbox2/usr/lib/
+      sync
+      rm -rf sandbox2/usr/lib/${ARCHDIR}
+      ln -s ./ sandbox2/usr/lib/${ARCHDIR}
+     fi
     fi
    ;;
    slackware)
     #100617 add support for .txz...
     SLACKEXT="`echo -n "$ONEBINARYPKG" | rev | cut -f 1 -d '.' | rev`" #exs: tgz, txz

Changes to woof-code/3builddistro

@@ -134,11 +134,11 @@
 
 if [ -f WOOFMERGEVARS ];then #111123
 . ./WOOFMERGEVARS #has variables WOOF_HOSTARCH, WOOF_TARGETARCH, WOOF_COMPATDISTRO, WOOF_COMPATVERSION
 else
  echo 'File WOOFMERGEVARS does not exist. This is created by script
-merge-arch_code_distro-2-out. Your setup is wrong, quiting.'
+merge2out. Your setup is wrong, quiting.'
  exit
 fi
 
 #100911 simple filenames, want idstring...
 #IDDATE="`date +%y%m%d%H%M%S`" #12 bytes, ex: 100911153319
@@ -338,12 +338,18 @@
 
 rm -f /tmp/3builddistro_removed_alt 2>/dev/null #101013
 
 #120315 Ubuntu Precise Pangolin has done a big move of files from /lib to /lib/i386-linux-gnu and /usr/lib to /usr/lib/i386-linuxgnu
 #well, i want to move them back. symlinks will do it (cp below does not destroy them)...
+#120316 note, see also 2createpackages.
 if [ ! -e packages-${DISTRO_FILE_PREFIX}/glibc/lib/libc.so.6 ];then
- ARCHDIR="`find packages-${DISTRO_FILE_PREFIX}/glibc/lib -mindepth 2 -maxdepth 2 -name 'libc.so.6' | head -n 1 | rev | cut -f 2 -d '/' | rev`"
+ #ARCHDIR="`find packages-${DISTRO_FILE_PREFIX}/glibc/lib -mindepth 2 -maxdepth 2 -name 'libc.so.6' | head -n 1 | rev | cut -f 2 -d '/' | rev`"
+ case $WOOF_TARGETARCH in #see file WOOFMERGEVARS
+  x86) ARCHDIR='i386-linux-gnu' ;;
+  x86_64) ARCHDIR='x86_64-linux-gnu' ;;
+  *) ARCHDIR='' ;;
+ esac
  if [ "$ARCHDIR" ];then #ex: i386-linux-gnu
   ln -snf ./ sandbox3/rootfs-complete/lib/${ARCHDIR}
   ln -snf ./ sandbox3/rootfs-complete/usr/lib/${ARCHDIR}
  fi
 fi

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

@@ -6,37 +6,21 @@
 # (in the case of PET databases, the names are the same and no processing is required)
 #110607 i was putting many "common" pet pkgs in the 'quirky' repo, now using 'common'.
 #110608 simplify pet pkg search order.
 #111124 add arm architecture repo.
 #111126 Packages-puppy-noarch-official now has all no-architecture PETs, supplanting -common-.
-#120315 this file customised for Precise Pangolin Ubuntu only.
-
-ARCHDIR=""
-if [ "$DISTRO_TARGETARCH" != "x86" ];then #defined in /etc/DISTRO_SPECS
- ARCHDIR="${DISTRO_TARGETARCH}" #ex: arm1176jzf-s
-fi
+#120315 this file customised for Precise Pangolin x86 Ubuntu only.
 
 #PET_REPOS
 #hardcode the pet repos in here...
 #first field is for testing the url.
 #second field is full URI of the repo
 #third field is the name of db-file(s) associated with that repo. it may have glob wildcards.
 # ex: Packages-puppy-4-official (note, url paths are in the database)
 
-if [ "$ARCHDIR" = "" ];then
- PKG_DOCS_PET_REPOS="ibiblio.org|http://distro.ibiblio.org/quirky/Packages-puppy-wary5-official|Packages-puppy-wary5-official ibiblio.org|http://distro.ibiblio.org/quirky/Packages-puppy-common-official|Packages-puppy-common-official ibiblio.org|http://distro.ibiblio.org/quirky/Packages-puppy-noarch-official|Packages-puppy-noarch-official ibiblio.org|http://distro.ibiblio.org/quirky/Packages-puppy-squeeze-official|Packages-puppy-squeeze-official ibiblio.org|http://distro.ibiblio.org/quirky/Packages-puppy-precise-official|Packages-puppy-${DISTRO_COMPAT_VERSION}-official"
- PET_REPOS='ibiblio.org|http://distro.ibiblio.org/quirky|Packages-puppy-*-official ftp.nluug.nl|http://ftp.nluug.nl/ftp/pub/os/Linux/distr/quirky|Packages-puppy-*-official uoc.gr|http://ftp.cc.uoc.gr/mirrors/linux/quirky|Packages-puppy-*-official mirror.aarnet.edu.au|ftp://mirror.aarnet.edu.au/pub/quirky|Packages-puppy-*-official'
-else
- PKG_DOCS_PET_REPOS="ibiblio.org|http://distro.ibiblio.org/quirky/${ARCHDIR}/Packages-puppy-${DISTRO_COMPAT_VERSION}-official|Packages-puppy-${DISTRO_COMPAT_VERSION}-official ibiblio.org|http://distro.ibiblio.org/quirky/Packages-puppy-noarch-official|Packages-puppy-noarch-official"
- PET_REPOS="ibiblio.org|http://distro.ibiblio.org/quirky/${ARCHDIR}|Packages-puppy-${DISTRO_COMPAT_VERSION}-official ftp.nluug.nl|http://ftp.nluug.nl/ftp/pub/os/Linux/distr/quirky/${ARCHDIR}|Packages-puppy-${DISTRO_COMPAT_VERSION}-official uoc.gr|http://ftp.cc.uoc.gr/mirrors/linux/quirky/${ARCHDIR}|Packages-puppy-${DISTRO_COMPAT_VERSION}-official ibiblio.org|http://distro.ibiblio.org/quirky|Packages-puppy-noarch-official ftp.nluug.nl|http://ftp.nluug.nl/ftp/pub/os/Linux/distr/quirky|Packages-puppy-noarch-official uoc.gr|http://ftp.cc.uoc.gr/mirrors/linux/quirky|Packages-puppy-noarch-official"
-fi
+PKG_DOCS_PET_REPOS="ibiblio.org|http://distro.ibiblio.org/quirky/Packages-puppy-wary5-official|Packages-puppy-wary5-official ibiblio.org|http://distro.ibiblio.org/quirky/Packages-puppy-common-official|Packages-puppy-common-official ibiblio.org|http://distro.ibiblio.org/quirky/Packages-puppy-noarch-official|Packages-puppy-noarch-official ibiblio.org|http://distro.ibiblio.org/quirky/Packages-puppy-squeeze-official|Packages-puppy-squeeze-official ibiblio.org|http://distro.ibiblio.org/quirky/Packages-puppy-${DISTRO_COMPAT_VERSION}-official|Packages-puppy-${DISTRO_COMPAT_VERSION}-official"
+PET_REPOS='ibiblio.org|http://distro.ibiblio.org/puppylinux|Packages-puppy-4-official ibiblio.org|http://distro.ibiblio.org/quirky|Packages-puppy-*-official ftp.nluug.nl|http://ftp.nluug.nl/ftp/pub/os/Linux/distr/quirky|Packages-puppy-*-official uoc.gr|http://ftp.cc.uoc.gr/mirrors/linux/quirky|Packages-puppy-*-official mirror.aarnet.edu.au|ftp://mirror.aarnet.edu.au/pub/quirky|Packages-puppy-*-official'
 
 #PACKAGELISTS_PET_ORDER
 #this defines where Woof looks first and second (and third, etc.) for pet pkgs
-
-if [ "$ARCHDIR" = "" ];then #x86.
- PACKAGELISTS_PET_ORDER="Packages-puppy-wary5-official Packages-puppy-noarch-official Packages-puppy-common-official"
- [ -f Packages-puppy-${DISTRO_COMPAT_VERSION}-official ] && PACKAGELISTS_PET_ORDER="Packages-puppy-${DISTRO_COMPAT_VERSION}-official ${PACKAGELISTS_PET_ORDER}"
-else
- #arm arch. etc...
- PACKAGELISTS_PET_ORDER="Packages-puppy-${DISTRO_COMPAT_VERSION}-official Packages-puppy-noarch-official"
-fi
+PACKAGELISTS_PET_ORDER="Packages-puppy-wary5-official Packages-puppy-noarch-official Packages-puppy-common-official Packages-puppy-4-official"
+[ -f Packages-puppy-${DISTRO_COMPAT_VERSION}-official ] && PACKAGELISTS_PET_ORDER="Packages-puppy-${DISTRO_COMPAT_VERSION}-official ${PACKAGELISTS_PET_ORDER}"

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

@@ -1,6 +1,6 @@
-#w469 fallbacks when looking for pet pkgs...
+#w469 fallbacks when looking for pet pkgs....
 FALLBACKS_COMPAT_VERSIONS='lucid karmic jaunty intrepid'
 
 #custom templates=cups,sylpheed,ghostscript,xorg-base
 
 #PKGS_SPECS_TABLE table format:
@@ -28,20 +28,20 @@
 # yes|genericpkgname|[pkgnames]|[splitup]|[compat:[repo]]
 #for a fuller explanation of the entries in PKGS_SPECS_TABLE, please see:
 # http://bkhome.org/blog/?viewDetailed=02414
 
 PKGS_SPECS_TABLE='
-yes|0hack1_karmic_dev||exe>dev,dev,doc,nls
+no|0hack1_karmic_dev||exe>dev,dev,doc,nls| #TODO might need to bring this back
 yes|915resolution||exe,dev,doc,nls
-yes|a52dec||exe,dev,doc,nls
+no|a52dec||exe,dev,doc,nls
+yes|a52dec|liba52-0.7.4,liba52-0.7.4-dev|
 yes|abiword||exe,dev,doc,nls| #abiword compiled in luci-209
-no|abiword|abiword,abiword-common,libabiword-2.8,libabiword-2.8-dev|exe,dev,doc,nls
+no|abiword|abiword,abiword-common,libabiword-2.9,libabiword-2.9-dev|exe,dev,doc,nls| #NO, compiled for gtk3
 no|abiword-plugin-grammar|abiword-plugin-grammar|exe,dev,doc,nls
 no|abiword-plugin-mathview|abiword-plugin-mathview|exe,dev,doc,nls
 no|absvolume_puppy||exe
 yes|acl|libacl1,libacl1-dev|exe,dev,doc,nls
-yes|acx||exe
 no|aiksaurus|libaiksaurus-*|exe,dev,doc,nls
 yes|alsa-lib|libasound2,libasound2-dev,libasound2-plugins|exe,dev,doc,nls
 yes|alsa-base|alsa-base|exe,dev,doc,nls
 yes|alsa-utils|alsa-utils|exe,dev,doc,nls
 no|asapm||exe
@@ -57,12 +57,11 @@
 yes|automake|automake,autotools-dev|exe>dev,dev,doc,nls
 no|autotools-dev|autotools-dev|exe>dev,dev,doc,nls| #fixes symlinks problem put this into automake and libtool.
 yes|avahi|libavahi-client3,libavahi-client-dev,libavahi-glib1,libavahi-glib-dev,libavahi-common3,libavahi-common-data,libavahi-common-dev,libavahi-compat-libdnssd1,libavahi-compat-libdnssd-dev|exe,dev,doc,nls
 yes|axel||exe,dev>null,doc,nls
 no|ayttm|ayttm,libaspell15,libaspell-dev,libgpgme11|exe,dev,doc,nls
-yes|Ayttm||exe,dev>null,doc,nls
-no|bacon||exe>dev,dev,doc>dev,nls
+yes|ayttm||exe,dev>null,doc,nls
 yes|bacon||exe,dev,doc>dev,nls
 yes|bash||exe,dev>null,doc,nls
 yes|bbc_provided||exe
 yes|bc|bc|exe,dev>null,doc,nls
 yes|bcrypt||exe
@@ -72,11 +71,11 @@
 no|binutils||exe>dev,dev,doc,nls
 yes|bison|bison|exe>dev,dev,doc,nls
 no|blinky||exe
 yes|boehm-gc|libgc1c2,libgc-dev|exe,dev,doc,nls
 yes|bones||exe
-yes|browser-default||exe| #lupu program by 01micko
+no|browser-default||exe| #lupu program by 01micko
 yes|busybox||exe,dev>null,doc,nls
 yes|bzip2|bzip2,libbz2-1.0,libbz2-dev|exe,dev,doc,nls
 yes|cairo|libcairo2,libcairo2-dev|exe,dev,doc,nls
 yes|cairomm|libcairomm-1.0-1,libcairomm-1.0-dev|exe,dev,doc,nls| ###PROBLEM TODO### this pkg supposed to go entirely into upup/cairomm_DEV but not right. see also glibmm, gtkmm, pangomm ###TODO###
 yes|cddetect||exe,dev>null,doc,nls
@@ -92,15 +91,14 @@
 yes|cmake|cmake|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
-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
-yes|cups_lucid||exe,dev,doc>exe,nls>exe
+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
+no|cups_lucid||exe,dev,doc>exe,nls>exe
 yes|cups_pdf||exe
-yes|cups-pdf|cups-pdf|exe,dev,doc,nls
-yes|cups-fix||exe
+no|cups-fix||exe
 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
 no|dbus-glib|libdbus-glib-1-2,libdbus-glib-1-dev|exe,dev,doc,nls|+dbus
@@ -136,11 +134,11 @@
 yes|e3||exe
 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|elspci||exe,dev>null,doc,nls
-yes|embeddedbookmarks||exe
+no|embeddedbookmarks||exe
 yes|embutils_cut||exe
 yes|enchant|libenchant1c2a,libenchant-dev|exe,dev,doc,nls
 yes|epdfview|epdfview|exe,dev>null,doc,nls
 yes|esound|esound-common,libesd0,libesd0-dev|exe,dev,nls,doc
 yes|ethtool|ethtool|exe,dev>null,doc,nls
@@ -148,20 +146,16 @@
 no|exo|exo-utils,libexo-0.3-0,libexo-0.3-dev|exe,dev,doc,nls
 yes|expat|libexpat1,libexpat1-dev|exe,dev,doc,nls
 yes|faac|libfaac0,libfaac-dev|exe,dev,doc,nls
 yes|faad|faad,libfaad2,libfaad-dev|exe,dev,doc,nls
 no|fbpanel||exe,dev>null,doc,nls
-no|ffmpeg-deps|libavcodec52,libavcodec-dev,libavutil49,libavutil-dev,libavformat52,libavformat-dev,libavdevice52,libavdevice-dev,libavfilter0,libavfilter-dev|exe,dev,doc,nls
-no|ffmpeg|ffmpeg|exe,dev,doc,nls
-no|ffmpeg||exe,dev,doc,nls
-yes|ffmpeg3||exe,dev,doc,nls
+yes|ffmpeg|ffmpeg,libavcodec53,libavcodec-dev,libavutil51,libavutil-dev,libavformat53,libavformat-dev,libavdevice53,libavdevice-dev,libavfilter2,libavfilter-dev,libpostproc52,libpostproc-dev,libswscale2,libswscale-dev|exe,dev,doc,nls
 no|file|file,libmagic1,libmagic-dev|exe,dev,doc,nls
 yes|file||exe
 yes|file_sharing-curlftpfs-mpscan||exe
 yes|findutils|findutils|exe,dev>null,doc,nls
 no|firefox-flash|firefox|exe,dev,doc>null,nls>null
-yes|firstrun_lucid||exe
 yes|flac|flac,libflac8,libflac-dev|exe,dev,doc,nls
 yes|flashplayer||exe
 yes|flex|flex|exe>dev,dev,doc,nls
 yes|flsynclient||exe
 yes|foomatic-db-engine|foomatic-db-engine|exe,dev,doc,nls
@@ -169,21 +163,21 @@
 yes|foomatic-filters|foomatic-filters|exe,dev,doc,nls
 no|foomatic-filters||exe
 yes|fossil||exe>dev,dev,doc>dev,nls
 no|fotoxx||exe,dev>null,doc,nls
 yes|fpm2|fpm2|exe
-yes|freememapplet_tray_lucid||exe
+yes|freememapplet_tray||exe
 yes|freetype|libfreetype6,libfreetype6-dev|exe,dev,doc,nls
 yes|fribidi|libfribidi0,libfribidi-dev|exe,dev,doc,nls
 yes|fuse|fuse-utils,libfuse2,libfuse-dev|exe,dev,doc,nls
 yes|gadmin-rsync|gadmin-rsync|exe,dev>null,doc,nls
 no|gail||exe,dev,doc,nls
 yes|gail|libgail18,libgail-common,libgail-dev|exe,dev,doc,nls
 yes|gamin|gamin,libgamin0,libgamin-dev|exe,dev,doc,nls
 yes|gawk|gawk|exe,dev,doc,nls
-yes|gcc_dev|gcc-4.4-base,gcc,gcc-4.4,g++,g++-4.4,cpp,cpp-4.4|exe>dev,dev,doc,nls
-yes|gcc_lib|libgcc1,libgomp1|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|exe,dev,doc,nls
 yes|gdb|gdb|exe>dev,dev,doc,nls
 yes|gdbm|libgdbm3,libgdbm-dev|exe,dev,doc,nls
@@ -198,36 +192,33 @@
 yes|gettext|gettext-base,gettext|exe,dev>null,doc>null,nls>null
 yes|gexec|gexec|exe,dev>null,doc,nls
 yes|gfnrename||exe,dev>null,doc,nls
 yes|gfontsel||exe,dev>null,doc,nls
 yes|gftp|gftp-gtk,gftp-common|exe,dev>null,doc,nls
-no|ghostscript|ghostscript,libgs8,ghostscript-cups|exe,dev,doc,nls
-yes|ghostscript_lucid||exe,dev,doc,nls| #pet of the ghostscript that has worked in lupu
+no|ghostscript|ghostscript,libgs9,ghostscript-cups,libgs-dev|exe,dev,doc,nls| #TODO needs more pkgs
+yes|ghostscript||exe,dev,doc,nls
 yes|gifsicle|gifsicle|exe,dev>null,doc,nls
 no|gins||exe,dev>null,doc,nls
 yes|git|git-core,gitweb,git-doc|exe>dev,dev,doc>dev,nls>dev
-no|glade2bas||exe>dev,dev,doc>dev,nls>dev
 yes|glade3|glade,libgladeui-2-0|exe>dev,dev,doc,nls
 yes|glib|libglib2.0-0,libglib2.0-data,libglib2.0-dev|exe,dev,doc,nls
 yes|glibc|libc-bin,libc6,libc6-dev,tzdata|exe,dev,doc,nls
 yes|glibc_locales|locales|exe,dev,doc,nls>exe
 no|glibc_i18n_en||exe
 yes|glibmm|libglibmm-2.4-1c2a,libglibmm-2.4-dev|exe,dev,doc,nls
 yes|glipper||exe,dev>null,doc,nls
 yes|gmeasures||exe,dev>null,doc,nls
-yes|gmp|libgmp3c2|exe>dev,dev,doc,nls
+yes|gmp|libgmp10|exe>dev,dev,doc,nls
 yes|gnome-doc-utils|gnome-doc-utils|exe>dev,dev,doc,nls|+python-libxml2
 yes|gnome-keyring|libgnome-keyring0,libgnome-keyring-dev|exe,dev,doc,nls
 yes|gnome_menus|libgnome-menu2,libgnome-menu-dev|exe,dev,doc,nls
-yes|gnome_mplayer||exe,dev,doc,nls| #gnome-mplayer for lupu compiled in luci-210
-yes|gnome-mplayer-deps|libcurl3-gnutls,libcurl4-gnutls-dev,libdiscid0,libdiscid0-dev,libmusicbrainz3-6,libmusicbrainz3-dev,libneon27-gnutls,libneon27-gnutls-dev|exe,dev,doc,nls
+yes|gnome-mplayer||exe,dev,doc,nls| #ubuntu pkg compiled for gtk3
 yes|gnome-vfs|libgnomevfs2-0,libgnomevfs2-dev,libgnomevfs2-common|exe,dev,doc,nls
-yes|gnumeric||exe,dev,doc,nls| #lupu gnumeric pet contains goffice
-no|gnumeric|gnumeric,gnumeric-common|exe,dev>null,doc,nls
-no|gnumeric-plugins-extra|gnumeric-plugins-extra|exe,dev>null,doc,nls
+yes|gnumeric|gnumeric,gnumeric-common|exe,dev>null,doc,nls
+yes|gnumeric-plugins-extra|gnumeric-plugins-extra|exe,dev>null,doc,nls
 yes|gnutls|libgnutls26,libgnutls-dev|exe,dev,doc,nls
-no|goffice|libgoffice-0.8-8,libgoffice-0.8-8-common,libgoffice-0.8-dev|exe,dev,doc,nls
+yes|goffice|libgoffice-0.8-8,libgoffice-0.8-8-common,libgoffice-0.8-dev|exe,dev,doc,nls
 no|gparted||exe,dev>null,doc,nls
 yes|gparted|gparted|exe,dev>null,doc,nls| #/sbin/blkid is necessary for gparted to display information--it is in Lupu_Utilitiesw
 yes|gphoto2|gphoto2|exe,dev,doc,nls
 yes|gphotofs|gphotofs|exe,dev,doc,nls
 yes|gpptp||exe
@@ -235,11 +226,11 @@
 yes|groff|groff|exe>dev,dev,doc,nls
 yes|grub|grub|exe,dev>null,doc,nls
 yes|gsm|libgsm1,libgsm1-dev|exe,dev,doc,nls
 yes|gtk+|libgtk2.0-0,libgtk2.0-dev|exe,dev,doc,nls
 yes|gtk2-engines-pixbuf|gtk2-engines-pixbuf|exe,dev,doc,nls
-no|gtkam|gtkam|exe,dev>null,doc,nls|+lib-exif-gtk,+libgphoto2
+yes|gtkam|gtkam|exe,dev>null,doc,nls|
 yes|gtk-chtheme|gtk-chtheme|exe,dev>null,doc,nls
 no|gtkdialog2||exe
 yes|gtkdialog3||exe,dev,doc>dev,nls|
 yes|gtkdialog4||exe,dev,doc>dev,nls| #modify all pets that need this to explicitly call 'gtkdialog' or 'gtkdialog4'.
 yes|gtkhash|gtkhash|exe,dev,doc,nls
@@ -253,11 +244,11 @@
 yes|gtk_theme_polished_blue||exe
 no|gtk_theme_stardust_zigbert||exe
 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
-yes|gtrayicon||exe
+no|gtrayicon||exe
 yes|guess_fs||exe
 yes|gutenprint|ijsgutenprint,cups-driver-gutenprint,libgutenprint2,libgutenprint-dev,libgutenprintui2-1,libgutenprintui2-dev|exe,dev,doc,nls
 no|gutenprint||exe,dev,doc>exe,nls>exe
 yes|gview||exe
 yes|gwhere|gwhere|exe
@@ -264,21 +255,20 @@
 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
+no|hal||exe,dev,doc,nls| #TRY see if works without hal
 yes|hardinfo|hardinfo|exe,dev,doc,nls
 yes|hdparm|hdparm|exe,dev>null,doc,nls
 yes|hiawatha||exe
 yes|hicolor-icon-theme|hicolor-icon-theme|exe,dev>null,doc,nls
-no|homebank|homebank,homebank-data|exe,dev>null,doc,nls|+libofx,+opensp
+no|homebank|homebank,homebank-data|exe,dev>null,doc,nls
 yes|homebank||exe,dev,doc,nls| #my own pet with less dependencies.
 yes|hotplug2stdout||exe
 yes|htop||exe
 yes|hunspell|hunspell,libhunspell-1.3-0,libhunspell-dev,hunspell-en-us|exe,dev,doc,nls
-yes|icewm_lucid||exe,dev,doc,nls
 yes|id3lib|libid3-3.8.3c2a,libid3-3.8.3-dev|exe,dev,doc,nls
 yes|ifplugd||exe
 yes|ifplugd_old||exe
 yes|ijs|libijs-0.35,libijs-dev|exe,dev,doc,nls
 yes|imake|xutils-dev|exe>dev,dev,doc,nls
@@ -299,15 +289,16 @@
 no|kbd||exe
 yes|keyutils|libkeyutils1|exe,dev>null,doc,nls
 yes|krb5|libkrb5-3,libkrb5-dev,libkrb5support0,libk5crypto3,libgssapi-krb5-2|exe,dev,doc,nls
 yes|lame|lame,libmp3lame0,libmp3lame-dev|exe,dev,doc,nls
 yes|lcms|liblcms1,liblcms1-dev,liblcms-utils|exe,dev,doc,nls
-no|leafpad|leafpad|exe,dev>null,doc,nls
+yes|leafpad|leafpad|exe,dev>null,doc,nls
 yes|less|less|exe,dev>null,doc,nls
 yes|lhp_sys_info||exe
 yes|libao|libao4,libao-common,libao-dev|exe,dev,doc,nls
 yes|libart|libart-2.0-2,libart-2.0-dev|exe,dev,doc,nls
+yes|libav|libav-tools|exe,dev,doc,nls
 yes|libbonobo|libbonobo2-0,libbonobo2-dev,libbonoboui2-0,libbonoboui2-dev|exe,dev,doc,nls
 yes|libcap|libcap2,libcap-dev|exe,dev,doc,nls
 no|libcddb|libcddb2,libcddb2-dev|exe,dev,doc,nls| #debian/ubuntu pkg missing 'cddb_query', also very old version (warning: .deb 'cddb' package has nothing to do with libcddb pkg)
 yes|libcddb||exe,dev,doc,nls
 yes|libcdio|libcdio13,libcdio-dev,libcdio-cdda1,libcdio-cdda-dev,libcdio-paranoia1,libcdio-paranoia-dev,libcdio-utils,libiso9660-8|exe,dev,doc,nls
@@ -321,12 +312,13 @@
 no|libdvdplay||exe,dev,doc,nls
 yes|libdvdread|libdvdread4,libdvdread-dev|exe,dev,doc,nls
 yes|libedit|libedit2,libedit-dev|exe,dev,doc,nls
 yes|libexif|libexif12,libexif-dev|exe,dev,doc,nls
 yes|libexif-gtk|libexif-gtk5,libexif-gtk-dev|exe,dev,doc,nls
+yes|libffi|libffi6,libffi-dev|exe,dev,doc,nls
 yes|libgcrypt|libgcrypt11,libgcrypt11-dev|exe,dev,doc,nls
-yes|libgee||exe,dev,doc,nls
+yes|libgee|libgee2,libgee-dev|exe,dev,doc,nls
 yes|libgif|libgif4,libgif-dev|exe,dev,doc,nls
 no|libgio-fam|libgio-fam|exe,dev,doc,nls
 yes|libglade2|libglade2-0,libglade2-dev|exe,dev,doc,nls
 yes|libgnome|libgnome2-0,libgnome2-dev|exe,dev,doc,nls
 yes|libgnomecanvas2|libgnomecanvas2-0,libgnomecanvas2-dev|exe,dev,doc,nls
@@ -390,18 +382,18 @@
 yes|libxcb_base|libxcb1,libxcb1-dev,libxcb-render0,libxcb-render0-dev,libxcb-render-util0,libxcb-render-util0-dev|exe,dev,doc,nls
 no|libxfce4mcs|libxfce4mcs-client3,libxfce4mcs-manager3,libxfce4mcs-dev|exe,dev,doc,nls
 no|libxfce4util|libxfce4util4,libxfce4util-dev|exe,dev,doc,nls
 no|libxfcegui4|libxfcegui4-4,libxfcegui4-dev|exe,dev,doc,nls
 yes|libxml2|libxml2,libxml2-dev|exe,dev,doc,nls
-yes|libxml2|libxml2-utils|exe>dev,dev,doc,nls
+yes|libxml2-utils|libxml2-utils|exe>dev,dev,doc,nls
 yes|libxslt|libxslt1.1,libxslt1-dev,xsltproc|exe,dev,doc,nls
 yes|linux_firewall||exe
 yes|linux_firmware_dvb||exe
 yes|linux-header|linux-libc-dev|exe>dev,dev,doc,nls
+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
-yes|luvcview_lucid||exe,dev,doc,nls
 no|lxpanel||exe,dev>null,doc,nls
 yes|lzma|lzma,lzma-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
@@ -413,11 +405,10 @@
 no|metamail|metamail|exe,dev>null,doc,nls
 yes|metamail||exe
 yes|mhash|libmhash2,libmhash-dev|exe,dev,doc,nls
 yes|mhwaveedit||exe
 no|midori|midori,libgstreamer0.10-0,libgstreamer-plugins-base0.10-0,libicu42,libsqlite3-0,libunique-1.0-0,libwebkit-1.0-2|exe,dev,nls,doc
-yes|midori_lucid||exe,dev,doc,nls
 yes|mingetty||exe,dev,doc,nls
 no|minixcal||exe
 yes|mirdir||exe
 no|mktemp|mktemp|exe,dev>null,doc,nls
 yes|mktemp||exe
@@ -424,10 +415,11 @@
 yes|modem_stats||exe
 yes|module-init-tools|module-init-tools|exe,dev,doc,nls
 yes|mountcifs||exe
 no|mp|mped|exe,dev>null,doc,nls| #no, the gtk mode of this mp is awful, use my curses-only pkg.
 yes|mp||exe
+yes|mpclib|libmpc2|exe>dev,dev,doc,nls
 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
 no|mplayer_codecs_basic||exe
 yes|ms-sys||exe
@@ -435,23 +427,23 @@
 no|mtpaint||exe
 yes|mtr||exe
 yes|mut2||exe
 yes|nasm|nasm|exe>dev,dev,doc,nls
 yes|nbtscan|nbtscan|exe
-yes|ncurses|ncurses-base,ncurses-bin,libncurses5,libncurses5-dev,libncursesw5,libncursesw5-dev|exe,dev,doc,nls
+yes|ncurses|ncurses-base,ncurses-bin,libncurses5,libncurses5-dev,libncursesw5,libncursesw5-dev,libtinfo5,libtinfo-dev|exe,dev,doc,nls
 yes|ndiswrapper|ndiswrapper-common,ndiswrapper-utils-1.9|exe,dev>null,doc,nls
 yes|nenscript||exe
 no|netpbm|netpbm,libnetpbm10,libnetpbm10-dev|exe,dev,doc,nls
 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|network_tray_lucid||exe
-yes|nicoedit||exe
+yes|network_tray||exe
+no|nicoedit||exe
 yes|normalize|normalize-audio|exe,dev,doc,nls
-yes|notecase||exe
+yes|notecase||exe,dev,doc,nls
 yes|nspr|libnspr4-0d,libnspr4-dev|exe,dev,doc,nls| #using seamonkey pkg with these built-in.
 yes|nss|libnss3-1d,libnss3-dev|exe,dev,doc,nls| #using seamonkey pkg with these built-in.
 yes|ntfs-3g|ntfs-3g,ntfs-3g-dev|exe,dev,doc,nls
 no|ntfs-3g||exe,dev,doc,nls
 yes|ntfsprogs|ntfsprogs,libntfs10,libntfs-dev|exe,dev,doc,nls
@@ -498,16 +490,15 @@
 yes|pfilesearch||exe
 yes|pfind||exe
 yes|picocom|picocom|exe,dev,doc,nls
 yes|picpuz||exe
 yes|picscale||exe|
-yes|pictureviewer||exe
 yes|pixman|libpixman-1-0,libpixman-1-dev|exe,dev,doc,nls
 yes|pkgconfig|pkg-config|exe>dev,dev,doc,nls
 yes|pmetatagger||exe
 yes|pmirror||exe
-yes|PMirrorget||exe
+yes|pmirrorget||exe
 yes|pmusic||exe
 yes|pmusic_tray||exe,dev,doc,nls
 yes|pmusic_THEME_pmusic_original||exe
 yes|pnethood||exe
 no|policykit|libpolkit2|exe,dev,doc,nls
@@ -535,17 +526,16 @@
 yes|puppyserialdetect||exe
 yes|pupradio||exe,dev,doc,nls
 no|puptv||exe
 yes|pupx||exe
 yes|pure_ftpd||exe
-no|pwallpaper||exe
+yes|pwallpaper||exe
 no|pwget||exe
 yes|pwsget||exe
 no|pwireless||exe
 yes|python|python,python2.6-minimal,python2.6|exe>dev,dev,doc,nls
 yes|python-libxml2|python-libxml2|exe>dev,dev,doc,nls|+libxml2
-yes|quickpet||exe
 yes|readline|libreadline6,libreadline6-dev,readline-common|exe,dev,doc,nls
 no|replaceit||exe
 yes|retrovol||exe
 no|ripoff|ripoff,libripoff0,ripoff-mp3-plugin|exe,dev>null,doc,nls
 yes|rman|rman|exe>dev,dev,doc,nls
@@ -561,13 +551,13 @@
 no|samba_client|samba,samba-common,smbfs,smbclient|exe,dev>null,doc,nls
 yes|samba_client||exe
 yes|sane-backends|libsane,libsane-dev,sane-utils|exe,dev,doc,nls
 yes|scale2x||exe
 no|scanpci||exe| #needs library libpciaccesss (normally part of that pkg).
-no|seamonkey|seamonkey-browser,seamonkey-mailnews|exe,dev>null,doc,nls|+nspr,+nss
+yes|seamonkey|seamonkey,seamonkey-browser,seamonkey-mailnews|exe,dev>null,doc,nls
 no|seamonkey||exe,dev,doc>null,nls>null
-yes|searchmonkey||exe
+no|searchmonkey||exe
 yes|sed|sed|exe,dev>null,doc,nls
 yes|setserial|setserial|exe,dev>null,doc,nls
 yes|setvol||exe
 yes|sfs-converter||exe
 no|sgmixer||exe
@@ -584,11 +574,11 @@
 yes|strace|strace|exe>dev,dev,doc,nls
 yes|streamripper||exe,dev,doc,nls
 yes|subversion|subversion,libsvn1,libdb5.1,libneon27-gnutls,libaprutil1,libpq5,libmysqlclient16,libapr1|exe>dev,dev,doc,nls
 yes|superscan||exe
 no|sylpheed|sylpheed,libbluetooth3,libcompfaceg1,libonig2,libpisock9,libgpgme11|exe,dev,doc,nls
-yes|sylpheed||exe
+no|sylpheed||exe
 yes|synclient||exe
 yes|sys-freedos||exe
 yes|sysfsutils|libsysfs2,libsysfs-dev,sysfsutils|exe,dev,doc,nls
 no|syslinux|syslinux|exe,dev>null,doc,nls
 yes|syslinux||exe,dev,doc,nls| #must use pet syslinux pkg.
@@ -599,12 +589,12 @@
 yes|texinfo|texinfo|exe>dev,dev,doc,nls
 yes|tile||exe
 yes|time|time|exe,dev>null,doc,nls
 yes|truncate||exe
 yes|tslib|libts-0.0-0,libts-bin,libts-dev|exe,dev,doc,nls
-yes|udev||exe
-yes|udev_lib|libudev0,libudev-dev|exe,dev,doc,nls
+yes|udev|udev-16*,udev_DEV-16*|exe,dev,doc,nls|pet:wary5
+no|udev|udev,libudev0,libudev-dev|exe,dev,doc,nls
 yes|uget||exe
 yes|unclutter|unclutter|exe,dev>null,doc,nls
 yes|unionfs_utils||exe
 yes|unzip|unzip|exe,dev>null,doc,nls
 yes|urxvtset||exe| #needs urxvt, yad
@@ -611,33 +601,32 @@
 yes|usb-modeswitch||exe
 yes|usb-modeswitch-data||exe
 yes|usbutils|usbutils|exe,dev,doc,nls
 no|util-linux|util-linux,mount|exe,dev,doc,nls| #very suspicious, util-linux-ng 'fdisk' very slow, roll back to old pkg.
 yes|util-linux||exe
-yes|vala||exe>dev,dev,doc>dev,nls
+yes|vala|valac,valac-0.14,libvala-0.14-0|exe>dev,dev,doc>dev,nls
 yes|valide||exe>dev,dev,doc>dev,nls
 yes|vamps|vamps|exe,dev,doc,nls
 no|vcdimager|vcdimager,libvcdinfo0,libvcdinfo-dev|exe,dev,doc,nls
 yes|vcdimager|vcdimager|exe,dev,doc,nls
 yes|viewnior||exe,dev,doc,nls
 yes|vobcopy|vobcopy|exe,dev,doc,nls
 yes|vorbis-tools|vorbis-tools|exe,dev,doc,nls
 yes|waitmax||exe
-yes|wallpaper_lupu||exe
+no|wallpaper||exe
 yes|wavplay||exe
 yes|wget|wget|exe,dev>null,doc,nls
-no|whodo-tweaks||exe,dev,doc,nls
 yes|wireless-tools|wireless-tools,libiw30,libiw-dev|exe,dev,doc,nls
 yes|wpa_supplicant|wpasupplicant|exe,dev>null,doc,nls
 yes|wv|libwv-1.2-4,libwv-dev|exe,dev,doc,nls
 yes|wvdial||exe
 yes|x11proto|x11proto-*-dev|exe>dev,dev,doc,nls
 yes|xarchive||exe
 yes|xclip||exe
 yes|xcur2png||exe
 yes|xdelta||exe
-yes|xdg_puppy_lucid||exe
+yes|xdg_puppy||exe
 yes|xdialog||exe
 yes|xemeraldia||exe
 yes|xf86-input-keyboard||exe,dev,doc,nls| #especially for lucid.
 no|xfce4-battery-plugin|xfce4-battery-plugin|exe,dev,doc,nls
 no|xfce4-clipman-plugin|xfce4-clipman-plugin|exe,dev,doc,nls
@@ -656,31 +645,28 @@
 yes|xfdiff-cut||exe
 no|xfprot||exe
 no|xfwm4|xfwm4|exe,dev>null,doc,nls|+libxfce4mcs,+libxfce4util,+libxfcegui4,+exo
 no|xine-lib|libxine1,libxine1-bin,libxine1-misc-plugins,libxine1-x,libxine1-console,libxine1-ffmpeg,libxine-dev|exe,dev,doc,nls
 no|xine-lib||exe,dev,doc,nls
-yes|xinvaders||exe
+no|xinvaders||exe
 yes|xkbconfigmanager||exe
 yes|xload||exe
 yes|xlock_gui||exe
 yes|xlockmore||exe
 yes|xml-core|xml-core|exe>dev,dev,doc,nls
 no|xorg_base|xkb-data,xinit,x11-xkb-utils,x11-xserver-utils,x11-utils,x11-apps,libdrm2,libdrm-dev,libfontconfig1,libfontconfig1-dev,libfontenc1,libfontenc-dev,libgl1-mesa-glx,libgl1-mesa-dev,libglu1-mesa,libglu1-mesa-dev,libice6,libice-dev,libsm6,libsm-dev,libx11-6,libx11-dev,libx11-data,libxau6,libxau-dev,libxaw7,libxaw7-dev,libxcomposite1,libxcomposite-dev,libxcursor1,libxcursor-dev,libxdamage1,libxdamage-dev,libxdmcp6,libxdmcp-dev,libxext6,libxext-dev,libxfixes3,libxfixes-dev,libxfont1,libxfont-dev,libxft2,libxft-dev,libxi6,libxi-dev,libxinerama1,libxinerama-dev,libxkbfile1,libxkbfile-dev,libxkbui1,libxkbui-dev,libxmu6,libxmu-dev,libxmuu1,libxmuu-dev,libxpm4,libxpm-dev,libxrandr2,libxrandr-dev,libxrender1,libxrender-dev,libxt6,libxt-dev,libxtst6,libxtst-dev,libxv1,libxv-dev,libxxf86misc1,libxxf86misc-dev,libxxf86vm1,libxxf86vm-dev|exe,dev,doc,nls
 no|xorg_base|xfonts-utils,libxmu-headers,mesa-common-dev,xinit,x11-xkb-utils,x11-xserver-utils,x11-utils,x11-apps,libdrm2,libdrm-*,fontconfig,libfontconfig1,libfontconfig1-dev,libfontenc1,libfontenc-dev,libgl1-mesa-glx,libgl1-mesa-dev,libglu1-mesa,libglu1-mesa-dev,libice6,libice-dev,libsm6,libsm-dev,libx11-6,libx11-dev,libx11-data,libxau6,libxau-dev,libxaw7,libxaw7-dev,libxcomposite1,libxcomposite-dev,libxcursor1,libxcursor-dev,libxdamage1,libxdamage-dev,libxdmcp6,libxdmcp-dev,libxext6,libxext-dev,libxfixes3,libxfixes-dev,libxfont1,libxfont-dev,libxft2,libxft-dev,libxi6,libxi-dev,libxinerama1,libxinerama-dev,libxkbfile1,libxkbfile-dev,libxkbui1,libxkbui-dev,libxmu6,libxmu-dev,libxmuu1,libxmuu-dev,libxpm4,libxpm-dev,libxrandr2,libxrandr-dev,libxrender1,libxrender-dev,libxss1,libxss-dev,libxt6,libxt-dev,libxtst6,libxtst-dev,libxv1,libxv-dev,libxxf86misc1,libxxf86misc-dev,libxxf86vm1,libxxf86vm-dev|exe,dev,doc,nls| #has libdrm-* lupu
 no|xorg_base|xfonts-utils,libxmu-headers,mesa-common-dev,libgl1-mesa-dri,xinit,x11-xkb-utils,x11-xserver-utils,x11-utils,x11-apps,fontconfig,libfontconfig1,libfontconfig1-dev,libfontenc1,libfontenc-dev,libgl1-mesa-glx,libgl1-mesa-dev,libglu1-mesa,libglu1-mesa-dev,libice6,libice-dev,libsm6,libsm-dev,libx11-6,libx11-dev,libx11-data,libxau6,libxau-dev,libxaw7,libxaw7-dev,libxcomposite1,libxcomposite-dev,libxcursor1,libxcursor-dev,libxdamage1,libxdamage-dev,libxdmcp6,libxdmcp-dev,libxext6,libxext-dev,libxfixes3,libxfixes-dev,libxfont1,libxfont-dev,libxft2,libxft-dev,libxi6,libxi-dev,libxinerama1,libxinerama-dev,libxkbfile1,libxkbfile-dev,libxkbui1,libxkbui-dev,libxmu6,libxmu-dev,libxmuu1,libxmuu-dev,libxpm4,libxpm-dev,libxrandr2,libxrandr-dev,libxrender1,libxrender-dev,libxss1,libxss-dev,libxt6,libxt-dev,libxtst6,libxtst-dev,libxv1,libxv-dev,libxxf86misc1,libxxf86misc-dev,libxxf86vm1,libxxf86vm-dev|exe,dev,doc,nls| #i took out libdrm, now a updated pet pkg... added xfonts-utils_.
-no|xorg_base|xfonts-utils,libxmu-headers,mesa-common-dev,libgl1-mesa-dri,xinit,x11-xkb-utils,x11-xserver-utils,x11-utils,x11-apps,fontconfig,libdrm2,libdrm-dev,libdrm-intel1,libdrm-nouveau1,libdrm-radeon1,libfontconfig1,libfontconfig1-dev,libfontenc1,libfontenc-dev,libgl1-mesa-glx,libgl1-mesa-dev,libglu1-mesa,libglu1-mesa-dev,libice6,libice-dev,libsm6,libsm-dev,libx11-6,libx11-dev,libx11-data,libxau6,libxau-dev,libxaw7,libxaw7-dev,libxcomposite1,libxcomposite-dev,libxcursor1,libxcursor-dev,libxdamage1,libxdamage-dev,libxdmcp6,libxdmcp-dev,libxext6,libxext-dev,libxfixes3,libxfixes-dev,libxfont1,libxfont-dev,libxft2,libxft-dev,libxi6,libxi-dev,libxinerama1,libxinerama-dev,libxkbfile1,libxkbfile-dev,libxmu6,libxmu-dev,libxmuu1,libxmuu-dev,libxpm4,libxpm-dev,libxrandr2,libxrandr-dev,libxrender1,libxrender-dev,libxres1,libxres-dev,libxss1,libxss-dev,libxt6,libxt-dev,libxtst6,libxtst-dev,libxv1,libxv-dev,libxxf86dga1,libxxf86dga-dev,libxxf86misc1,libxxf86misc-dev,libxxf86vm1,libxxf86vm-dev|exe,dev,doc,nls| #jaunty, restored libdrm... added libxtrap... w463 added libxxf86dga... w464 added libxres.
-yes|xorg_base_lucid||exe,dev,doc,nls
-no|xorg_dri|libgl1-mesa-dri|exe,dev,doc,nls
-no|xorg_full|libgl1-mesa-dri,mesa-utils|exe,dev,doc,nls| #xorg_full becomes the Xorg_High pet in Quickpet and PPM
+yes|xorg_base|xfonts-utils,libxmu-headers,mesa-common-dev,libgl1-mesa-dri,xinit,x11-xkb-utils,x11-xserver-utils,x11-utils,x11-apps,fontconfig,libdrm2,libdrm-dev,libdrm-intel1,libdrm-nouveau1a,libdrm-radeon1,libfontconfig1,libfontconfig1-dev,libfontenc1,libfontenc-dev,libgl1-mesa-glx,libgl1-mesa-dev,libglu1-mesa,libglu1-mesa-dev,libice6,libice-dev,libsm6,libsm-dev,libx11-6,libx11-dev,libx11-data,libxau6,libxau-dev,libxaw7,libxaw7-dev,libxcomposite1,libxcomposite-dev,libxcursor1,libxcursor-dev,libxdamage1,libxdamage-dev,libxdmcp6,libxdmcp-dev,libxext6,libxext-dev,libxfixes3,libxfixes-dev,libxfont1,libxfont-dev,libxft2,libxft-dev,libxi6,libxi-dev,libxinerama1,libxinerama-dev,libxkbfile1,libxkbfile-dev,libxmu6,libxmu-dev,libxmuu1,libxmuu-dev,libxpm4,libxpm-dev,libxrandr2,libxrandr-dev,libxrender1,libxrender-dev,libxres1,libxres-dev,libxss1,libxss-dev,libxt6,libxt-dev,libxtst6,libxtst-dev,libxv1,libxv-dev,libxxf86dga1,libxxf86dga-dev,libxxf86vm1,libxxf86vm-dev|exe,dev,doc,nls| #jaunty, restored libdrm... added libxtrap... w463 added libxxf86dga... w464 added libxres.
+yes|xorg_dri|libgl1-mesa-dri,mesa-utils|exe,dev,doc,nls|
 no|xsane|xsane,xsane-common|exe,dev>null,doc,nls| #this needs 'libgimp', compiled my own pet pkg without this dep.
 yes|xsane||exe
 no|xserver_xorg|xserver-common,xserver-xorg,xserver-xorg-*,-xserver-xorg-core-dbg|exe,dev,doc,nls
 no|xserver_xorg|xserver-common,xserver-xorg,xserver-xorg-*,-xserver-xorg-video-nouveau,-xserver-xorg-core-dbg,-xserver-xorg-video-*-dbg|exe,dev,doc,nls| #displaylink causes the auto config that ignores xorgwizard
 no|xserver_xorg|xserver-common,xserver-xorg,xserver-xorg-*,-xserver-xorg-core-dbg,-xserver-xorg-video-intel,-xserver-xorg-video-*-dbg|exe,dev,doc,nls| #i took out xserver-xorg-video-intel, now have xf86-video-intel pet pkg.
 no|xserver_xorg|xserver-xorg-dev,xserver-common,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-intel,-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| #xorg hangs with all the server modules (xserver-xorg-server-) (although it works in slackware xorg 7.3, jaunty has xorg 7.4). have reduced the selection here, (note also reduced input modules similar to that in pup412).
-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_lucid||exe,dev,doc,nls
+yes|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
 no|xserver_xvesa||exe
 yes|xsoldier||exe
 yes|xtrans|xtrans-dev|exe>dev,dev,doc,nls
 yes|yad||exe,dev,doc,nls|
 yes|yaf_splash||exe
@@ -688,7 +674,6 @@
 no|you2pup||exe
 no|zfind||exe
 yes|zip|zip|exe,dev>null,doc,nls
 yes|zlib|zlib1g,zlib1g-dev|exe,dev,doc,nls
 no|zmixer||exe
-yes|zzLupu_Utilities||exe
 '

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

@@ -9,7 +9,6 @@
 #The version of the distro whose binary packages were used to build this distro:
 DISTRO_COMPAT_VERSION='precise'
 #the kernel pet package used:
 DISTRO_KERNEL_PET='linux_kernel-3.0.17-pae-i686-unionfs-w5.pet'
 #read by /usr/bin to bypass Xorg Wizard at first boot:
-DISTRO_XORG_AUTO='no'
-DISTRO_TARGETARCH='x86'
+DISTRO_XORG_AUTO='yes'