Check-in [83fce4bb09]
Not logged in

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

Overview

SHA1 Hash:83fce4bb0974e08c0167e7b984c18f94ea4ce1e3
Date: 2012-08-18 02:36:30
User: BarryK
Comment:improved xdg menu categories, /etc/xdg, /usr/share/desktop-directories created in Woof

Tags And Properties
Changes

Changes to woof-code/rootfs-skeleton/etc/xdg/menus/hierarchy

@@ -1,1 +1,105 @@
+#(c) Copyright Barry Kauler, August 2012, puppylinux.com
+#Licence GPL3 (see /usr/share/doc/legal)
+#the menu hierarchy used in Puppy built from Woof >= 20120816
+#'X-' categories are unofficial, Puppy-specific.
+#note, "Sub" below means no specific sub-category allocated.
+#the first two columns correspond to the category[;subcategory] field in a puppy pkg db entry.
+# if there is no ;subcategory then the "Sub" row applies.
+#XDG-CATEGORIES are Category names to be found in .desktop files.
+#xdg-categories are assigned to menu locations by the .menu files in /etc/xdg/menus
+# -- in addition to XDG-CATEGORIES shown below, they have X-<category>-<subcategory>, for example X-System-storage
+
+PUPHIERARCHY='
+CATEGORY   SUB-CATEGORY    XDG-CATEGORIES                    EXAMPLES
+
+Desktop    :Sub            X-Desktop
+Desktop    :appearance     DesktopSettings                   #desk_icon_theme_browndust gtk_theme_fishpie pwallpaper
+Desktop    :settings       X-DesktopCountry,Accessibility    #pupx xclock xkbconfigmanager
+Desktop    :windows                                          #blackbox e16 fbpanel fluxbox fvwm icewm jwm2 lxpanel
+Desktop    :sleep          Screensaver                       #xlock_gui xlockmore
+Desktop    :applet         X-DesktopApplets                  #gfontsel glipper minixcal xclipboard
+
+System     :Sub            System,HardwareSettings,Core
+System     :process        Monitor,X-SystemSchedule          #asapm lxtask pprocess pschedule
+System     :memory         X-SystemMemory                    #freememapplet_xlib memtest
+System     :print                                            #gtklp hpijs
+System     :storage                                          #gparted
+System     :security       Security
+
+Setup      :Sub                                              #
+Setup      :puppy          X-SetupEntry,PackageManager       #petget
+Setup      :wizard         X-SetupWizard                     #net_setup
+Setup      :installation   X-SetupUtility                    #wakepup2
+
+Utility    :Sub            Utility,Viewer                    #
+Utility    :development    Development,Building,Debugger,IDE,Profiling,Translation,GUIDesigner #anjuta bacon lxrad
+Utility    :package        Archiving                         #pbackup pmirror xarchiver
+Utility    :shell          TerminalEmulator,Shell            #cutecom minicom picocom rxvt
+
+Filesystem :Sub            FileSystem                        #
+Filesystem :filemanager    FileManager                       #gfnrename gwhere mc nautilus rox_filer
+Filesystem :mount          X-FilesystemMount                 #pdrive
+Filesystem :find           X-FilesystemFind                  #pfind zfind
+Filesystem :storage        X-FilesystemUtility               #gdmap
+
+Graphic    :Sub            X-Graphic,2DGraphics,3DGraphics   #
+Graphic    :paint          RasterGraphics                    #mtpaint xpaint
+Graphic    :draw           VectorGraphics                    #inkscape inkscapelite inkview varicad xfig
+Graphic    :flow           Chart,FlowChart,Presentation      #dia
+Graphic    :viewer                                           #eog flphoto fotoxx gimageview gpicview
+Graphic    :camera         Photography                       #gphoto2 gtkam
+Graphic    :scanner                                          #peasyscan xsane
+Graphic    :print                                            #peasyprint
+Graphic    :utility        X-GraphicUtility                  #gcolor2 grabc scale2x
+
+Document   :Sub            X-Document                        #
+Document   :layout         WordProcessor,WebDevelopment      #abiword amaya lyx scribus
+Document   :catalog        Dictionary                        #
+Document   :edit           TextEditor                        #bluefish e3 geany gedit jed joe leafpad medit
+Document   :viewer         X-DocumentUtility                 #epdfview xman xpdf
+
+Business   :Sub            X-Calculate                       #
+Business   :spreadsheet    Spreadsheet                       #gnumeric
+Business   :planner        ProjectManagement                 #planner
+Business   :finance        Finance                           #acct expensetracker grisbi homebank moneymanagerx
+Business   :calc           Calculator,X-CalculateUtility     #calcoo cgtkcalc galculator gmeasures ycalc xcalc
+
+Personal   :Sub            X-Personal                        #
+Personal   :database       ContactManagement                 #dlume
+Personal   :date           Calendar                          #osmo
+Personal   :organizer                                        #didiwiki notecase pplog
+Personal   :security                                         #fpm2
+Personal   :timing         X-PersonalUtility                 #pstopwatch ptimer
+
+Network    :Sub            Network                           #
+Network    :firewall                                         #fwbuilder linux_firewall
+Network    :phone          Dialup                            #gnome-ppp gpptp pppoeconf_pup rp_pppoe_cli wvdial
+Network    :connect        HamRadio,RemoteAccess             #pwireless
+Network    :transfer                                         #file_sharing-curlftpfs-mpscan pure_ftpd
+Network    :utility                                          #
+
+Internet   :Sub            X-Internet                        #
+Internet   :browser        WebBrowser                        #dillo seamonkey
+Internet   :chat           InstantMessaging                  #ayttm pidgin pidgin_perl psip wengophone xchat
+Internet   :mailnews       Email,News                        #fetchmail getmail mailx mozilla-thunderbird pan sendmail sylpheed
+Internet   :transfer       Telephony,IRCClient,FileTransfer,P2P #axel bareftp gcurl gftp lftp ncftp puppy-podcast-grabber pwget
+Internet   :login                                            #ssh_gui
+Internet   :block                                            #adblock
+Internet   :utility                                          #flashplayer gurlchecker
+
+Multimedia :Sub            X-Multimedia,Recorder             #
+Multimedia :mediaplayer    Player                            #amarok amp audacious gecko-mediaplayer gnome-mplayer gxine
+Multimedia :audiovideo     AudioVideo,AudioVideoEditing      #
+Multimedia :sound          Music,Audio,Midi,Mixer,Sequencer  #absvolume absvolume_puppy audacity aumix madplay mhwaveedit sgmixer
+Multimedia :video          Video,Tuner,TV                    #pupdvdtool
+Multimedia :optical        DiskBurning                       #asunder cdw grafburn pburn
+Multimedia :utility                                          #
 
+Fun        :Sub            Game,Amusement,BlocksGame,KidsGame,Simulation,SportsGame #
+Fun        :adventure      ActionGame,AdventureGame,RolePlaying  #lincity
+Fun        :boardgame      BoardGame                         #gnuchess
+Fun        :cardgame       CardGame                          #
+Fun        :puzzle         StrategyGame,LogicGame            #picpuz rubix
+Fun        :shooter                                          #xsoldier
+Fun        :arcade         ArcadeGame                        #
+'

Changes to woof-code/rootfs-skeleton/etc/xdg/menus/puppy-business.menu

@@ -1,1 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xfdesktop-menu PUBLIC "-//freedesktop//DTD Menu 0.8//EN" "http://www.freedesktop.org/standards/menu-spec/menu-0.8.dtd">
+<Menu>
+  <Name>Business</Name>
+  <DefaultAppDirs/>
+  <DefaultDirectoryDirs/>
+  <Directory>Puppy-Business.directory</Directory>
+  <Layout>
+    <Menuname inline="true" inline_limit="99">Business-Sub</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Business-spreadsheet</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Business-planner</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Business-finance</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Business-calc</Menuname>
+   </Layout>
+
+  <Menu>
+    <Name>Business-Sub</Name>
+    <Directory>Puppy-Business-Sub.directory</Directory>
+    <Include>
+      <Category>X-Business</Category>
+      <Category>X-Calculate</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Business-spreadsheet</Name>
+    <Directory>Puppy-Business-spreadsheet.directory</Directory>
+    <Include>
+      <Category>X-Business-spreadsheet</Category>
+      <Category>Spreadsheet</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Business-planner</Name>
+    <Directory>Puppy-Business-planner.directory</Directory>
+    <Include>
+      <Category>X-Business-planner</Category>
+      <Category>ProjectManagement</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Business-finance</Name>
+    <Directory>Puppy-Business-finance.directory</Directory>
+    <Include>
+      <Category>X-Business-finance</Category>
+      <Category>Finance</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Business-calc</Name>
+    <Directory>Puppy-Business-calc.directory</Directory>
+    <Include>
+      <Category>X-Business-calc</Category>
+      <Category>Calculator</Category>
+      <Category>X-CalculateUtility</Category>
+    </Include>
+  </Menu>
 
+</Menu>

Changes to woof-code/rootfs-skeleton/etc/xdg/menus/puppy-calculate.menu

@@ -1,1 +1,1 @@
-
+puppy-business.menu

Changes to woof-code/rootfs-skeleton/etc/xdg/menus/puppy-desktop.menu

@@ -1,1 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xfdesktop-menu PUBLIC "-//freedesktop//DTD Menu 0.8//EN" "http://www.freedesktop.org/standards/menu-spec/menu-0.8.dtd">
+<Menu>
+  <Name>Desktop</Name>
+  <DefaultAppDirs/>
+  <DefaultDirectoryDirs/>
+  <Directory>Puppy-Desktop.directory</Directory>
+  <Layout>
+    <Menuname inline="true" inline_limit="99">Desktop-Sub</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Desktop-appearance</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Desktop-settings</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Desktop-windows</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Desktop-sleep</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Desktop-applet</Menuname>
+  </Layout>
+
+  <Menu>
+    <Name>Desktop-Sub</Name>
+    <Directory>Puppy-Desktop-Sub.directory</Directory>
+    <Include>
+      <Category>X-Desktop</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Desktop-appearance</Name>
+    <Directory>Puppy-Desktop-appearance.directory</Directory>
+    <Include>
+      <Category>X-Desktop-appearance</Category>
+      <Category>DesktopSettings</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Desktop-settings</Name>
+    <Directory>Puppy-Desktop-settings.directory</Directory>
+    <Include>
+      <Category>X-Desktop-settings</Category>
+      <Category>X-DesktopCountry</Category>
+      <Category>Accessibility</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Desktop-windows</Name>
+    <Directory>Puppy-Desktop-windows.directory</Directory>
+    <Include>
+      <Category>X-Desktop-windows</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Desktop-sleep</Name>
+    <Directory>Puppy-Desktop-sleep.directory</Directory>
+    <Include>
+      <Category>X-Desktop-sleep</Category>
+      <Category>Screensaver</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Desktop-applet</Name>
+    <Directory>Puppy-Desktop-applet.directory</Directory>
+    <Include>
+      <Category>X-Desktop-applet</Category>
+      <Category>X-DesktopApplets</Category>
+    </Include>
+  </Menu>
 
+</Menu>

Changes to woof-code/rootfs-skeleton/etc/xdg/menus/puppy-document.menu

@@ -1,1 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xfdesktop-menu PUBLIC "-//freedesktop//DTD Menu 0.8//EN" "http://www.freedesktop.org/standards/menu-spec/menu-0.8.dtd">
+<Menu>
+  <Name>Document</Name>
+  <DefaultAppDirs/>
+  <DefaultDirectoryDirs/>
+  <Directory>Puppy-Document.directory</Directory>
+
+  <Layout>
+    <Menuname inline="true" inline_limit="99">Document-Sub</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Document-layout</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Document-catalog</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Document-edit</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Document-viewer</Menuname>
+  </Layout>
+
+  <Menu>
+    <Name>Document-Sub</Name>
+    <Directory>Puppy-Document-Sub.directory</Directory>
+    <Include>
+      <Category>X-Document</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Document-layout</Name>
+    <Directory>Puppy-Document-layout.directory</Directory>
+    <Include>
+      <Category>X-Document-layout</Category>
+      <Category>WordProcessor</Category>
+      <Category>WebDevelopment</Category>
+      <Category>Presentation</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Document-catalog</Name>
+    <Directory>Puppy-Document-catalog.directory</Directory>
+    <Include>
+      <Category>X-Document-catalog</Category>
+      <Category>Dictionary</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Document-edit</Name>
+    <Directory>Puppy-Document-edit.directory</Directory>
+    <Include>
+      <Category>X-Document-edit</Category>
+      <Category>TextEditor</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Document-viewer</Name>
+    <Directory>Puppy-Document-viewer.directory</Directory>
+    <Include>
+      <Category>X-Document-viewer</Category>
+      <Category>X-DocumentUtility</Category>
+    </Include>
+  </Menu>
 
+</Menu>

Changes to woof-code/rootfs-skeleton/etc/xdg/menus/puppy-filesystem.menu

@@ -1,1 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xfdesktop-menu PUBLIC "-//freedesktop//DTD Menu 0.8//EN" "http://www.freedesktop.org/standards/menu-spec/menu-0.8.dtd">
+<Menu>
+  <Name>Filesystem</Name>
+  <DefaultAppDirs/>
+  <DefaultDirectoryDirs/>
+  <Directory>Puppy-Filesystem.directory</Directory>
+
+  <Layout>
+    <Menuname inline="true" inline_limit="99">Filesystem-Sub</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Filesystem-filemanager</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Filesystem-mount</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Filesystem-find</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Filesystem-storage</Menuname>
+  </Layout>
+
+  <Menu>
+    <Name>Filesystem-Sub</Name>
+    <Directory>Puppy-Filesystem-Sub.directory</Directory>
+    <Include>
+      <Category>X-FileSystem</Category>
+      <Category>FileSystem</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Filesystem-filemanager</Name>
+    <Directory>Puppy-Filesystem-filemanager.directory</Directory>
+    <Include>
+      <Category>X-FileSystem-filemanager</Category>
+      <Category>FileManager</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Filesystem-mount</Name>
+    <Directory>Puppy-Filesystem-mount.directory</Directory>
+    <Include>
+      <Category>X-FileSystem-mount</Category>
+      <Category>X-FilesystemMount</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Filesystem-find</Name>
+    <Directory>Puppy-Filesystem-find.directory</Directory>
+    <Include>
+      <Category>X-FileSystem-find</Category>
+      <Category>X-FilesystemFind</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Filesystem-storage</Name>
+    <Directory>Puppy-Filesystem-storage.directory</Directory>
+    <Include>
+      <Category>X-FileSystem-storage</Category>
+      <Category>X-FilesystemUtility</Category>
+    </Include>
+  </Menu>
 
+</Menu>

Changes to woof-code/rootfs-skeleton/etc/xdg/menus/puppy-fun.menu

@@ -1,1 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xfdesktop-menu PUBLIC "-//freedesktop//DTD Menu 0.8//EN" "http://www.freedesktop.org/standards/menu-spec/menu-0.8.dtd">
+<Menu>
+  <Name>Fun</Name>
+  <DefaultAppDirs/>
+  <DefaultDirectoryDirs/>
+  <Directory>Puppy-Fun.directory</Directory>
+
+  <Layout>
+    <Menuname inline="true" inline_limit="99">Fun-Sub</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Fun-adventure</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Fun-boardgame</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Fun-cardgame</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Fun-puzzle</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Fun-shooter</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Fun-arcade</Menuname>
+  </Layout>
+
+  <Menu>
+    <Name>Fun-Sub</Name>
+    <Directory>Puppy-Fun-Sub.directory</Directory>
+    <Include>
+      <Category>X-Game</Category>
+      <Category>Game</Category>
+      <Category>Amusement</Category>
+      <Category>BlocksGame</Category>
+      <Category>KidsGame</Category>
+      <Category>Simulation</Category>
+      <Category>SportsGame</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Fun-adventure</Name>
+    <Directory>Puppy-Fun-adventure.directory</Directory>
+    <Include>
+      <Category>X-Game-adventure</Category>
+      <Category>ActionGame</Category>
+      <Category>AdventureGame</Category>
+      <Category>RolePlaying</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Fun-boardgame</Name>
+    <Directory>Puppy-Fun-boardgame.directory</Directory>
+    <Include>
+      <Category>X-Game-boardgame</Category>
+      <Category>BoardGame</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Fun-cardgame</Name>
+    <Directory>Puppy-Fun-cardgame.directory</Directory>
+    <Include>
+      <Category>X-Game-cardgame</Category>
+      <Category>CardGame</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Fun-puzzle</Name>
+    <Directory>Puppy-Fun-puzzle.directory</Directory>
+    <Include>
+      <Category>X-Game-puzzle</Category>
+      <Category>StrategyGame</Category>
+      <Category>LogicGame</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Fun-shooter</Name>
+    <Directory>Puppy-Fun-shooter.directory</Directory>
+    <Include>
+      <Category>X-Game-shooter</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Fun-arcade</Name>
+    <Directory>Puppy-Fun-arcade.directory</Directory>
+    <Include>
+      <Category>X-Game-arcade</Category>
+      <Category>ArcadeGame</Category>
+    </Include>
+  </Menu>
 
+</Menu>

Changes to woof-code/rootfs-skeleton/etc/xdg/menus/puppy-graphic.menu

@@ -1,1 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xfdesktop-menu PUBLIC "-//freedesktop//DTD Menu 0.8//EN" "http://www.freedesktop.org/standards/menu-spec/menu-0.8.dtd">
+<Menu>
+  <Name>Graphic</Name>
+  <DefaultAppDirs/>
+  <DefaultDirectoryDirs/>
+  <Directory>Puppy-Graphic.directory</Directory>
+
+  <Layout>
+    <Menuname inline="true" inline_limit="99">Graphic-Sub</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Graphic-paint</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Graphic-draw</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Graphic-flow</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Graphic-viewer</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Graphic-camera</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Graphic-scanner</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Graphic-print</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Graphic-utility</Menuname>
+  </Layout>
+
+  <Menu>
+    <Name>Graphic-Sub</Name>
+    <Directory>Puppy-Graphic-Sub.directory</Directory>
+    <Include>
+      <Category>X-Graphic</Category>
+      <Category>2DGraphics</Category>
+      <Category>3DGraphics</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Graphic-paint</Name>
+    <Directory>Puppy-Graphic-paint.directory</Directory>
+    <Include>
+      <Category>X-Graphic-paint</Category>
+      <Category>RasterGraphics</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Graphic-draw</Name>
+    <Directory>Puppy-Graphic-draw.directory</Directory>
+    <Include>
+      <Category>X-Graphic-draw</Category>
+      <Category>VectorGraphics</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Graphic-flow</Name>
+    <Directory>Puppy-Graphic-flow.directory</Directory>
+    <Include>
+      <Category>X-Graphic-flow</Category>
+      <Category>Chart</Category>
+      <Category>FlowChart</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Graphic-viewer</Name>
+    <Directory>Puppy-Graphic-viewer.directory</Directory>
+    <Include>
+      <Category>X-Graphic-viewer</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Graphic-camera</Name>
+    <Directory>Puppy-Graphic-camera.directory</Directory>
+    <Include>
+      <Category>X-Graphic-camera</Category>
+      <Category>Photography</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Graphic-scanner</Name>
+    <Directory>Puppy-Graphic-scanner.directory</Directory>
+    <Include>
+      <Category>X-Graphic-scanner</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Graphic-print</Name>
+    <Directory>Puppy-Graphic-print.directory</Directory>
+    <Include>
+      <Category>X-Graphic-print</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Graphic-utility</Name>
+    <Directory>Puppy-Graphic-utility.directory</Directory>
+    <Include>
+      <Category>X-Graphic-utility</Category>
+      <Category>X-GraphicUtility</Category>
+    </Include>
+  </Menu>
 
+</Menu>

Changes to woof-code/rootfs-skeleton/etc/xdg/menus/puppy-internet.menu

@@ -1,1 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xfdesktop-menu PUBLIC "-//freedesktop//DTD Menu 0.8//EN" "http://www.freedesktop.org/standards/menu-spec/menu-0.8.dtd">
+<Menu>
+  <Name>Internet</Name>
+  <DefaultAppDirs/>
+  <DefaultDirectoryDirs/>
+  <Directory>Puppy-Internet.directory</Directory>
+
+  <Layout>
+    <Menuname inline="true" inline_limit="99">Internet-Sub</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Internet-browser</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Internet-chat</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Internet-mailnews</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Internet-transfer</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Internet-login</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Internet-block</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Internet-utility</Menuname>
+  </Layout>
+
+  <Menu>
+    <Name>Internet-Sub</Name>
+    <Directory>Puppy-Internet-Sub.directory</Directory>
+    <Include>
+      <Category>X-Internet</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Internet-browser</Name>
+    <Directory>Puppy-Internet-browser.directory</Directory>
+    <Include>
+      <Category>X-Internet-browser</Category>
+      <Category>WebBrowser</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Internet-chat</Name>
+    <Directory>Puppy-Internet-chat.directory</Directory>
+    <Include>
+      <Category>X-Internet-chat</Category>
+      <Category>InstantMessaging</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Internet-mailnews</Name>
+    <Directory>Puppy-Internet-mailnews.directory</Directory>
+    <Include>
+      <Category>X-Internet-mailnews</Category>
+      <Category>Email</Category>
+      <Category>News</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Internet-transfer</Name>
+    <Directory>Puppy-Internet-transfer.directory</Directory>
+    <Include>
+      <Category>X-Internet-transfer</Category>
+      <Category>Telephony</Category>
+      <Category>IRCClient</Category>
+      <Category>FileTransfer</Category>
+      <Category>P2P</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Internet-login</Name>
+    <Directory>Puppy-Internet-login.directory</Directory>
+    <Include>
+      <Category>X-Internet-login</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Internet-block</Name>
+    <Directory>Puppy-Internet-block.directory</Directory>
+    <Include>
+      <Category>X-Internet-block</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Internet-utility</Name>
+    <Directory>Puppy-Internet-utility.directory</Directory>
+    <Include>
+      <Category>X-Internet-utility</Category>
+    </Include>
+  </Menu>
 
+</Menu>

Changes to woof-code/rootfs-skeleton/etc/xdg/menus/puppy-multimedia.menu

@@ -1,1 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xfdesktop-menu PUBLIC "-//freedesktop//DTD Menu 0.8//EN" "http://www.freedesktop.org/standards/menu-spec/menu-0.8.dtd">
+<Menu>
+  <Name>Multimedia</Name>
+  <DefaultAppDirs/>
+  <DefaultDirectoryDirs/>
+  <Directory>Puppy-Multimedia.directory</Directory>
+
+  <Layout>
+    <Menuname inline="true" inline_limit="99">Multimedia-Sub</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Multimedia-mediaplayer</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Multimedia-audiovideo</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Multimedia-sound</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Multimedia-video</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Multimedia-optical</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Multimedia-utility</Menuname>
+  </Layout>
+
+  <Menu>
+    <Name>Multimedia-Sub</Name>
+    <Directory>Puppy-Multimedia-Sub.directory</Directory>
+    <Include>
+      <Category>X-Multimedia</Category>
+      <Category>Recorder</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Multimedia-mediaplayer</Name>
+    <Directory>Puppy-Multimedia-mediaplayer.directory</Directory>
+    <Include>
+      <Category>X-Multimedia-mediaplayer</Category>
+      <Category>Player</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Multimedia-audiovideo</Name>
+    <Directory>Puppy-Multimedia-audiovideo.directory</Directory>
+    <Include>
+      <Category>X-Multimedia-audiovideo</Category>
+      <Category>AudioVideo</Category>
+      <Category>AudioVideoEditing</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Multimedia-sound</Name>
+    <Directory>Puppy-Multimedia-sound.directory</Directory>
+    <Include>
+      <Category>X-Multimedia-sound</Category>
+      <Category>Music</Category>
+      <Category>Audio</Category>
+      <Category>Midi</Category>
+      <Category>Mixer</Category>
+      <Category>Sequencer</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Multimedia-video</Name>
+    <Directory>Puppy-Multimedia-video.directory</Directory>
+    <Include>
+      <Category>X-Multimedia-video</Category>
+      <Category>Video</Category>
+      <Category>Tuner</Category>
+      <Category>TV</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Multimedia-optical</Name>
+    <Directory>Puppy-Multimedia-optical.directory</Directory>
+    <Include>
+      <Category>X-Multimedia-optical</Category>
+      <Category>DiskBurning</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Multimedia-utility</Name>
+    <Directory>Puppy-Multimedia-utility.directory</Directory>
+    <Include>
+      <Category>X-Multimedia-utility</Category>
+    </Include>
+  </Menu>
 
+</Menu>

Changes to woof-code/rootfs-skeleton/etc/xdg/menus/puppy-network.menu

@@ -1,1 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xfdesktop-menu PUBLIC "-//freedesktop//DTD Menu 0.8//EN" "http://www.freedesktop.org/standards/menu-spec/menu-0.8.dtd">
+<Menu>
+  <Name>Network</Name>
+  <DefaultAppDirs/>
+  <DefaultDirectoryDirs/>
+  <Directory>Puppy-Network.directory</Directory>
+
+  <Layout>
+    <Menuname inline="true" inline_limit="99">Network-Sub</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Network-firewall</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Network-phone</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Network-connect</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Network-transfer</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Network-utility</Menuname>
+  </Layout>
+
+  <Menu>
+    <Name>Network-Sub</Name>
+    <Directory>Puppy-Network-Sub.directory</Directory>
+    <Include>
+      <Category>X-Network</Category>
+      <Category>Network</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Network-firewall</Name>
+    <Directory>Puppy-Network-firewall.directory</Directory>
+    <Include>
+      <Category>X-Network-firewall</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Network-phone</Name>
+    <Directory>Puppy-Network-phone.directory</Directory>
+    <Include>
+      <Category>X-Network-phone</Category>
+      <Category>Dialup</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Network-connect</Name>
+    <Directory>Puppy-Network-connect.directory</Directory>
+    <Include>
+      <Category>X-Network-connect</Category>
+      <Category>HamRadio</Category>
+      <Category>RemoteAccess</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Network-transfer</Name>
+    <Directory>Puppy-Network-transfer.directory</Directory>
+    <Include>
+      <Category>X-Network-transfer</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Network-utility</Name>
+    <Directory>Puppy-Network-utility.directory</Directory>
+    <Include>
+      <Category>X-Network-utility</Category>
+    </Include>
+  </Menu>
 
+</Menu>

Changes to woof-code/rootfs-skeleton/etc/xdg/menus/puppy-personal.menu

@@ -1,1 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xfdesktop-menu PUBLIC "-//freedesktop//DTD Menu 0.8//EN" "http://www.freedesktop.org/standards/menu-spec/menu-0.8.dtd">
+<Menu>
+  <Name>Personal</Name>
+  <DefaultAppDirs/>
+  <DefaultDirectoryDirs/>
+  <Directory>Puppy-Personal.directory</Directory>
+
+  <Layout>
+    <Menuname inline="true" inline_limit="99">Personal-Sub</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Personal-database</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Personal-date</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Personal-organizer</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Personal-security</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Personal-timing</Menuname>
+  </Layout>
+
+  <Menu>
+    <Name>Personal-Sub</Name>
+    <Directory>Puppy-Personal-Sub.directory</Directory>
+    <Include>
+      <Category>X-Personal</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Personal-database</Name>
+    <Directory>Puppy-Personal-database.directory</Directory>
+    <Include>
+      <Category>X-Personal-database</Category>
+      <Category>ContactManagement</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Personal-date</Name>
+    <Directory>Puppy-Personal-date.directory</Directory>
+    <Include>
+      <Category>X-Personal-date</Category>
+      <Category>Calendar</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Personal-organizer</Name>
+    <Directory>Puppy-Personal-organizer.directory</Directory>
+    <Include>
+      <Category>X-Personal-organizer</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Personal-security</Name>
+    <Directory>Puppy-Personal-security.directory</Directory>
+    <Include>
+      <Category>X-Personal-security</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Personal-timing</Name>
+    <Directory>Puppy-Personal-timing.directory</Directory>
+    <Include>
+      <Category>X-Personal-timing</Category>
+      <Category>X-PersonalUtility</Category>
+    </Include>
+  </Menu>
 
+</Menu>

Changes to woof-code/rootfs-skeleton/etc/xdg/menus/puppy-setup.menu

@@ -1,1 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xfdesktop-menu PUBLIC "-//freedesktop//DTD Menu 0.8//EN" "http://www.freedesktop.org/standards/menu-spec/menu-0.8.dtd">
+<Menu>
+  <Name>Setup</Name>
+  <DefaultAppDirs/>
+  <DefaultDirectoryDirs/>
+  <Directory>Puppy-Setup.directory</Directory>
+
+  <Layout>
+    <Menuname inline="true" inline_limit="99">Setup-Sub</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Setup-puppy</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Setup-wizard</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Setup-installation</Menuname>
+  </Layout>
+
+  <Menu>
+    <Name>Setup-Sub</Name>
+    <Directory>Puppy-Setup-Sub.directory</Directory>
+    <Include>
+      <Category>X-Setup</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Setup-puppy</Name>
+    <Directory>Puppy-Setup-puppy.directory</Directory>
+    <Include>
+      <Category>X-Setup-puppy</Category>
+      <Category>X-SetupEntry</Category>
+      <Category>PackageManager</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Setup-wizard</Name>
+    <Directory>Puppy-Setup-wizard.directory</Directory>
+    <Include>
+      <Category>X-Setup-wizard</Category>
+      <Category>X-SetupWizard</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Setup-installation</Name>
+    <Directory>Puppy-Setup-installation.directory</Directory>
+    <Include>
+      <Category>X-Setup-installation</Category>
+      <Category>X-SetupUtility</Category>
+    </Include>
+  </Menu>
 
+</Menu>

Changes to woof-code/rootfs-skeleton/etc/xdg/menus/puppy-system.menu

@@ -1,1 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xfdesktop-menu PUBLIC "-//freedesktop//DTD Menu 0.8//EN" "http://www.freedesktop.org/standards/menu-spec/menu-0.8.dtd">
+<Menu>
+  <Name>System</Name>
+  <DefaultAppDirs/>
+  <DefaultDirectoryDirs/>
+  <Directory>Puppy-System.directory</Directory>
+  <Layout>
+    <Menuname inline="true" inline_limit="99">System-Sub</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">System-process</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">System-memory</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">System-print</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">System-storage</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">System-security</Menuname>
+  </Layout>
+
+  <Menu>
+    <Name>System-Sub</Name>
+    <Directory>Puppy-System-Sub.directory</Directory>
+    <Include>
+      <Category>X-System</Category>
+      <Category>System</Category>
+      <Category>HardwareSettings</Category>
+      <Category>Core</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>System-process</Name>
+    <Directory>Puppy-System-process.directory</Directory>
+    <Include>
+      <Category>X-System-process</Category>
+      <Category>Monitor</Category>
+      <Category>X-SystemSchedule</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>System-memory</Name>
+    <Directory>Puppy-System-memory.directory</Directory>
+    <Include>
+      <Category>X-System-memory</Category>
+      <Category>X-SystemMemory</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>System-print</Name>
+    <Directory>Puppy-System-print.directory</Directory>
+    <Include>
+      <Category>X-System-print</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>System-storage</Name>
+    <Directory>Puppy-System-storage.directory</Directory>
+    <Include>
+      <Category>X-System-storage</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>System-security</Name>
+    <Directory>Puppy-System-security.directory</Directory>
+    <Include>
+      <Category>Security</Category>
+    </Include>
+  </Menu>
 
+</Menu>

Changes to woof-code/rootfs-skeleton/etc/xdg/menus/puppy-utility.menu

@@ -1,1 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xfdesktop-menu PUBLIC "-//freedesktop//DTD Menu 0.8//EN" "http://www.freedesktop.org/standards/menu-spec/menu-0.8.dtd">
+<Menu>
+  <Name>Utility</Name>
+  <DefaultAppDirs/>
+  <DefaultDirectoryDirs/>
+  <Directory>Puppy-Utility.directory</Directory>
+
+  <Layout>
+    <Menuname inline="true" inline_limit="99">Utility-Sub</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Utility-development</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Utility-package</Menuname>
+    <Separator/>
+    <Menuname inline="true" inline_limit="99">Utility-shell</Menuname>
+  </Layout>
+
+  <Menu>
+    <Name>Utility-Sub</Name>
+    <Directory>Puppy-Utility-Sub.directory</Directory>
+    <Include>
+     <Category>X-Utility</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Utility-development</Name>
+    <Directory>Puppy-Utility-development.directory</Directory>
+    <Include>
+     <Category>X-Utility-development</Category>
+      <Category>Development</Category>
+      <Category>Building</Category>
+      <Category>Debugger</Category>
+      <Category>IDE</Category>
+      <Category>Profiling</Category>
+      <Category>Translation</Category>
+      <Category>GUIDesigner</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Utility-package</Name>
+    <Directory>Puppy-Utility-package.directory</Directory>
+    <Include>
+     <Category>X-Utility-package</Category>
+     <Category>Archiving</Category>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Utility-shell</Name>
+    <Directory>Puppy-Utility-shell.directory</Directory>
+    <Include>
+     <Category>X-Utility-shell</Category>
+     <Category>TerminalEmulator</Category>
+     <Category>Shell</Category>
+    </Include>
+  </Menu>
 
+</Menu>

Changes to woof-code/rootfs-skeleton/etc/xdg/templates/README.txt

@@ -1,1 +1,13 @@
+This directory contains template files for menus.
+
+For example, JWM window manager has a configuration file /root/.jwmrc
+and this contains the specs for the menu layout and entries.
+/etc/xdg/templates/_root_.jwmrc has this configuration file in a raw form.
+Notice the naming of the file: the '_' will get converted to '/' to determine
+the detination of the config file.
 
+The script /usr/sbin/fixmenus processes any template files it finds in
+/etc/xdg/templates and generates the destination config files.
+The template files have special lines embedded into them that have the
+keyword 'PUPPYMENU' embedded into them, that are executable lines for
+generating the entries from the XDG menu information.

Changes to woof-code/rootfs-skeleton/etc/xdg/templates/_root_.icewm_menu

@@ -1,1 +1,65 @@
+# Icewm menu for Puppy
+# For Puppy 1.0.6 GuestToo, 2005, updated for latest Puppy by BK
+# BK: XDG version, Puppy 2.14. icewm-xdgmenu create by rarsa.
+# /usr/sbin/fixmenus script converts this to /root/.icewm/menu
+
+menu	"Desktop" x24 {
+PUPPYMENU icewm-xdgmenu /etc/xdg/menus/puppy-desktop.menu
+}
+menu	"System" pc24 {
+PUPPYMENU icewm-xdgmenu /etc/xdg/menus/puppy-system.menu
+}
+menu "Setup" configuration24 {
+PUPPYMENU icewm-xdgmenu /etc/xdg/menus/puppy-setup.menu
+}
+
+separator
+
+menu "Utility" utility24 {
+PUPPYMENU icewm-xdgmenu /etc/xdg/menus/puppy-utility.menu
+}
+menu "Filesystem" folder24 {
+PUPPYMENU icewm-xdgmenu /etc/xdg/menus/puppy-filesystem.menu
+}
+menu "Graphic" paint24 {
+PUPPYMENU icewm-xdgmenu /etc/xdg/menus/puppy-graphic.menu
+}
+menu "Document" word24 {
+PUPPYMENU icewm-xdgmenu /etc/xdg/menus/puppy-document.menu
+}
+menu "Business" spread24 {
+PUPPYMENU icewm-xdgmenu /etc/xdg/menus/puppy-calculate.menu
+}
+menu "Personal" date24 {
+PUPPYMENU icewm-xdgmenu /etc/xdg/menus/puppy-personal.menu
+}
+menu "Network" connect24 {
+PUPPYMENU icewm-xdgmenu /etc/xdg/menus/puppy-network.menu
+}
+menu "Internet" www24 {
+PUPPYMENU icewm-xdgmenu /etc/xdg/menus/puppy-internet.menu
+}
+menu "Multimedia" multimedia24 {
+PUPPYMENU icewm-xdgmenu /etc/xdg/menus/puppy-multimedia.menu
+}
+menu "Fun" games24 {
+PUPPYMENU icewm-xdgmenu /etc/xdg/menus/puppy-fun.menu
+}
+
+separator
+
+prog	Help help24 defaulthtmlviewer file:///usr/share/doc/index.html
 
+menu	"Shutdown" shutdown24 {
+	prog "Restart with Evilwm" mini-windows restartwm evilwm
+	prog "Restart with Fluxbox" mini-windows restartwm fluxbox
+	prog "Restart with Fvwm95" mini-windows restartwm fvwm95
+	prog "Restart with JWM" mini-windows restartwm jwm
+	restart "Restart IceWM" mini-windows icewm
+	restart "Restart IceWM-lite" mini-windows icewm-lite
+	prog "Restart with Pwm" mini-windows restartwm pwm
+	prog "Restart with Xfce4" mini-windows restartwm xfce4-session
+	prog "Restart X server" mini-x restartwm
+	prog "Shutdown Computer" mini-stop wmpoweroff
+	prog "Reboot Computer"  mini-arrow-right wmreboot
+}

Changes to woof-code/rootfs-skeleton/usr/local/lib/X11/mini-icons/mini-connect.xpm

@@ -1,1 +1,24 @@
-
+/* XPM */
+static char * mini-connect_xpm[] = {
+"16 16 5 1",
+" 	c None s None",
+".	c black",
+"X	c #808080",
+"o	c red",
+"O	c yellow",
+"                ",
+"                ",
+"          .     ",
+"       X .X     ",
+"      XooX  .   ",
+"     Xoooo .X   ",
+"    XooooooX    ",
+"    XooooooX    ",
+"    XoooooX.    ",
+"    XooooX.     ",
+"   XOXXXX.      ",
+"  XOXX...       ",
+" XOXX           ",
+"  XX            ",
+"  X             ",
+"                "};

Deleted woof-code/rootfs-skeleton/usr/local/lib/X11/mini-icons/mini-plug.xpm

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Business-Sub.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Business
+Icon=mini-Business.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Business-calc.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Calculator
+Icon=mini-Business-calc.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Business-finance.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Finance
+Icon=mini-Business-finance.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Business-planner.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Planner
+Icon=mini-Business-planner.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Business-spreadsheet.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Spreadsheet
+Icon=mini-Business-spreadsheet.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Business.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Business
+Icon=spread24.png
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Desktop-Sub.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Desktop
+Icon=mini-Desktop.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Desktop-appearance.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Appearance
+Icon=mini-Desktop-appearance.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Desktop-applet.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Applet
+Icon=mini-Desktop-applet.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Desktop-settings.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Settings
+Icon=mini-Desktop-settings.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Desktop-sleep.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Sleep
+Icon=mini-Desktop-sleep.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Desktop-windows.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Windows
+Icon=mini-Desktop-windows.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Desktop.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Desktop
+Icon=x24.png
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Document-Sub.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Document
+Icon=mini-Document.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Document-catalog.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Catalog
+Icon=mini-Document-catalog.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Document-edit.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Edit
+Icon=mini-Document-edit.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Document-layout.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Layout
+Icon=mini-Document-layout.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Document-viewer.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Viewer
+Icon=mini-Document-viewer.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Document.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Document
+Icon=word24.png
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Filesystem-Sub.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Filesystem
+Icon=mini-Filesystem.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Filesystem-filemanager.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Filemanager
+Icon=mini-Filesystem-filemanager.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Filesystem-find.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Find
+Icon=mini-Filesystem-find.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Filesystem-mount.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Mount
+Icon=mini-Filesystem-mount.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Filesystem-storage.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Storage
+Icon=mini-Filesystem-storage.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Filesystem.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Filesystem
+Icon=folder24.png
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Fun-Sub.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Fun
+Icon=mini-Fun.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Fun-adventure.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Adventure
+Icon=mini-Fun-adventure.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Fun-arcade.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Arcade
+Icon=mini-Fun-arcade.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Fun-boardgame.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Board game
+Icon=mini-Fun-boardgame.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Fun-cardgame.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Card game
+Icon=mini-Fun-cardgame.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Fun-puzzle.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Puzzle
+Icon=mini-Fun-puzzle.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Fun-shooter.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Shooter
+Icon=mini-Fun-shooter.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Fun.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Fun
+Icon=games24.png
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Graphic-Sub.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Graphic
+Icon=mini-Graphic.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Graphic-camera.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=camera
+Icon=mini-Graphic-camera.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Graphic-draw.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Draw
+Icon=mini-Graphic-draw.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Graphic-flow.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Flow
+Icon=mini-Graphic-flow.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Graphic-paint.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Paint
+Icon=mini-Graphic-paint.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Graphic-print.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Print
+Icon=mini-Graphic-print.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Graphic-scanner.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Scanner
+Icon=mini-Graphic-scanner.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Graphic-utility.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Utility
+Icon=mini-Graphic-utility.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Graphic-viewer.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Viewer
+Icon=mini-Graphic-viewer.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Graphic.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Graphic
+Icon=paint24.png
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Internet-Sub.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Internet
+Icon=mini-Internet.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Internet-block.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Block
+Icon=mini-Internet-block.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Internet-browser.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Browser
+Icon=mini-Internet-browser.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Internet-chat.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Chat
+Icon=mini-Internet-chat.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Internet-login.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Login
+Icon=mini-Internet-login.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Internet-mailnews.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Mail and News
+Icon=mini-Internet-mailnews.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Internet-transfer.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Transfer
+Icon=mini-Internet-transfer.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Internet-utility.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Utility
+Icon=mini-Internet-utility.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Internet.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Internet
+Icon=www24.png
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Multimedia-Sub.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Multimedia
+Icon=mini-Multimedia.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Multimedia-audiovideo.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Audio and Video
+Icon=mini-Multimedia-audiovideo.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Multimedia-mediaplayer.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Player
+Icon=mini-Multimedia-mediaplayer.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Multimedia-optical.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Optical
+Icon=mini-Multimedia-optical.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Multimedia-sound.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Audio
+Icon=mini-Multimedia-sound.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Multimedia-utility.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Utility
+Icon=mini-Multimedia-utility.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Multimedia-video.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Video
+Icon=mini-Multimedia-video.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Multimedia.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Multimedia
+Icon=multimedia24.png
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Network-Sub.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Network
+Icon=mini-Network.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Network-connect.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Connect
+Icon=mini-Network-connect.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Network-firewall.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Firewall
+Icon=mini-Network-firewall.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Network-phone.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Phone
+Icon=mini-Network-phone.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Network-transfer.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Transfer
+Icon=mini-Network-transfer.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Network-utility.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Utility
+Icon=mini-Network-utility.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Network.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Network
+Icon=connect24.png
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Personal-Sub.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Personal
+Icon=mini-Personal.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Personal-database.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Database
+Icon=mini-Personal-database.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Personal-date.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Date
+Icon=mini-Personal-date.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Personal-organizer.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Organizer
+Icon=mini-Personal-organizer.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Personal-security.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Security
+Icon=mini-Personal-security.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Personal-timing.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Timing
+Icon=mini-Personal-timing.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Personal.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Personal
+Icon=date24.png
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Setup-Sub.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Setup
+Icon=mini-Setup.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Setup-installation.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Installation
+Icon=mini-Setup-installation.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Setup-puppy.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Puppy
+Icon=mini-Setup-puppy.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Setup-wizard.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Wizard
+Icon=mini-Setup-wizard.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Setup.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Setup
+Icon=configuration24.png
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-System-Sub.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=System
+Icon=mini-System.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-System-memory.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Memory
+Icon=mini-System-memory.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-System-print.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Print
+Icon=mini-System-print.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-System-process.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Process
+Icon=mini-System-process.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-System-security.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Security
+Icon=mini-System-security.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-System-storage.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Storage
+Icon=mini-System-storage.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-System.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=System
+Icon=pc24.png
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Utility-Sub.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Utility
+Icon=mini-Utility.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Utility-development.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Development
+Icon=mini-Utility-development.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Utility-package.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Package
+Icon=mini-Utility-package.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Utility-shell.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Shell
+Icon=mini-Utility-shell.xpm
+Type=Directory

Changes to woof-code/rootfs-skeleton/usr/share/desktop-directories/Puppy-Utility.directory

@@ -1,1 +1,5 @@
-
+[Desktop Entry]
+Encoding=UTF-8
+Name=Utility
+Icon=utility24.png
+Type=Directory