Check-in [98952ea684]
Not logged in

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

Overview

SHA1 Hash:98952ea68419896d162dc31e525555f3e17083e7
Date: 2012-10-09 21:36:01
User: BarryK
Comment:fix for earlier fix for builtin pkgs files-list for ubuntu/debian multiarch, see 3builddistro

Tags And Properties
Changes

Changes to woof-code/3builddistro

@@ -135,11 +135,11 @@
 #120831 simplify repo-list radiobuttons for ppm.
 #120903 default radeon kms on again.
 #120909 multiarch support for /usr/bin. (see also 2createpackages).
 #120922 was getting "nv" listing twice (precise puppy) for xorg drivers-alternate.
 #120925 ignore debian/ubuntu multiarch circular symlink (these are create by 2createpackages), when creating builtin_files lists.
-
+#121010 fix for 120925.
 
 #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
 
@@ -2146,26 +2146,32 @@
  ogPATTERN="s%^\\.\\./packages-${DISTRO_FILE_PREFIX}/${ONEGENNAME}/%/%"
  find $ONEGENDIR | sed -e "$ogPATTERN" | sort > /tmp/0builtin_files_${DISTRO_FILE_PREFIX}-${DISTRO_VERSION}/${ONEGENNAME}.files
  sync
  #store the information more efficiently...
  mkdir -p 0builtin_files_${DISTRO_FILE_PREFIX}-${DISTRO_VERSION}/root/.packages/builtin_files
- PREVPATH=''
+ PREVPATH=''; PREVPATH0=''
  cat /tmp/0builtin_files_${DISTRO_FILE_PREFIX}-${DISTRO_VERSION}/${ONEGENNAME}.files |
  while read ONELINE
  do
   [ "`echo "$ONELINE" | cut -c 1`" == "." ] && continue #catch ex: ../packages-qrky/abiword
   if [ -d "rootfs-complete${ONELINE}" ];then
    #120925 ignore debian/ubuntu multiarch circular symlink (these are create by 2createpackages)...
-   [ -h "rootfs-complete${ONELINE}" ] && [ "$(readlink "rootfs-complete${ONELINE}")" = "./" ] && continue
+   if [ -h "rootfs-complete${ONELINE}" ];then
+    if [ "$(readlink "rootfs-complete${ONELINE}")" = "./" ];then
+     PREVPATH0="$(dirname "$ONELINE")" #121010 fix, missing some files.
+     [ "$PREVPATH0" != "$PREVPATH" ] && echo "$PREVPATH0" >> 0builtin_files_${DISTRO_FILE_PREFIX}-${DISTRO_VERSION}/root/.packages/builtin_files/${ONEGENNAME} #121010
+     continue
+    fi
+   fi
    PREVPATH="$ONELINE"
    echo "$ONELINE" >> 0builtin_files_${DISTRO_FILE_PREFIX}-${DISTRO_VERSION}/root/.packages/builtin_files/${ONEGENNAME}
   else
    NEWPATH="`dirname "$ONELINE"`"
    [ "$NEWPATH" == "/" ] && continue #ignore top-level files.
    NEWFILE="`basename "$ONELINE"`"
    if [ -e "rootfs-complete${ONELINE}" ];then #sanity check.
-    if [ "$PREVPATH" == "$NEWPATH" ];then #sanity check.
+    if [ "$PREVPATH" == "$NEWPATH" -o "$PREVPATH0" == "$NEWPATH" ];then #sanity check. 121010
      echo " ${NEWFILE}" >> 0builtin_files_${DISTRO_FILE_PREFIX}-${DISTRO_VERSION}/root/.packages/builtin_files/${ONEGENNAME}
     fi
    fi
   fi
  done

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

@@ -1,10 +1,10 @@
 align-1.7.1|align|1.7.1||BuildingBlock|40K||align-1.7.1.pet|+perl_tiny|align text into columns||||
 bones-0.2.2|bones|0.2.2||Develop|44K||bones-0.2.2.pet|+gtkdialog3,+openssh,+wget,+gftp,+xdelta3|simple project version control||||
 cpu-scaling-ondemand-1.3-3|cpu-scaling-ondemand|1.3-3||Setup|60K||cpu-scaling-ondemand-1.3-3.pet|+gtkdialog3|CPU Frequency Scaling Tool||||
 cups_pdf-0.8-1|cups_pdf|0.8-1||BuildingBlock|80K||cups_pdf-0.8-1.pet|+cups|print to pdf file||||
-defaults-chooser-0.8|defaults-chooser|0.8||Setup|56K||defaults-chooser-0.8.pet|+gtkdialog|Default Applications Chooser||||
+defaults-chooser-0.8-20120522|defaults-chooser|0.8-20120522||Setup|72K||defaults-chooser-0.8-20120522.pet|+gtkdialog,+xdialog|Default Applications Chooser, created by sc0ttman, internationalized by shinobar||||
 desk_background_precise-1.0|desk_background_precise|1.0||Desktop|144K||desk_background_precise-1.0.pet||wallpaper (desktop background) collection for Precise Puppy||||
 desk_background_racy1-1.0|desk_background_racy1|1.0||Desktop|412K||desk_background_racy1-1.0.pet||desktop background images for Racy Puppy||||
 desk_background_raspup1-1.0|desk_background_raspup1|1.0||Desktop|52K||desk_background_raspup1-1.0.pet||background image for Puppy running in the Raspberry Pi arm board||||
 desk_background_wary0-1.0|desk_background_wary0|1.0||Desktop|220K||desk_background_wary0-1.0.pet||wallpaper (desktop background) collection for Wary Puppy||||
 desk_background_wary1-1.0|desk_background_wary1|1.0||Desktop|556K||desk_background_wary1-1.0.pet||desktop background images for Wary Puppy||||
@@ -33,11 +33,10 @@
 firmware_linux_module_b43legacy-20120920|firmware_linux_module_b43legacy|20120920||BuildingBlock|180K||firmware_linux_module_b43legacy-20120920.pet||firmware and support files files for kernel module b43legacy||||
 firmware_linux_module_brcm-20120920|firmware_linux_module_brcm|20120920||BuildingBlock|1244K||firmware_linux_module_brcm-20120920.pet||firmware and support files for kernel modules brcmfmac.ko, brcmsmac.ko, bcma.ko||||
 firmware_linux_module_dgcmodem-1.13-20120920|firmware_linux_module_dgcmodem|1.13-20120920||BuildingBlock|116K||firmware_linux_module_dgcmodem-1.13-20120920.pet||kernel-independent DGC modem driver components, created by rerwin||||
 firmware_linux_module_hsfmodem-7.80.02.06-20120920|firmware_linux_module_hsfmodem|7.80.02.06-20120920||BuildingBlock|830K||firmware_linux_module_hsfmodem-7.80.02.06-20120920.pet||HSF modem kernel-independent interfaces & data, pet created by rerwin||||
 firmware_linux_module_wl-20120920|firmware_linux_module_wl|20120920||BuildingBlock|36K||firmware_linux_module_wl-20120920.pet||firmware and support files for kernel module wl.ko||||
-getflash-1.1|getflash|1.1||Internet|56K||getflash-1.1.pet||GetFlash Install Flashplayer||||
 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||||
@@ -124,10 +123,11 @@
 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-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||||
+vlc-gtk-2.5.4|vlc-gtk|2.5.4||Multimedia|212K||vlc-gtk-2.5.4.pet|+gtkdialog,+rtmpdump,+vlc_nogui,+xdotools|VLC-gtk - simple VLC frontend||||
 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||||
 xlock_gui-0.2-6|xlock_gui|0.2-6||Desktop|68K||xlock_gui-0.2-6.pet|+xlockmore|screen lock and screensaver||||

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

@@ -107,10 +107,11 @@
 galculator-1.3.4-i486|galculator|1.3.4-i486||Business|548K||galculator-1.3.4-i486.pet||Perform simple and scientific calculations|slackware|13.1||
 gcolor2-0.4|gcolor2|0.4||Graphic|68K||gcolor2-0.4.pet|+gtk+|color chooser and picker|puppy|4||
 gdmap-0.8.0|gdmap|0.8.0||Filesystem|56K||gdmap-0.8.0.pet|+gtk+|Visual map disk usage|puppy|4||
 getcurpos-2007|getcurpos|2007||BuildingBlock|3K||getcurpos-2007.pet||reads mouse cursor coords|puppy|4||
 getdir-2006|getdir|2006||BuildingBlock|14K||getdir-2006.pet||no description|puppy|4||
+getflash-1.2|getflash|1.2||Internet|56K||getflash-1.2.pet||GetFlash Install Flashplayer||||
 gexec-0.4-pup1|gexec|0.4-pup1||Utility|40K||gexec-0.4-pup1.pet|+gtk+|commandline|puppy|4||
 gfnrename-0.5|gfnrename|0.5||Filesystem|120K||gfnrename-0.5.pet|+gtk+|batch file renamer|puppy|4||
 gfontsel-1.0.0|gfontsel|1.0.0||Desktop|28K||gfontsel-1.0.0.pet|+gtk+|font viewer|puppy|4||
 ghostscript-8.15.4-q1|ghostscript|8.15.4-q1||BuildingBlock|6824K||ghostscript-8.15.4-q1.pet|+cups|postscript render and printing|t2|8.0rc||
 ghostscript-8.15.4-w5|ghostscript|8.15.4-w5||BuildingBlock|6820K||ghostscript-8.15.4-w5.pet||PostScript and PDF language interpreter and previewer|puppy|wary5||
@@ -305,10 +306,11 @@
 replaceit-1.0.0|replaceit|1.0.0||BuildingBlock|32K||replaceit-1.0.0.pet||text replacement in a file|puppy|4||
 retrovol-0.12|retrovol|0.12||Multimedia|128K||retrovol-0.12.pet|+gtk+,+alsa-lib|Retrovol sound mixer and tray applet|puppy|||
 rox_filer-20111022-patched3-w5c|rox_filer|20111022-patched3-w5c||Filesystem|1464K||rox_filer-20111022-patched3-w5c.pet|+gtk+|ROX-Filer file manager, note compiled in Wary 5.3 but should work all puppies|puppy|wary5||
 rpl-1.4.1|rpl|1.4.1||BuildingBlock|48K||rpl-1.4.1.pet||cli utility, text replacement in a file|puppy|4||
 rp_pppoe_cli-3.8-patched2-2-p4|rp_pppoe_cli|3.8-patched2-2-p4||Network|448K||rp_pppoe_cli-3.8-patched2-2-p4.pet||roaring penguin pppoe internet connection|puppy|4||
+rtmpdump-2.4-i486|rtmpdump|2.4-i486||BuildingBlock|200K||rtmpdump-2.4-i486.pet||rtmp stream library||||
 rxvt-unicode-9.05-1|rxvt-unicode|9.05-1||Utility|||rxvt-unicode-9.05-1.pet||terminal emulator, compatible with rxvt, supports unicode|puppy|4||
 samba_client-3.0.37|samba_client|3.0.37||BuildingBlock|1008K||samba_client-3.0.37.pet||samba client utilities, note, compiled in slackware 13.1 but should work in all puppies||||
 samba_mount_cifs-3.0.37-s131|samba_mount_cifs|3.0.37-s131||BuildingBlock|48K||samba_mount_cifs-3.0.37-s131.pet||mount.cifs and umount.cifs from samba package|slackware|13.1||
 scale2x-2.0|scale2x|2.0||Graphic|68K||scale2x-2.0.pet||PNG image scaling utility|puppy|4||
 scanpci-0.10.3|scanpci|0.10.3||BuildingBlock|24K||scanpci-0.10.3.pet|+libpciaccess|Scans and reports on the PCI bus||||
@@ -378,10 +380,11 @@
 xclip-0.10|xclip|0.10||BuildingBlock|60K||xclip-0.10.pet||copy/paste x-selection and clipboard from script|puppy|4||
 xcur2png-0.7.0-p4|xcur2png|0.7.0-p4||BuildingBlock|28K||xcur2png-0.7.0-p4.pet||converter cursor image to png|puppy|4||
 xdelta-30p-w5|xdelta|30p-w5||BuildingBlock|108K||xdelta-30p-w5.pet||Opensource binary diff deltadifferential compression tools|puppy|wary5||
 xdg_puppy-0.7.6-15-binaries_only-p4|xdg_puppy|0.7.6-15-binaries_only-p4||BuildingBlock|328K||xdg_puppy-0.7.6-15-binaries_only-p4.pet||essential XDG utilities developed by rarsa, binary executables only, /etc/xdg and /usr/share/desktop-directories moved to Woof|puppy|4||
 xdialog-2.3.1.pup2|xdialog|2.3.1.pup2||BuildingBlock|70K||xdialog-2.3.1.pup2.pet|+gtk+|gui frontend for scripts|puppy|||
+xdotool-2.201012.3049|xdotool|2.201012.3049||BuildingBlock|152K||xdotool-2.201012.3049.pet||automation tool|puppy|4||
 xdriinfo-1.0.4-x86|xdriinfo|1.0.4-x86||BuildingBlock|20K||xdriinfo-1.0.4-x86.pet|+xorg,+mesa|query configuration information of X11 DRI drivers, used by sys-info|puppy|||
 xdriinfo_DOC-1.0.4-x86|xdriinfo_DOC|1.0.4-x86||BuildingBlock|24K||xdriinfo_DOC-1.0.4-x86.pet||query configuration information of X11 DRI drivers, used by sys-info||||
 xlock_gui-0.2-4|xlock_gui|0.2-4||Desktop|60K||xlock_gui-0.2-4.pet|+xlockmore|screen lock and screensaver||||
 xlockmore-5.31-w1|xlockmore|5.31-w1||BuildingBlock|212K||xlockmore-5.31-w1.pet|+xorg_base|screen lock and screensaver|t2|8.0rc||
 xz-4.999.9beta-124-gb637-q1|xz|4.999.9beta-124-gb637-q1||BuildingBlock|280K|pet_packages-quirky|xz-4.999.9beta-124-gb637-q1.pet||file compression/decompression utilities|t2|8.0rc|official|

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

@@ -1240,11 +1240,10 @@
 videoproto-2.2.2-w5c|videoproto|2.2.2-w5c||BuildingBlock|8K||videoproto-2.2.2-w5c.pet||Video extension headers|puppy|wary5||
 videoproto_DEV-2.2.2-w5c|videoproto_DEV|2.2.2-w5c||BuildingBlock|76K||videoproto_DEV-2.2.2-w5c.pet|+videoproto|Video extension headers|puppy|wary5||
 vim-7.3-bk1-w5|vim|7.3-bk1-w5||Document|21748K||vim-7.3-bk1-w5.pet|+gtk+|gVim powerful text editor, includes code-to-html converter, plus much more|puppy|wary5||
 vim_DOC-7.3-bk1-w5|vim_DOC|7.3-bk1-w5||Document|6344K||vim_DOC-7.3-bk1-w5.pet||powerful text editor||||
 vlc-1.1.5-w5|vlc|1.1.5-w5||Multimedia|8208K||vlc-1.1.5-w5.pet|+qt4,+xcb-util|VLC multimedia player|puppy|wary5||
-vlc-gtk-2.3|vlc-gtk|2.3||Multimedia|156K||vlc-gtk-2.3.pet|+xdotool,+vlc_nogui,+gtkdialog3|VLC-gtk media player, very small gui frontend for vlc_nogui pkg||||
 vlc_NLS-1.1.5-w5|vlc_NLS|1.1.5-w5||Multimedia|20260K||vlc_NLS-1.1.5-w5.pet|+vlc|VLC multimedia player||||
 vlc_nogui-1.1.5-w5|vlc_nogui|1.1.5-w5||Multimedia|5404K||vlc_nogui-1.1.5-w5.pet|+xcb-util|VLC multimedia player, no GUI  -- use vlc-gtk pkg for GUI|puppy|wary5||
 VLC_Plus_Extras-1.1.5-i386|VLC_Plus_Extras|1.1.5-i386||Multimedia|15224K||VLC_Plus_Extras-1.1.5-i386.pet|+qt4|VLC media player, compiled by ttuuxxx with extra libs to support more media formats|puppy|wary5||
 vlock-1.4-w5c|vlock|1.4-w5c||Utility|28K||vlock-1.4-w5c.pet||Virtual console locker|puppy|wary5||
 vlock_DOC-1.4-w5c|vlock_DOC|1.4-w5c||Utility|24K||vlock_DOC-1.4-w5c.pet||Virtual console locker|puppy|wary5||

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

@@ -570,10 +570,11 @@
 yes|picocom|picocom|exe,dev,doc,nls
 yes|picpuz||exe
 yes|picscale||exe|
 yes|pixman|libpixman-1-0,libpixman-1-dev|exe,dev,doc,nls
 yes|pkgconfig|pkg-config|exe>dev,dev,doc,nls
+yes|planner||exe,dev,doc,nls|pet:wary5
 yes|pmetatagger||exe
 yes|pmirror||exe
 yes|pmirrorget||exe
 yes|pmusic||exe
 yes|pmusic_tray||exe,dev,doc,nls