Check-in [baff2d1b29]
Not logged in

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

Overview

SHA1 Hash:baff2d1b2975cf59ae540f2865f1773bff5fc631
Date: 2012-09-09 20:10:42
User: BarryK
Comment:various fixes. getting ready to build precise beta6

Tags And Properties
Changes

Changes to woof-code/0setup

@@ -13,10 +13,11 @@
 #120719 support raspbian. fix debian db format change.
 #120804 fix when only have pkgname_DEV, no pkgname.
 #120812 db category now allows optional subcategory (for which an icons exists in /usr/local/lib/X11/mini-icons).
 #120815 for debian, ubuntu, use the generic name provided in the $DB_path, instead of $Package, for find_cat.
 #120825 debian/ubuntu/raspbian: merge -updates dbs.
+#120909 moved exit-point when running in puppy.
 
 export LANG=C #faster.
 
 if [ -f ./DISTRO_SPECS ];then
 . ./DISTRO_SPECS
@@ -485,20 +486,10 @@
  sort --field-separator='|' --key=1 ${ONE_PKGLISTS_COMPAT} > /tmp/$PKGLISTFILE
  mv -f /tmp/$PKGLISTFILE ${ONE_PKGLISTS_COMPAT}
 done
 echo
 
-if [ "$RUNNINGPUP" = "yes" ];then
- echo
- echo "FINISHED"
- echo "After returning to the main GUI window of the package manager,"
- echo "it will be reading the updated database files."
- echo -n "Press ENTER key to exit: "
- read enditnow
- exit
-fi
-
 ####################################
 #120825 merge updates into original db files...
 if [ "$DBUPDATEFLAG" ];then
  for ONE_PKGLISTS_COMPAT in $PKGLISTS_COMPAT
  do
@@ -512,10 +503,22 @@
   #...assumes pkg names remain the same, ex "firefox" (2nd field in db).
   mv -f $PKGUPDATES /tmp/$PKGUPDATES #dump -updates db file.
  done
 fi
 sync
+
+#120909 moved down...
+if [ "$RUNNINGPUP" = "yes" ];then
+ echo
+ echo "FINISHED"
+ echo "After restarting Puppy Package Manager (PPM),"
+ echo "it will be reading the updated database files."
+ echo -n "Press ENTER key to exit: "
+ read enditnow
+ exit
+fi
+
 
 ####################################
 #extract all the package names of compat-distro, without version info...
 PKGNAMES="`cat $PKGLISTS_COMPAT | cut -f 1,2,3 -d '|'`"
 #...on separate lines, ex: gdb-6.8 gdbm-1.8.3 genpower-1.0.5

Changes to woof-code/2createpackages

@@ -35,10 +35,11 @@
 #120720 raspbian wheezy has files in /lib/arm-linux-gnueabihf and /usr/lib/arm-linux-gnueabihf
 #120721 support ubuntu and debian arm multiarch.
 #120812 db category now allows optional subcategory (for which an icons exists in /usr/local/lib/X11/mini-icons).
 #120818 Categories management improved. pkg db now has category[;subcategory] (see 0setup), xdg enhanced (see /etc/xdg and /usr/share/desktop-directories), and generic icons for all subcategories (see /usr/local/lib/X11/mini-icons).
 #120824 UPKGVERSION variable is no longer used.
+#120909 support multiarch for /usr/bin.
 
 export LANG=C #faster.
 
 . /etc/xdg/menus/hierarchy #w478 has PUPHIERARCHY variable.
 
@@ -432,10 +433,17 @@
      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
+     #120909 add /usr/bin...
+     if [ -d sandbox2/usr/bin/$ARCHDIR ];then
+      cp -a -f --remove-destination sandbox2/usr/bin/${ARCHDIR}/* sandbox2/usr/bin/
+      sync
+      rm -rf sandbox2/usr/bin/${ARCHDIR}
+      ln -s ./ sandbox2/usr/bin/${ARCHDIR}
      fi
     fi
    ;;
    slackware)
     #100617 add support for .txz...

Changes to woof-code/3builddistro

@@ -132,10 +132,11 @@
 #120723 BOOT_DISABLEXORGWIZARD variable.
 #120724 'alsaconf' does not work on arm boards, BOOT_DISABLEALSACONF variable. refer /usr/sbin/alsawizard.
 #120830 my hunspell-en-us pet has pinstall.sh that creates symlinks of en_US.aff and en_US.dic from seamonkey and firefox. however, need to do this thoroughly.
 #120831 simplify repo-list radiobuttons for ppm.
 #120903 default radeon kms on again.
+#120909 multiarch support for /usr/bin. (see also 2createpackages).
 
 #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
 
@@ -449,10 +450,11 @@
   ;;
  esac
  if [ "$ARCHDIR" ];then #ex: i386-linux-gnu
   ln -snf ./ sandbox3/rootfs-complete/lib/${ARCHDIR}
   ln -snf ./ sandbox3/rootfs-complete/usr/lib/${ARCHDIR}
+  ln -snf ./ sandbox3/rootfs-complete/usr/bin/${ARCHDIR} #120909
  fi
 fi
 
 PKGLIST="`echo "$PKGS_SPECS_TABLE" | grep '^yes' | cut -f 2 -d '|' | tr '\n' ' '`"
 for ONEPKG in $PKGLIST

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

@@ -14,11 +14,11 @@
 #120515 common code from pkg_chooser.sh, findnames.sh, filterpkgs.sh, extracted to /usr/local/petget/postfilterpkgs.sh.
 #120529 fix if icon name appended each line.
 #120811 category field now supports sub-category |category;subcategory|, use as icon in ppm main window.
 #120819 fix for 120811.
 #120827 search may find pkgs that are already installed, mark with mini-tick icon.
-#120908 need version field.
+#120908 need version field. (used in show_installed_version_diffs.sh). 120909 bug fix.
 
 #puppy package database format:
 #pkgname|nameonly|version|pkgrelease|category|size|path|fullfilename|dependencies|description|compileddistro|compiledrelease|repo|
 #...'compileddistro|compiledrelease' (fields 11,12) identify where the package was compiled.
 
@@ -141,10 +141,13 @@
   mv -f /tmp/petget/filterpkgs.resultsxxx /tmp/petget/filterpkgs.results
  fi
 fi
 
 if [ "$FNDIT" = "no" ];then
+ #120909 these files may have been created at previous search, it will upset show_installed_version_diffs.sh if still exist...
+ [ -f /tmp/petget/filterpkgs.results.installed ] && rm -f /tmp/petget/filterpkgs.results.installed
+ [ -f /tmp/petget/filterpkgs.results.notinstalled ] && rm -f /tmp/petget/filterpkgs.results.notinstalled
  pupmessage -bg red -center -title "$(gettext 'PPM find')" "$(gettext 'Sorry, no matching package name')" & #110223 run as separate process.
 else
 
  #120827 search may find pkgs that are already installed...
  if [ -f /tmp/petget_installed_patterns_all ];then #precaution.

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

@@ -67,11 +67,11 @@
   MSG1=$(gettext "This package will install files under")
   MSG2=$(gettext "It can be dangerous to install files under '/mnt' because it depends on the profile of installation.")
   MSG3=""
   if grep -q '^/mnt/home' "$FILELIST"; then
     if [ $PUPMODE -eq 5 ]; then
-      MSG3=$(gettext "You are running Puppy without 'pupsave', and '/mnt/home' does not exists. In this case, you can use the RAM for this space, but strongly recommended to shutdown now to create 'pupsave' BEFORE installing these packages.")
+      MSG3=$(gettext "You are running Puppy without 'pupsave', and '/mnt/home' does not exist. In this case, you can use the RAM for this space, but strongly recommended to shutdown now to create 'pupsave' BEFORE installing these packages.")
       MSG3="$MSG3\\n$(gettext "NOTE: You can install this package for a tentative use, then do NOT make 'pupsave' with this package installed.")"
     fi
     DIRECTSAVEPATH=""
   fi
   # dialog

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

@@ -111,11 +111,11 @@
 shared-mime-info_DEV-0.70-6|shared-mime-info_DEV|0.70-6||BuildingBlock|3772K||shared-mime-info_DEV-0.70-6.pet|+shared-mime-info|mime information||||
 shareinternet-2.2.4-1|shareinternet|2.2.4-1||Network|136K||shareinternet-2.2.4-1.pet|+gtkdialog3,+dnsmasq|run puppy as a router||||
 simple_wall_set-0.6-noarch|simple_wall_set|0.6-noarch||Desktop|80K||simple_wall_set-0.6-noarch.pet|+gtkdialog4|SWS simple wallpaper setter||||
 snap2-4.21|snap2|4.21||Utility|152K||snap2-4.21.pet|+rsync|Snap2 snapshot backup||||
 ssh_gui-0.7.1-1-p4|ssh_gui|0.7.1-1-p4||Internet|40K||ssh_gui-0.7.1-1-p4.pet|+gtk+,+openssh_client|secure telnet gui|puppy|4||
-sys-info-1.3|sys-info|1.3||System|148K||sys-info-1.3.pet|+xdriinfo,+xorg|System Information and Video Report, created by TaZoc||||
+sys-info-1.3-1|sys-info|1.3-1||System|148K||sys-info-1.3-1.pet|+xorg|System Information and Video Report, created by TaZoc||||
 usb-modeswitch-data-20120815|usb-modeswitch-data|20120815||BuildingBlock|297K||usb-modeswitch-data-20120815.pet||mode switcher data base||||
 wallpaper-0.6.1-1|wallpaper|0.6.1-1||Desktop|116K||wallpaper-0.6.1-1.pet|+gtkdialog4|Set backdrop image||||
 wcpufreq-0.8|wcpufreq|0.8||System|53K||wcpufreq-0.8.pet||CPU Frequency Scaling Tool||||
 woo-ff-0.1.1|woo-ff|0.1.1||Multimedia|48K||woo-ff-0.1.1.pet|+ffmpeg,+gtkdialog3|woo-ff - multimedia converter||||
 xkbconfigmanager-1.1-1|xkbconfigmanager|1.1-1||Desktop|144K||xkbconfigmanager-1.1-1.pet|+xorg|xorg keyboard manager||||

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

@@ -673,11 +673,11 @@
 yes|xclip||exe,dev,doc,nls
 yes|xcur2png||exe,dev,doc,nls
 yes|xdelta||exe,dev,doc,nls
 yes|xdg_puppy||exe,dev,doc,nls
 yes|xdialog||exe,dev,doc,nls
-yes|xdriinfo||exe,dev,doc,nls| #needed by sys-info.
+no|xdriinfo||exe,dev,doc,nls| #needed by sys-info. no more.
 no|xfce4-battery-plugin|xfce4-battery-plugin|exe,dev,doc,nls
 no|xfce4-clipman-plugin|xfce4-clipman-plugin|exe,dev,doc,nls
 no|xfce4-cpugraph-plugin|xfce4-cpugraph-plugin|exe,dev,doc,nls
 no|xfce4-fsguard-plugin|xfce4-fsguard-plugin|exe,dev,doc,nls
 no|xfce4-genmon-plugin|xfce4-genmon-plugin|exe,dev,doc,nls

Changes to woof-distro/arm/raspbian/wheezy/DISTRO_PKGS_SPECS-raspbian-wheezy

@@ -702,11 +702,11 @@
 yes|xclip|xclip|exe,dev,doc,nls
 yes|xcur2png||exe
 yes|xdelta||exe
 yes|xdg_puppy||exe
 yes|xdialog||exe,dev,doc,nls
-yes|xdriinfo||exe,dev,doc,nls| #needed by sys-info.
+no|xdriinfo||exe,dev,doc,nls| #needed by sys-info. no more.
 no|xemeraldia||exe
 no|xf86-video-intel||exe,dev,doc,nls
 no|xfce4-battery-plugin|xfce4-battery-plugin|exe,dev,doc,nls
 no|xfce4-clipman-plugin|xfce4-clipman-plugin|exe,dev,doc,nls
 no|xfce4-cpugraph-plugin|xfce4-cpugraph-plugin|exe,dev,doc,nls

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

@@ -700,11 +700,11 @@
 yes|xclip|xclip|exe,dev,doc,nls
 yes|xcur2png||exe
 yes|xdelta||exe
 yes|xdg_puppy||exe
 yes|xdialog||exe,dev,doc,nls
-yes|xdriinfo||exe,dev,doc,nls| #needed by sys-info.
+no|xdriinfo||exe,dev,doc,nls| #needed by sys-info. no more.
 no|xemeraldia||exe
 no|xf86-video-intel||exe,dev,doc,nls
 no|xfce4-battery-plugin|xfce4-battery-plugin|exe,dev,doc,nls
 no|xfce4-clipman-plugin|xfce4-clipman-plugin|exe,dev,doc,nls
 no|xfce4-cpugraph-plugin|xfce4-cpugraph-plugin|exe,dev,doc,nls

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

@@ -656,11 +656,11 @@
 yes|xclip||exe
 yes|xcur2png||exe
 yes|xdelta||exe
 yes|xdg_puppy||exe
 yes|xdialog||exe,dev,doc,nls
-yes|xdriinfo||exe,dev,doc,nls| #needed by sys-info.
+no|xdriinfo||exe,dev,doc,nls| #needed by sys-info. no more.
 no|xfce4-battery-plugin|xfce4-battery-plugin|exe,dev,doc,nls
 no|xfce4-clipman-plugin|xfce4-clipman-plugin|exe,dev,doc,nls
 no|xfce4-cpugraph-plugin|xfce4-cpugraph-plugin|exe,dev,doc,nls
 no|xfce4-fsguard-plugin|xfce4-fsguard-plugin|exe,dev,doc,nls
 no|xfce4-genmon-plugin|xfce4-genmon-plugin|exe,dev,doc,nls

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

@@ -637,11 +637,11 @@
 yes|xclip||exe|
 yes|xcur2png||exe|
 yes|xdelta||exe|
 yes|xdg_puppy||exe|
 yes|xdialog||exe,dev,doc,nls|
-yes|xdriinfo||exe,dev,doc,nls| #needed by sys-info.
+no|xdriinfo||exe,dev,doc,nls| #needed by sys-info. no more.
 yes|xfdiff-cut||exe|
 yes|xfprot||exe|
 yes|xkbconfigmanager||exe|
 yes|xlock_gui||exe|
 yes|xlockmore||exe| #cutdown pet.

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

@@ -681,11 +681,11 @@
 yes|xcompmgr||exe
 yes|xcur2png||exe
 yes|xdelta||exe
 yes|xdg_puppy||exe
 yes|xdialog||exe,dev,doc,nls
-yes|xdriinfo||exe,dev,doc,nls| #needed by sys-info.
+no|xdriinfo||exe,dev,doc,nls| #needed by sys-info. no more.
 no|xf86-video-nouveau||exe,dev,doc,nls
 yes|xf86-input-synaptics||exe,dev,doc,nls
 no|xf86-video-intel||exe
 no|xf86-video-rdc||exe,dev,doc,nls
 yes|xfdiff-cut||exe

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

@@ -704,12 +704,13 @@
 yes|xclip||exe
 yes|xcur2png||exe
 yes|xdelta||exe
 yes|xdg_puppy||exe
 yes|xdialog||exe,dev,doc,nls
-yes|xdriinfo||exe,dev,doc,nls| #needed by sys-info.
+no|xdriinfo||exe,dev,doc,nls| #needed by sys-info. no more.
 yes|xemeraldia||exe
+yes|xf86-video-nv||exe,dev,doc,nls| #ubuntu no longer has this.
 no|xfce4-battery-plugin|xfce4-battery-plugin|exe,dev,doc,nls
 no|xfce4-clipman-plugin|xfce4-clipman-plugin|exe,dev,doc,nls
 no|xfce4-cpugraph-plugin|xfce4-cpugraph-plugin|exe,dev,doc,nls
 no|xfce4-fsguard-plugin|xfce4-fsguard-plugin|exe,dev,doc,nls
 no|xfce4-genmon-plugin|xfce4-genmon-plugin|exe,dev,doc,nls

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.3.92
+DISTRO_VERSION=5.3.93
 #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:

Changes to woof-distro/x86/ubuntu/precise/Packages-puppy-precise-official

@@ -11,11 +11,12 @@
 seamonkey_DEV-2.9.1-up|seamonkey_DEV|2.9.1-up||BuildingBlock|33504K||seamonkey_DEV-2.9.1-up.pet|+seamonkey|Seamonkey browser suite|ubuntu|precise||
 sylpheed-3.2.0-i686-up|sylpheed|3.2.0-i686-up||Internet;mailnews|1676K||sylpheed-3.2.0-i686-up.pet|+gtk+|E-Mail client|ubuntu|precise||
 sylpheed_DEV-3.2.0-i686-up|sylpheed_DEV|3.2.0-i686-up||Internet;mailnews|3176K||sylpheed_DEV-3.2.0-i686-up.pet|+sylpheed|mail and news client|ubuntu|precise||
 sylpheed_DOC-3.2.0-i686-up|sylpheed_DOC|3.2.0-i686-up||Internet;mailnews|868K||sylpheed_DOC-3.2.0-i686-up.pet||mail and news client||||
 sylpheed_NLS-3.2.0-i686-up|sylpheed_NLS|3.2.0-i686-up||Internet;mailnews|4144K||sylpheed_NLS-3.2.0-i686-up.pet|+sylpheed|mail and news client||||
+xf86-video-nv-2.1.20-i486-up|xf86-video-nv|2.1.20-i486-up||BuildingBlock|224K||xf86-video-nv-2.1.20-i486-up.pet|+xorg|nvidia simple nv xorg driver|ubuntu|precise||
 z_mesa-8.0.3-up|z_mesa|8.0.3-up||BuildingBlock|30720K||z_mesa-8.0.3-up.pet||mesa dri, ati r300 has no kms|ubuntu|precise||
 z_mesa_DEV-8.0.3-up|z_mesa_DEV|8.0.3-up||BuildingBlock|1224K||z_mesa_DEV-8.0.3-up.pet||mesa dri|ubuntu|precise||
 z_xf86-video-ati-6.14.4-nokms-up|z_xf86-video-ati|6.14.4-nokms-up||BuildingBlock|988K||z_xf86-video-ati-6.14.4-nokms-up.pet||xorg driver ati radeon|ubuntu|precise||
 z_xf86-video-ati_DEV-6.14.4-nokms-up|z_xf86-video-ati_DEV|6.14.4-nokms-up||BuildingBlock|48K||z_xf86-video-ati_DEV-6.14.4-nokms-up.pet||xorg driver ati radeon|ubuntu|precise||
 z_xorg_fix_precise-1.11.4-up|z_xorg_fix_precise|1.11.4-up||BuildingBlock|19176K||z_xorg_fix_precise-1.11.4-up.pet|+xorg_base|Precise Pangolin xorg server segfaults, use this recompile. xorg-server 1.11.4, xf86-input-evdev 2.6.0, -synaptics 1.5.0, -keyboard 1.6.0, -mouse 1.7.2|ubuntu|precise||
 z_xorg_fix_precise_DEV-1.11.4-up|z_xorg_fix_precise_DEV|1.11.4-up||BuildingBlock|1640K||z_xorg_fix_precise_DEV-1.11.4-up.pet|+z_xorg_fix_precise|xorg recompile for precise|ubuntu|precise||