Check-in [2d457e4d22]
Not logged in

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

Overview

SHA1 Hash:2d457e4d22e5ea41d6a310d9767aff98d2b2736c
Date: 2012-08-18 10:05:43
User: BarryK
Comment:updated db lists to use xdg_puppy pet with binary executables only (other components are now in Woof)

Tags And Properties
Changes

Changes to woof-code/rootfs-skeleton/pinstall.sh

@@ -6,10 +6,11 @@
 #Keywords are located in the Help page and the lines uncommented.
 #DISTRO_VERSION, DISTRO_NAME are global variables visible here.
 #110422 DISTRO_VERSION variable now has dotted format. note, also now using full dotted version# in puppy filenames.
 #120225 create symlink release-notes.htm to actual release-notes file. NO.
 #120225 backup doc files, refer /usr/sbin/indexgen.sh.
+#120818 now have /etc/xdg in Woof, taken out of xdg_puppy PET, relocated pinstall.sh to here.
 
 WKGDIR="`pwd`"
 
 echo "Configuring Puppy skeleton..."
 
@@ -54,7 +55,35 @@
 #ln -snf release-${cutDISTRONAME}-${DISTRO_VERSION}.htm usr/share/doc/release-notes.htm #120225
 
 #echo "The default kernel for Puppy is vmlinuz."
 echo -n "vmlinuz" > /tmp/vmlinuzforpup.txt
 #note, createpuppy will read this.
+
+#120818 now have /etc/xdg in Woof, taken out of xdg_puppy PET, relocated pinstall.sh to here...
+#this code is to fix the icewm menu...
+if [ "`find ./usr/local/bin ./usr/bin ./usr/sbin ./usr/X11R7/bin -maxdepth 1 -type f -name evilwm`" = "" ];then
+ grep -v ' evilwm$' ./etc/xdg/templates/_root_.icewm_menu > /tmp/_root_.icewm_menu
+ mv -f /tmp/_root_.icewm_menu ./etc/xdg/templates/
+fi
+if [ "`find ./usr/local/bin ./usr/bin ./usr/sbin ./usr/X11R7/bin -maxdepth 1 -type f -name fluxbox`" = "" ];then
+ grep -v ' fluxbox$' ./etc/xdg/templates/_root_.icewm_menu > /tmp/_root_.icewm_menu
+ mv -f /tmp/_root_.icewm_menu ./etc/xdg/templates/
+fi
+if [ "`find ./usr/local/bin ./usr/bin ./usr/sbin ./usr/X11R7/bin -maxdepth 1 -type f -name fvwm95`" = "" ];then
+ grep -v ' fvwm95$' ./etc/xdg/templates/_root_.icewm_menu > /tmp/_root_.icewm_menu
+ mv -f /tmp/_root_.icewm_menu ./etc/xdg/templates/
+fi
+if [ "`find ./usr/local/bin ./usr/bin ./usr/sbin ./usr/X11R7/bin -maxdepth 1 -type f -name jwm`" = "" ];then
+ grep -v ' jwm$' ./etc/xdg/templates/_root_.icewm_menu > /tmp/_root_.icewm_menu
+ mv -f /tmp/_root_.icewm_menu ./etc/xdg/templates/
+fi
+if [ "`find ./usr/local/bin ./usr/bin ./usr/sbin ./usr/X11R7/bin -maxdepth 1 -type f -name pwm`" = "" ];then
+ grep -v ' pwm$' ./etc/xdg/templates/_root_.icewm_menu > /tmp/_root_.icewm_menu
+ mv -f /tmp/_root_.icewm_menu ./etc/xdg/templates/
+fi
+if [ "`find ./usr/local/bin ./usr/bin ./usr/sbin ./usr/X11R7/bin -maxdepth 1 -type f -name xfce4-session`" = "" ];then
+ grep -v ' xfce4-session$' ./etc/xdg/templates/_root_.icewm_menu > /tmp/_root_.icewm_menu
+ mv -f /tmp/_root_.icewm_menu ./etc/xdg/templates/
+fi
+
 
 #end#

Changes to woof-distro/arm/Packages-puppy-armv6-official

@@ -244,11 +244,11 @@
 xclip-0.12-armv6|xclip|0.12-armv6||Utility|44K||xclip-0.12-armv6.pet||cli utility for clipboard copy and paste|puppy|||
 xclip_DOC-0.12-armv6|xclip_DOC|0.12-armv6||Utility|32K||xclip_DOC-0.12-armv6.pet||clipboard copy and paste utility||||
 xcur2png-0.7.0-armv6|xcur2png|0.7.0-armv6||BuildingBlock|32K||xcur2png-0.7.0-armv6.pet||convert cursor image to png|puppy|||
 xcur2png_DOC-0.7.0-armv6|xcur2png_DOC|0.7.0-armv6||BuildingBlock|24K||xcur2png_DOC-0.7.0-armv6.pet||convert cursor image to png||||
 xdelta-30p-armv6|xdelta|30p-armv6||BuildingBlock|108K||xdelta-30p-armv6.pet||Opensource binary diff deltadifferential compression tools|puppy|||
-xdg_puppy-0.7.6-14-armv6|xdg_puppy|0.7.6-14-armv6||BuildingBlock|328K||xdg_puppy-0.7.6-14-armv6.pet||essential XDG utilities developed by rarsa, -13 has internationalization support|puppy|||
+xdg_puppy-0.7.6-15-binaries_only-armv6|xdg_puppy|0.7.6-15-binaries_only-armv6||BuildingBlock|328K||xdg_puppy-0.7.6-15-binaries_only-armv6.pet||essential XDG utilities developed by rarsa, binary executables only, /etc/xdg and /usr/share/desktop-directories moved to Woof|puppy|||
 xdialog-2.3.1-patched20090721-armv6|xdialog|2.3.1-patched20090721-armv6||BuildingBlock|70K||xdialog-2.3.1-patched20090721-armv6.pet|+gtk+|gui frontend for scripts||||
 xdialog_DOC-2.3.1-patched20090721-armv6|xdialog_DOC|2.3.1-patched20090721-armv6||BuildingBlock|696K||xdialog_DOC-2.3.1-patched20090721-armv6.pet||gui for shell scripts||||
 xdialog_NLS-2.3.1-patched20090721-armv6|xdialog_NLS|2.3.1-patched20090721-armv6||BuildingBlock|172K||xdialog_NLS-2.3.1-patched20090721-armv6.pet|+xdialog|gui for shell scripts||||
 xdriinfo-1.0.4-sap6|xdriinfo|1.0.4-sap6||BuildingBlock|20K||xdriinfo-1.0.4-sap6.pet|+xorg,+mesa|query configuration information of X11 DRI drivers, used by sys-info|debian|squeeze||
 xdriinfo_DOC-1.0.4-sap6|xdriinfo_DOC|1.0.4-sap6||BuildingBlock|24K||xdriinfo_DOC-1.0.4-sap6.pet||query configuration information of X11 DRI drivers, used by sys-info||||

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

@@ -373,11 +373,11 @@
 woo-ff-0.1.1|woo-ff|0.1.1||Multimedia|48K||woo-ff-0.1.1.pet|+ffmpeg,+gtkdialog3|woo-ff - multimedia converter||||
 xarchive-0.2.8.6.i18n-w5c|xarchive|0.2.8.6.i18n-w5c||Setup|212K||xarchive-0.2.8.6.i18n-w5c.pet|+gtk+|XArchive archiver, internationalised by rodin.s||||
 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-14-p4|xdg_puppy|0.7.6-14-p4||BuildingBlock|328K||xdg_puppy-0.7.6-14-p4.pet||essential XDG utilities developed by rarsa, -13 has internationalization support|puppy|4||
+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|||
 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||