Check-in [2a178f9b89]
Not logged in

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

Overview

SHA1 Hash:2a178f9b89fcc6193980968e284d54aaca65b78b
Date: 2012-08-17 05:38:08
User: BarryK
Comment:improved the naming of sub-categories in pkg db entries, improved icon naming

Tags And Properties
Changes

Changes to woof-code/packages-templates/gcc_lib/usr/lib/libquadmath.soSTARCHAR


Changes to woof-code/packages-templates/mesa/FIXUPHACK

@@ -1,1 +1,18 @@
 
+#120516 gentoo puts libGL.so* in strange place...
+if [ -e usr/lib/opengl/xorg-x11/lib/libGL.so.1 ];then
+ cp -a -f --remove-destination usr/lib/opengl/xorg-x11/lib/* usr/lib/
+ sync
+ ln -snf libGL.so.1 usr/lib/libGL.so
+ rm -rf usr/lib/opengl/xorg-x11/lib
+fi
+#...see also 'xserver_xorg' template.
+
+#120516 gentoo puts the dri drivers in a strange place...
+if [ -f usr/lib/mesa/swrast_dri.so ];then
+ mkdir -p usr/lib/dri #precaution.
+ cp -a -f --remove-destination usr/lib/mesa/* usr/lib/dri/
+ rm -f usr/lib/dri/swrastg_dri.so 2>/dev/null #don't want this (?)
+ sync
+ rm -f usr/lib/mesa/*
+fi

Changes to woof-code/packages-templates/mesa/PLUSEXTRADIRS


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

@@ -1,1 +1,1 @@
-
+mini-calc.xpm

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

@@ -1,1 +1,1 @@
-
+mini-dollar.xpm

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

@@ -1,1 +1,1 @@
-
+mini-planner.xpm

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

@@ -1,1 +1,1 @@
-
+spreadsheet.xpm

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

@@ -1,1 +1,1 @@
-
+mini.window3d.xpm

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

@@ -1,1 +1,1 @@
-
+mini-iconify.xpm

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

@@ -1,1 +1,1 @@
-
+mini-panel.xpm

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

@@ -1,1 +1,1 @@
-
+mini-monitor.xpm

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

@@ -1,1 +1,1 @@
-
+mini-windows.xpm

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

@@ -1,1 +1,1 @@
-
+mini-book1.xpm

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

@@ -1,1 +1,1 @@
-
+mini-edit.xpm

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

@@ -1,1 +1,1 @@
-
+onyx1616.xpm

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

@@ -1,1 +1,1 @@
-
+mini-eye.xpm

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

@@ -1,1 +1,1 @@
-
+mini-ofolder.xpm

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

@@ -1,1 +1,1 @@
-
+mini-zoom.xpm

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

@@ -1,1 +1,28 @@
-
+/* XPM */
+static char *mini_xpm[] = {
+"16 16 8 1",
+" 	c None",
+"1	c #808080",
+"2	c #C0C0C0",
+"3	c #000000",
+"4	c #008000",
+"5	c #FFFFFF",
+"6	c #00FF00",
+"7	c #FF0000",
+"          4444 5",
+"         466664 ",
+"        46665564",
+"        46665564",
+"        46666664",
+"        46666664",
+"  1111111466664 ",
+" 122222222444413",
+"1555555555555113",
+"1222222222242113",
+"1222222222222113",
+"1211111111112113",
+"1255555555552113",
+"111111111111113 ",
+" 3333333333333  ",
+"                "
+};

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

@@ -1,1 +1,1 @@
-
+mini-hdisk.xpm

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

@@ -1,1 +1,1 @@
-
+mini-xlander.xpm

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

@@ -1,1 +1,1 @@
-
+mini-ball.xpm

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

@@ -1,1 +1,1 @@
-
+mini-slon.xpm

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

@@ -1,1 +1,1 @@
-
+mini-espada.xpm

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

@@ -1,1 +1,1 @@
-
+mini-maze.xpm

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

@@ -1,1 +1,1 @@
-
+mini-shooter.xpm

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

@@ -1,1 +1,1 @@
-
+mini-camera.xpm

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

@@ -1,1 +1,1 @@
-
+mini-draw.xpm

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

@@ -1,1 +1,1 @@
-
+mini-palette.xpm

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

@@ -1,1 +1,1 @@
-
+tb_print.xpm

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

@@ -1,1 +1,1 @@
-
+scanner16.xpm

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

@@ -1,1 +1,1 @@
-
+mini.rainbow.xpm

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

@@ -1,1 +1,1 @@
-
+mini-eye.xpm

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

@@ -1,1 +1,1 @@
-
+adblock.xpm

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

@@ -1,1 +1,1 @@
-
+mini.netscape.xpm

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

@@ -1,1 +1,1 @@
-
+contact16.xpm

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

@@ -1,1 +1,25 @@
-
+/* XPM */
+static char *mini_xpm[] = {
+"16 16 5 1",
+" 	c None",
+"1	c #000000",
+"2	c #0000FF",
+"3	c #808080",
+"4	c #FFFFFF",
+" 111111111111111",
+" 122222222222221",
+" 122222222222221",
+" 144444444444441",
+" 141444444444441",
+" 144144444444441",
+" 141444444444441",
+" 144444444444441",
+" 144444444444441",
+" 144444444444441",
+" 144444444444441",
+" 111111111111111",
+"      11        ",
+"     11         ",
+"111111          ",
+"11111           "
+};

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

@@ -1,1 +1,1 @@
-
+mini-mail.xpm

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

@@ -1,1 +1,1 @@
-
+mini-ftp.xpm

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

@@ -1,1 +1,36 @@
-
+/* XPM */
+static char *internetutility_xpm[] = {
+"24 24 8 1",
+"0	c #000000",
+"1	c #FF0000",
+"2	c #00FF00",
+"3	c #B2B240",
+"4	c #3333B6",
+"5	c #A0A0A0",
+" 	c None",
+"7	c #FFFFFF",
+"   00000                ",
+"    077700              ",
+"     0777700            ",
+"      0777700           ",
+"      07777700          ",
+"      077777700         ",
+"      007777770         ",
+"     0000777770044      ",
+"    0000007777770400    ",
+"   00000  00077770440   ",
+"  00000  0330777704430  ",
+" 00000  033340770443330 ",
+"00000   033444004443330 ",
+"0000   03344444444443330",
+" 00    03443443344444330",
+"       04444444444444430",
+"       04444344344444440",
+"       04444333334444440",
+"        044333333344340 ",
+"        044333333344340 ",
+"         0443343444340  ",
+"          04444444440   ",
+"           004333000    ",
+"            000000      "
+};

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

@@ -1,1 +1,1 @@
-
+mini-Multimedia.xpm

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

@@ -1,1 +1,1 @@
-
+mini-cd.xpm

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

@@ -1,1 +1,1 @@
-
+mini-sound.xpm

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

@@ -1,1 +1,44 @@
-
+/* XPM */
+static char *mini_xpm[] = {
+"24 24 16 1",
+" 	c None",
+"1	c #FF0000",
+"2	c #00FF00",
+"3	c #FFFF00",
+"4	c #0000FF",
+"5	c #FF00FF",
+"6	c #00FFFF",
+"7	c #FFFFFF",
+"8	c #DBDBDB",
+"9	c #B6B6B6",
+"A	c #929292",
+"B	c #6D6D6D",
+"C	c #494949",
+"D	c #000000",
+"E	c #DB0000",
+"F	c #B60000",
+"      FFFF              ",
+"       F77F             ",
+"        F77FFF          ",
+"         F777FF         ",
+"         F7777FF        ",
+"         F77777FF       ",
+"         FF77777F       ",
+"         FFF7777F       ",
+"        FFFFF777FF999D7D",
+"       FFFFFFFF777F99DDD",
+"      FFFFFDDDF777FDDDDD",
+"     FFFFF7D99F77F999D7D",
+"    FFFFFD7D999FF9999D7D",
+"   FFFFF DDD999999999DDD",
+"  FFFFF  DDD999919999DDD",
+" FFFFF   D7D991119999D7D",
+"FFFFF    D7D117719999D7D",
+" FFF    111177771E999DDD",
+"  F     171777771EDDDDDD",
+"        171777771E999D7D",
+"        111177771E999D7D",
+"         DDD117719999DDD",
+"         DDD991119999DDD",
+"         D7D999919999D7D"
+};

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

@@ -1,1 +1,1 @@
-
+Animation.xpm

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

@@ -1,1 +1,39 @@
-
+/* XPM */
+static char *noname[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 16 1",
+/* colors */
+"  c #A7A7A7",
+". c #898989",
+"X c gray49",
+"o c #515151",
+"O c gray98",
+"+ c gray23",
+"@ c #CACACA",
+"# c #BCBCBC",
+"$ c gray58",
+"% c gray44",
+"& c gray40",
+"* c #585858",
+"= c #4C4C4C",
+"- c #464646",
+"; c gray22",
+": c #343434",
+/* pixels */
+";===X      X===;",
+";=&oX######Xo&=;",
+";*O%========%Oo;",
+";*O%%......&%Oo;",
+";*O%.@@@&#@.%Oo;",
+";*O%.@@#-o#.%Oo;",
+";*O%.@@#% ..%Oo;",
+";o.*.@@#%@..&Xo;",
+";o%*.@#$%@@.*%=;",
+";*O%..-;=@@.%Oo;",
+";*O%.-:+$@@.%Oo;",
+";*O%.$& @@@.%Oo;",
+";*O%&......&%Oo;",
+";*O%========%Oo;",
+";o%*X######X*%=;",
+";===X      X===;"
+};

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

@@ -1,1 +1,1 @@
-
+mini-telnet.xpm

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

@@ -1,1 +1,1 @@
-
+mini-firewall.xpm

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

@@ -1,1 +1,1 @@
-
+phone16.xpm

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

@@ -1,1 +1,1 @@
-
+mini-ftp.xpm

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

@@ -1,1 +1,34 @@
-
+/* XPM */
+static char *mini_xpm[] = {
+"24 24 6 1 0 0",
+" 	c None",
+"1	c #000000",
+"2	c #C0C0C0",
+"3	c #FFFFFF",
+"4	c #494949",
+"5	c #600606",
+"       5555             ",
+"        5335            ",
+"         533555         ",
+"          533355        ",
+"          5333355       ",
+"          53333355      ",
+"          55333335      ",
+"          55533335      ",
+"         555553333551   ",
+"        55555555333351  ",
+"       555551   533351  ",
+"      55555111  5335 1  ",
+"     555552221   55  1  ",
+"    5555511111   1  111 ",
+"   55555 12221  11 11111",
+"  55555  12221 111 12221",
+" 55555   11111 11  12221",
+"  555     111  1   11111",
+"   5       1   1   12221",
+"           1   1   11111",
+"           1   1    1 1 ",
+"           1   1    1 1 ",
+"           11111        ",
+"            111         "
+};

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

@@ -1,1 +1,1 @@
-
+mini-books.xpm

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

@@ -1,1 +1,1 @@
-
+mini-date.xpm

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

@@ -1,1 +1,1 @@
-
+mini-book2.xpm

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

@@ -1,1 +1,1 @@
-
+mini-lock.xpm

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

@@ -1,1 +1,1 @@
-
+mini-clock.xpm

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

@@ -1,1 +1,1 @@
-
+mini-ray.xpm

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

@@ -1,1 +1,1 @@
-
+mini-dog.xpm

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

@@ -1,1 +1,1 @@
-
+wizard16.xpm

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

@@ -1,1 +1,84 @@
-
+/* XPM */
+static char *mini_xpm[] = {
+"16 16 64 1",
+" 	c None",
+"B	c #FFFFFF",
+"C	c #C2C2C2",
+"D	c #606060",
+"E	c #494949",
+"F	c #424242",
+"G	c #3A3A3A",
+"H	c #333333",
+"I	c #303030",
+"J	c #6F6F6F",
+"K	c #EAEAEA",
+"L	c #414141",
+"M	c #040404",
+"N	c #3B3B3B",
+"O	c #6A6A6A",
+"P	c #808080",
+"Q	c #828282",
+"R	c #878787",
+"S	c #8C8C8C",
+"T	c #161616",
+"U	c #818181",
+"V	c #E4E4E4",
+"W	c #1E1E1E",
+"X	c #232323",
+"Y	c #C9C9C9",
+"Z	c #FFD7BE",
+"a	c #FFB383",
+"b	c #FFA770",
+"c	c #FFA66E",
+"d	c #FFA268",
+"e	c #FFC8A5",
+"f	c #B4B4B4",
+"g	c #C6C6C6",
+"h	c #4B4B4B",
+"i	c #202020",
+"j	c #F0EEEC",
+"k	c #FFA46C",
+"l	c #FF6200",
+"m	c #FF9D60",
+"n	c #E9E5E2",
+"o	c #171717",
+"p	c #5B5B5B",
+"q	c #C5C5C5",
+"r	c #BBBBBB",
+"s	c #FFDAC3",
+"t	c #FFB07F",
+"u	c #FFB98E",
+"v	c #FFD9C2",
+"w	c #B7B7B7",
+"x	c #292929",
+"y	c #EBEBEB",
+"z	c #7D7D7D",
+"0	c #141414",
+"1	c #7F7F7F",
+"2	c #787878",
+"3	c #676767",
+"4	c #3E3E3E",
+"5	c #535353",
+"6	c #EEEEEE",
+"7	c #6C6C6C",
+"8	c #323232",
+"9	c #363636",
+"+	c #6E6E6E",
+"/	c #C1C1C1",
+"                ",
+"                ",
+"                ",
+"    BBBBBBBBBBBB",
+"  BBBCDEFGHIIIJB",
+" BBKLMNOPPQRSTUB",
+" BVWXYZabcdef gB",
+"BBhijkllllmnopBB",
+"Bq rstttuvwxWyB ",
+"Bz0PP12J34 56BB ",
+"B7III89G4+/BB   ",
+"BBBBBBBBBBBB    ",
+"                ",
+"                ",
+"                ",
+"                "
+};

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

@@ -1,1 +1,1 @@
-
+tb_print.xpm

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

@@ -1,1 +1,1 @@
-
+mini-perf.xpm

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

@@ -1,1 +1,1 @@
-
+mini-lock.xpm

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

@@ -1,1 +1,1 @@
-
+mini-hdisk.xpm

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

@@ -1,1 +1,1 @@
-
+mini-git.xpm

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

@@ -1,1 +1,1 @@
-
+package.xpm

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

@@ -1,1 +1,1 @@
-
+mini-sh1.xpm

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,1 +1,44 @@
-
+/* XPM */
+static char *mini_xpm[] = {
+"24 24 16 1",
+"0	c #000000",
+"1	c #FF0000",
+"2	c #00FF00",
+"3	c #FFFF00",
+"4	c #0000FF",
+"5	c #FF00FF",
+"6	c #00FFFF",
+"7	c #FFFFFF",
+"8	c #DBDBDB",
+"9	c #B6B6B6",
+"A	c #929292",
+"B	c #6D6D6D",
+"C	c #494949",
+"D	c #242424",
+"E	c #DB0000",
+" 	c None",
+" 0000000000000000000000 ",
+"0EEEEEEEEEEEEEEEEEEEEEE0",
+"0E00000000000000000000E0",
+"0E03333333333333333330E0",
+"0E03333344333333333330E0",
+"0E03333433433333333330E0",
+"0E03333433433333333330E0",
+"0E03333344333333333330E0",
+"0E03344444444333333330E0",
+"0E03333344333333333330E0",
+"0E03333344333333333330E0",
+"0E03333434333333333330E0",
+"0E03334334333333333330E0",
+"0E03334333433333333330E0",
+"0E03334333343333333330E0",
+"0E03333333333333333330E0",
+"0E00000000000000000000E0",
+"0EEEEEEEEEEEEEEEEEEEEEE0",
+"0E0000EE00EEEEEEEEEE00E0",
+"0E0000EEEE0EEEEEEE0000E0",
+"0E0000EEEE0EEEEE000000E0",
+"0E0000EE00EEEE00000000E0",
+"0EEEEEEEEEEEEEEEEEEEEEE0",
+" 0000000000000000000000 "
+};

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,1 +1,1 @@
-
+mini-lock.xpm

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

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

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

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

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

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

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

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

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

@@ -19,10 +19,11 @@
 #120515 dev,doc,exe selection for Mageia .rpm pkgs, fix for 120504b.
 #120515 common code from pkg_chooser.sh, findnames.sh, filterpkgs.sh, extracted to /usr/local/petget/postfilterpkgs.sh.
 #120719 support raspbian.
 #120811 category field now supports sub-category |category;subcategory|, use as icon in ppm main window.
 #120813 fix search pattern for optional subcategory. 120813 fix.
+#120817 modification of category field now done in postfilterpkgs.sh.
 
 export TEXTDOMAIN=petget___filterpkgs.sh
 export OUTPUT_CHARSET=UTF-8
 
 #export LANG=C
@@ -129,11 +130,13 @@
 #echo "$ALIASES_PATTERNS" >> /tmp/petget_installed_patterns
 fprPTN="s%$%|${fltrREPO_TRIAD}%" #120504 append repo-triad on end of each line.
 #FPR="`grep --file=/tmp/petget_installed_patterns -v /tmp/petget_fltrd_repo_${PKG_FIRST_CHAR}_${fltrCATEGORY}_Packages-${fltrREPO_TRIAD} | cut -f 1,5 -d '|' | sed -e "$fprPTN"`"
 #120811 keep subcategory for icon (if no subcategory, will use category)... 120813 fix...
 #120813 pick subcategory if it exists...
-FPR="`grep --file=/tmp/petget_installed_patterns -v /tmp/petget_fltrd_repo_${PKG_FIRST_CHAR}_${fltrCATEGORY}_Packages-${fltrREPO_TRIAD} | cut -f 1,4,5 -d '|' | sed -e 's%|Document;%|%' -e 's%|Desktop;%|%' -e 's%|System;%|%' -e 's%|Setup;%|%' -e 's%|Utility;%|%' -e 's%|Filesystem;%|%' -e 's%|Graphic;%|%' -e 's%|Business;%|%' -e 's%|Personal;%|%' -e 's%|Network;%|%' -e 's%|Internet;%|%' -e 's%|Multimedia;%|%' -e 's%|Fun;%|%' | sed -e "$fprPTN"`"
+#120817 no, modify category field in postfilterpkgs.sh...
+#FPR="`grep --file=/tmp/petget_installed_patterns -v /tmp/petget_fltrd_repo_${PKG_FIRST_CHAR}_${fltrCATEGORY}_Packages-${fltrREPO_TRIAD} | cut -f 1,4,5 -d '|' | sed -e 's%|Document;%|%' -e 's%|Desktop;%|%' -e 's%|System;%|%' -e 's%|Setup;%|%' -e 's%|Utility;%|%' -e 's%|Filesystem;%|%' -e 's%|Graphic;%|%' -e 's%|Business;%|%' -e 's%|Personal;%|%' -e 's%|Network;%|%' -e 's%|Internet;%|%' -e 's%|Multimedia;%|%' -e 's%|Fun;%|%' | sed -e "$fprPTN"`"
+FPR="`grep --file=/tmp/petget_installed_patterns -v /tmp/petget_fltrd_repo_${PKG_FIRST_CHAR}_${fltrCATEGORY}_Packages-${fltrREPO_TRIAD} | cut -f 1,4,5 -d '|' | sed -e "$fprPTN"`"
 if  [ "$FPR" = "|${fltrREPO_TRIAD}" ];then
  echo -n "" > /tmp/petget/filterpkgs.results #nothing.
 else
  echo "$FPR" > /tmp/petget/filterpkgs.results
 fi

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

@@ -5,10 +5,11 @@
 #120525 fix post-filtering.
 #120529 prefix an icon to each line of results.
 #120719 support raspbian.
 #120811 category field now supports sub-category |category;subcategory|, use as icon in ppm main window.
 #120813 fix subcategory icon.
+#120817 modify 'category' field: Document;edit becomes mini-Document-edit (will use icon mini-Document-edit.xpm)
 
 #ui_Ziggy and ui_Classic pass in two params, ex: EXE true
 [ $2 ] && echo -n "$2" > /var/local/petget/postfilter_${1}
 
 #101129 postprocess, show EXE, DEV, DOC, NLS...
@@ -42,15 +43,17 @@
 #if [ "$FLG_APPICONS" = "true" ];then
 # #ex: 'abiword0-1.2.3|description of abiword|stuff' becomes 'abiword|abiword0-1.2.3|description of abiword|stuff'
 # sed -i -r -e 's%(^[a-zA-Z]*)%\1|\1%' /tmp/petget/filterpkgs.results.post
 #fi
 
-#120811 icon name is now 2nd field, want append "mini-"...
-##120813 also append "mini-" to subcategory, ex: Document;edit becomes mini-Document;mini-edit
-#ex line: htop-0.9-i486|System|View Running Processes|puppy-wary5-official
-#so, get "mini-System", which is name of an icon in /usr/local/lib/X11/mini-icons
-sed -i -e 's%|%|mini-%' /tmp/petget/filterpkgs.results.post
-##120813 finds first ; followed by a character, appends "mini-" before the char...
-#sed -i -e 's%|%|mini-%' -r -e 's%;([a-z])%;mini-\1%' /tmp/petget/filterpkgs.results.post
+##120811 icon name is now 2nd field, want append "mini-"...
+###120813 also append "mini-" to subcategory, ex: Document;edit becomes mini-Document;mini-edit
+##ex line: htop-0.9-i486|System|View Running Processes|puppy-wary5-official
+##so, get "mini-System", which is name of an icon in /usr/local/lib/X11/mini-icons
+#sed -i -e 's%|%|mini-%' /tmp/petget/filterpkgs.results.post
+###120813 finds first ; followed by a character, appends "mini-" before the char...
+##sed -i -e 's%|%|mini-%' -r -e 's%;([a-z])%;mini-\1%' /tmp/petget/filterpkgs.results.post
 
+#120817 category field: Document;edit becomes mini-Document-edit...
+sed -i -e 's%|%|mini-%' -e 's%;%-%' /tmp/petget/filterpkgs.results.post
 
 ###END###

Changes to woof-code/rootfs-skeleton/usr/local/simple_network_setup/help_profiles

@@ -1,1 +1,27 @@
+#!/bin/sh
+#120204 BK: internationalized.
+
+export TEXTDOMAIN=sns___help_profiles
+export OUTPUT_CHARSET=UTF-8
+
+GTKDIALOGEXE="gtkdialog"
+[ "`which gtkdialog4`" ] && GTKDIALOGEXE="gtkdialog4"
+
+export SNS_HELP2_DLG="<window title=\"$(gettext 'SNS: Help on profiles')\" icon-name=\"gtk-network\" resizable=\"false\">
+<vbox>
+<text use-markup=\"true\"><label>\"<b>$(gettext 'Creating a profile')</b>
+$(gettext 'When you click on a button in the') <b>$(gettext 'Interfaces')</b> $(gettext "section in the main window, you will be creating a connection to the Internet. The setup parameters for the connection will be saved as a 'profile'. Technical note: each profile is saved as one line in file /etc/simple_network_setup/connections, that can be opened and viewed with a text editor if you wish to see the inner details.")
+
+<b>$(gettext 'Automatic connection')</b>
+$(gettext 'At bootup, if SNS has been set as the default network handler, the connection profiles are used to automatically connect to the internet. Each of the profiles is tried, the wireless ones first, then wired, and the first successful connection is used.')
+$(gettext 'If for some reason this auto-connection does not happen at bootup, for example a USB modem was not plugged in, you can click the') <b>$(gettext 'CONNECT NOW')</b> $(gettext "button in the main SNS window to perform a connection whenever you want. Alternatively, the 'connect' icon on the desktop has a right-click menu with an entry that does the same thing.")
+
+<b>$(gettext 'Managing profiles')</b>
+$(gettext "It doesn't really matter if there are many profiles that don't work. When using a laptop at different places, or you plug in different network interface hardware, the old profiles can stay there in the 'connections' file. They will be automatically tested at bootup (or when you click the") <b>$(gettext 'CONNECT NOW')</b> $(gettext 'button) and whichever one is found that works will be used.')
+$(gettext 'However, if you accumulate more than 9-10 profiles and/or you know that some are not going to be needed again, it will make the auto-connect faster if they are removed -- see the appropriate') <b>$(gettext 'Delete')</b> $(gettext 'button.')\"</label></text>
+</vbox>
+</window>"
+
+${GTKDIALOGEXE} --program=SNS_HELP2_DLG
 
+###END###

Changes to woof-code/rootfs-skeleton/usr/share/locale/ja/EMPTYDIRMARKER


Changes to woof-code/support/find_cat.c

@@ -1,11 +1,11 @@
 /*called from 0setup
   Compile like this:
   # gcc -O2 -o find_cat find_cat.c
   * 120708 BK add 'gnome-mplayer', 'chromium', 'planner' to categories.
   * 120715 BK improve description check for Fun category.
-  * 120812 BK find sub-category.
+  * 120812 BK find sub-category. 120816 more sub-categories.
 */
 
 /*
 bash script to make description words into C code:
 
@@ -130,21 +130,22 @@
 
 void parseOneDB() {
 
 	//names of packages in each category
 	char PKG_CAT_Desktop1[]=" compiz gxset "; /*Desktop*/
-	char PKG_CAT_Desktop2[]=" desk_icon_theme_area042 desk_icon_theme_blue_moon desk_icon_theme_browndust desk_icon_theme_brown_marble desk_icon_theme_darkfire desk_icon_theme_fs desk_icon_theme_jq8flat desk_icon_theme_jungle desk_icon_theme_lagabluenight desk_icon_theme_original desk_icon_theme_silver_marble desk_icon_theme_smooth_color desk_icon_theme_stardust desk_icon_theme_stark042 desk_icon_theme_malays_uniblack desk_icon_theme_malays_uniblue desk_icon_theme_neu desk_icon_theme_shining_silver gtk-chtheme gtk_theme_citrus_cut gtk_theme_delicate_blue gtk_theme_fishing_the_sky gtk_theme_fishpie gtk_theme_flatbluecontrast gtk_theme_flat_grey gtk_theme_flat_grey_rounded gtk_theme_gradient_brown gtk_theme_gradient_grey gtk_theme_m8darker gtk_theme_phacile_blue gtk_theme_polished_blue gtk_theme_stardust_zigbert gtk_theme_stark wallpaper "; /*appearance*/
-	char PKG_CAT_Desktop3[]=" pupx xclock xkbconfigmanager "; /*settings*/
+	char PKG_CAT_Desktop2[]=" desk_icon_theme_area042 desk_icon_theme_blue_moon desk_icon_theme_browndust desk_icon_theme_brown_marble desk_icon_theme_darkfire desk_icon_theme_fs desk_icon_theme_jq8flat desk_icon_theme_jungle desk_icon_theme_lagabluenight desk_icon_theme_original desk_icon_theme_silver_marble desk_icon_theme_smooth_color desk_icon_theme_stardust desk_icon_theme_stark042 desk_icon_theme_malays_uniblack desk_icon_theme_malays_uniblue desk_icon_theme_neu desk_icon_theme_shining_silver gtk-chtheme gtk_theme_citrus_cut gtk_theme_delicate_blue gtk_theme_fishing_the_sky gtk_theme_fishpie gtk_theme_flatbluecontrast gtk_theme_flat_grey gtk_theme_flat_grey_rounded gtk_theme_gradient_brown gtk_theme_gradient_grey gtk_theme_m8darker gtk_theme_phacile_blue gtk_theme_polished_blue gtk_theme_stardust_zigbert gtk_theme_stark pwallpaper wallpaper "; /*appearance*/
+	char PKG_CAT_Desktop3[]=" jwmconfig2 pupx xclock xkbconfigmanager "; /*settings*/
 	char PKG_CAT_Desktop4[]=" gfontsel glipper minixcal xclipboard "; /*applet*/
-	char PKG_CAT_Desktop5[]=" blackbox e16 fbpanel fluxbox fvwm icewm jwm2 jwmconfig2 lxpanel metacity obconf openbox twm windowmaker "; /*windows*/
+	char PKG_CAT_Desktop5[]=" blackbox e16 fbpanel fluxbox fvwm icewm jwm2 lxpanel metacity obconf openbox twm windowmaker "; /*windows*/
 	char PKG_CAT_Desktop6[]=" xlock_gui xlockmore "; /*sleep*/
 
 	char PKG_CAT_System1[]=" blinky hardinfo sysprof_DEV usbview xload ";
 	char PKG_CAT_System2[]=" asapm lxtask pprocess pschedule "; /*process*/
 	char PKG_CAT_System3[]=" freememapplet freememapplet_tray freememapplet_xlib memtest memtester "; /*memory*/
 	char PKG_CAT_System4[]=" gtklp hpijs "; /*print*/
 	char PKG_CAT_System5[]=" gparted "; /*storage*/
+	char PKG_CAT_System6[]="  "; /*security*/
 
 	char PKG_CAT_Setup1[]="  "; /*Setup*/
 	char PKG_CAT_Setup2[]=" petget "; /*puppy*/
 	char PKG_CAT_Setup3[]=" net_setup net_setup_retro "; /*wizard*/
 	char PKG_CAT_Setup4[]=" wakepup2 "; /*installation*/
@@ -153,27 +154,28 @@
 	char PKG_CAT_Utility2[]=" glade2bas_DEV lxrad lxrad_DEV "; /*development*/
 	char PKG_CAT_Utility3[]=" pbackup pmirror xarchiver "; /*package*/
 	char PKG_CAT_Utility4[]=" cutecom minicom picocom rxvt rxvt-unicode urxvt-unicode xterm "; /*shell*/
 
 	char PKG_CAT_Filesystem1[]=" prename "; /*Filesystem*/
-	char PKG_CAT_Filesystem2[]=" gfnrename gwhere mc nautilus pdrive rox_filer rox-filer uxplor worker xfe "; /*filemanager*/
-	char PKG_CAT_Filesystem3[]=" pfind zfind "; /*find*/
-	char PKG_CAT_Filesystem4[]=" gdmap "; /*storage*/
+	char PKG_CAT_Filesystem2[]=" gfnrename gwhere mc nautilus rox_filer rox-filer uxplor worker xfe "; /*filemanager*/
+	char PKG_CAT_Filesystem3[]=" pdrive "; /*mount*/
+	char PKG_CAT_Filesystem4[]=" pfind zfind "; /*find*/
+	char PKG_CAT_Filesystem5[]=" gdmap "; /*storage*/
 
 	char PKG_CAT_Graphic1[]=" autoq3d autotrace blender xv "; /*Graphic*/
 	char PKG_CAT_Graphic2[]=" gimp gimp-help mtpaint xpaint "; /*paint*/
 	char PKG_CAT_Graphic3[]=" inkscape inkscapelite inkview varicad xfig "; /*draw*/
 	char PKG_CAT_Graphic4[]=" dia dia-gnomeless "; /*flow*/
 	char PKG_CAT_Graphic5[]=" eog flphoto fotoxx gimageview gpicview gqview gview "; /*viewer*/
-	char PKG_CAT_Graphic6[]=" gcolor2 grabc scale2x "; /*graphicutil*/
+	char PKG_CAT_Graphic6[]=" gcolor2 grabc scale2x "; /*utility*/
 	char PKG_CAT_Graphic7[]=" gphoto2 gtkam "; /*camera*/
 	char PKG_CAT_Graphic8[]=" peasyscan xsane "; /*scanner*/
 	char PKG_CAT_Graphic9[]=" peasyprint "; /*print*/
 
 	char PKG_CAT_Document1[]=" adobereader chmsee cssed emacs ghex gv jove "; /*Document*/
 	char PKG_CAT_Document2[]="  "; /*catalog*/
-	char PKG_CAT_Document3[]=" abiword amaya lyx scribus "; /*doclayout*/
+	char PKG_CAT_Document3[]=" abiword amaya lyx scribus "; /*layout*/
 	char PKG_CAT_Document4[]=" bluefish e3 geany gedit jed joe leafpad medit mp nano pdfedit scite zedit "; /*edit*/
 	char PKG_CAT_Document5[]=" epdfview xman xpdf "; /*viewer*/
 
 	char PKG_CAT_Calculate1[]="  "; /*Business*/
 	char PKG_CAT_Calculate2[]=" gnumeric "; /*spreadsheet*/
@@ -183,30 +185,36 @@
 
 	char PKG_CAT_Personal1[]=" datakiosk evolution "; /*Personal*/
 	char PKG_CAT_Personal2[]=" dlume "; /*database*/
 	char PKG_CAT_Personal3[]=" osmo "; /*date*/
 	char PKG_CAT_Personal4[]=" didiwiki notecase pplog "; /*organizer*/
-	char PKG_CAT_Personal5[]=" fpm2 "; /*lock*/
-	char PKG_CAT_Personal6[]=" pstopwatch ptimer "; /*clock*/
-
-	char PKG_CAT_Network1[]=" autoconnect bind gfilemanager monkey mtr nmap pnethood superscan wifi-radar wireshark "; /*Network*/
+	char PKG_CAT_Personal5[]=" fpm2 "; /*security*/
+	char PKG_CAT_Personal6[]=" pstopwatch ptimer "; /*timing*/
+
+	char PKG_CAT_Network1[]=" wifi-radar wireshark "; /*Network*/
 	char PKG_CAT_Network2[]=" fwbuilder linux_firewall "; /*firewall*/
 	char PKG_CAT_Network3[]=" gnome-ppp gpptp pppoeconf_pup rp_pppoe_cli wvdial "; /*phone*/
-	char PKG_CAT_Network4[]=" pwireless "; /*connect*/
+	char PKG_CAT_Network4[]=" gfilemanager monkey mtr nmap superscan pnethood pwireless "; /*connect*/
 	char PKG_CAT_Network5[]=" file_sharing-curlftpfs-mpscan pure_ftpd "; /*transfer*/
-
-	char PKG_CAT_Internet1[]=" alpine bitchx chromium dillo ekiga elinks elm epic4 filezilla firefox flashplayer flock gajim gtkmoz gurlchecker jags ihu licq links lynx mcabber mldonkey mozilla-firefox msmtp mutt netsurf nn pctorrent seamonkey seamonkey seamonkey_addons skipstone urlgfe "; /*Internet*/
+	char PKG_CAT_Network6[]=" autoconnect bind "; /*utility*/
+
+	char PKG_CAT_Internet1[]=" alpine bitchx elm epic4 filezilla flock gajim jags ihu licq mcabber mldonkey nn urlgfe "; /*Internet*/
 	char PKG_CAT_Internet2[]=" adblock "; /*block*/
-	char PKG_CAT_Internet3[]=" ayttm pidgin pidgin_perl psip wengophone xchat "; /*chat*/
-	char PKG_CAT_Internet4[]=" fetchmail getmail mailx mozilla-thunderbird pan sendmail sylpheed "; /*mailnews*/
-	char PKG_CAT_Internet5[]=" ssh_gui "; /*remotelogin*/
-	char PKG_CAT_Internet6[]=" axel bareftp gcurl gftp lftp ncftp puppy-podcast-grabber pwget "; /*transfer*/
-
-	char PKG_CAT_Multimedia1[]=" amarok amp audacious cinelerra dkop gecko-mediaplayer gnome-mplayer gxine mpg321 mplayer mplayer_codecs_basic mplayer_codecs_full mplayer-fonts mplayerplug-in pmetatagger pmusic pmusic_THEME_pmusic_original workbone xfmedia xine-ui "; /*Multimedia*/
+	char PKG_CAT_Internet3[]=" ayttm ekiga pidgin pidgin_perl psip wengophone xchat "; /*chat*/
+	char PKG_CAT_Internet4[]=" fetchmail getmail mailx mozilla-thunderbird msmtp mutt pan sendmail sylpheed "; /*mailnews*/
+	char PKG_CAT_Internet5[]=" ssh_gui "; /*login*/
+	char PKG_CAT_Internet6[]=" axel bareftp gcurl gftp lftp ncftp pctorrent puppy-podcast-grabber pwget "; /*transfer*/
+	char PKG_CAT_Internet7[]=" chromium dillo elinks firefox gtkmoz links lynx mozilla-firefox netsurf seamonkey seamonkey_addons skipstone "; /*browser*/
+	char PKG_CAT_Internet8[]=" flashplayer gurlchecker "; /*utility*/
+
+	char PKG_CAT_Multimedia1[]=" cinelerra dkop mpg321 pmetatagger workbone "; /*Multimedia*/
 	char PKG_CAT_Multimedia2[]=" asunder cdw grafburn pburn pburn_theme_pburn_original pcdripper pdvdrsab ripoff simpleburn xfreecd "; /*optical*/
-	char PKG_CAT_Multimedia3[]=" absvolume absvolume_puppy absvolume_puppy audacity aumix madplay mhwaveedit sgmixer timidity++ zmixer "; /*sound*/
+	char PKG_CAT_Multimedia3[]=" absvolume absvolume_puppy audacity aumix madplay mhwaveedit sgmixer timidity++ zmixer "; /*sound*/
 	char PKG_CAT_Multimedia4[]=" pupdvdtool "; /*video*/
+	char PKG_CAT_Multimedia5[]=" amarok amp audacious gecko-mediaplayer gnome-mplayer gxine mplayer_codecs_basic mplayer mplayer_codecs_full mplayer-fonts mplayerplug-in pmusic pmusic_THEME_pmusic_original xfmedia xine-ui "; /*mediaplayer*/
+	char PKG_CAT_Multimedia6[]="  "; /*utility*/
+	char PKG_CAT_Multimedia7[]="  "; /*audiovideo*/
 
 	char PKG_CAT_Fun1[]=" frozen-bubble gtans supertux tile vitetris wesnoth wormux xinvaders "; /*Fun*/
 	char PKG_CAT_Fun2[]=" lincity "; /*adventure*/
 	char PKG_CAT_Fun3[]=" gnuchess "; /*boardgame*/
 	char PKG_CAT_Fun4[]=" "; /*cardgame*/
@@ -229,10 +237,11 @@
 	if(strstr(PKG_CAT_System1, name)) {printf("System");return;}
 	if(strstr(PKG_CAT_System2, name)) {printf("System;process");return;}
 	if(strstr(PKG_CAT_System3, name)) {printf("System;memory");return;}
 	if(strstr(PKG_CAT_System4, name)) {printf("System;print");return;}
 	if(strstr(PKG_CAT_System5, name)) {printf("System;storage");return;}
+	if(strstr(PKG_CAT_System6, name)) {printf("System;security");return;}
 
 	if(strstr(PKG_CAT_Setup1, name)) {printf("Setup");return;}
 	if(strstr(PKG_CAT_Setup2, name)) {printf("Setup;puppy");return;}
 	if(strstr(PKG_CAT_Setup3, name)) {printf("Setup;wizard");return;}
 	if(strstr(PKG_CAT_Setup4, name)) {printf("Setup;installation");return;}
@@ -242,26 +251,27 @@
 	if(strstr(PKG_CAT_Utility3, name)) {printf("Utility;package");return;}
 	if(strstr(PKG_CAT_Utility4, name)) {printf("Utility;shell");return;}
 
 	if(strstr(PKG_CAT_Filesystem1, name)) {printf("Filesystem");return;}
 	if(strstr(PKG_CAT_Filesystem2, name)) {printf("Filesystem;filemanager");return;}
-	if(strstr(PKG_CAT_Filesystem3, name)) {printf("Filesystem;find");return;}
-	if(strstr(PKG_CAT_Filesystem4, name)) {printf("Filesystem;storage");return;}
+	if(strstr(PKG_CAT_Filesystem3, name)) {printf("Filesystem;mount");return;}
+	if(strstr(PKG_CAT_Filesystem4, name)) {printf("Filesystem;find");return;}
+	if(strstr(PKG_CAT_Filesystem5, name)) {printf("Filesystem;storage");return;}
 
 	if(strstr(PKG_CAT_Graphic1, name)) {printf("Graphic");return;}
 	if(strstr(PKG_CAT_Graphic2, name)) {printf("Graphic;paint");return;}
 	if(strstr(PKG_CAT_Graphic3, name)) {printf("Graphic;draw");return;}
 	if(strstr(PKG_CAT_Graphic4, name)) {printf("Graphic;flow");return;}
 	if(strstr(PKG_CAT_Graphic5, name)) {printf("Graphic;viewer");return;}
-	if(strstr(PKG_CAT_Graphic6, name)) {printf("Graphic;graphicutil");return;}
+	if(strstr(PKG_CAT_Graphic6, name)) {printf("Graphic;utility");return;}
 	if(strstr(PKG_CAT_Graphic7, name)) {printf("Graphic;camera");return;}
 	if(strstr(PKG_CAT_Graphic8, name)) {printf("Graphic;scanner");return;}
 	if(strstr(PKG_CAT_Graphic9, name)) {printf("Graphic;print");return;}
 
 	if(strstr(PKG_CAT_Document1, name)) {printf("Document");return;}
 	if(strstr(PKG_CAT_Document2, name)) {printf("Document;catalog");return;}
-	if(strstr(PKG_CAT_Document3, name)) {printf("Document;doclayout");return;}
+	if(strstr(PKG_CAT_Document3, name)) {printf("Document;layout");return;}
 	if(strstr(PKG_CAT_Document4, name)) {printf("Document;edit");return;}
 	if(strstr(PKG_CAT_Document5, name)) {printf("Document;viewer");return;}
 
 	if(strstr(PKG_CAT_Calculate1, name)) {printf("Business");return;}
 	if(strstr(PKG_CAT_Calculate2, name)) {printf("Business;spreadsheet");return;}
@@ -271,30 +281,36 @@
 
 	if(strstr(PKG_CAT_Personal1, name)) {printf("Personal");return;}
 	if(strstr(PKG_CAT_Personal2, name)) {printf("Personal;database");return;}
 	if(strstr(PKG_CAT_Personal3, name)) {printf("Personal;date");return;}
 	if(strstr(PKG_CAT_Personal4, name)) {printf("Personal;organizer");return;}
-	if(strstr(PKG_CAT_Personal5, name)) {printf("Personal;lock");return;}
-	if(strstr(PKG_CAT_Personal6, name)) {printf("Personal;clock");return;}
+	if(strstr(PKG_CAT_Personal5, name)) {printf("Personal;security");return;}
+	if(strstr(PKG_CAT_Personal6, name)) {printf("Personal;timing");return;}
 
 	if(strstr(PKG_CAT_Network1, name)) {printf("Network");return;}
 	if(strstr(PKG_CAT_Network2, name)) {printf("Network;firewall");return;}
 	if(strstr(PKG_CAT_Network3, name)) {printf("Network;phone");return;}
 	if(strstr(PKG_CAT_Network4, name)) {printf("Network;connect");return;}
 	if(strstr(PKG_CAT_Network5, name)) {printf("Network;transfer");return;}
+	if(strstr(PKG_CAT_Network6, name)) {printf("Network;utility");return;}
 
 	if(strstr(PKG_CAT_Internet1, name)) {printf("Internet");return;}
 	if(strstr(PKG_CAT_Internet2, name)) {printf("Internet;block");return;}
 	if(strstr(PKG_CAT_Internet3, name)) {printf("Internet;chat");return;}
 	if(strstr(PKG_CAT_Internet4, name)) {printf("Internet;mailnews");return;}
-	if(strstr(PKG_CAT_Internet5, name)) {printf("Internet;remotelogin");return;}
+	if(strstr(PKG_CAT_Internet5, name)) {printf("Internet;login");return;}
 	if(strstr(PKG_CAT_Internet6, name)) {printf("Internet;transfer");return;}
+	if(strstr(PKG_CAT_Internet7, name)) {printf("Internet;browser");return;}
+	if(strstr(PKG_CAT_Internet8, name)) {printf("Internet;utility");return;}
 
 	if(strstr(PKG_CAT_Multimedia1, name)) {printf("Multimedia");return;}
 	if(strstr(PKG_CAT_Multimedia2, name)) {printf("Multimedia;optical");return;}
 	if(strstr(PKG_CAT_Multimedia3, name)) {printf("Multimedia;sound");return;}
 	if(strstr(PKG_CAT_Multimedia4, name)) {printf("Multimedia;video");return;}
+	if(strstr(PKG_CAT_Multimedia5, name)) {printf("Multimedia;mediaplayer");return;}
+	if(strstr(PKG_CAT_Multimedia6, name)) {printf("Multimedia;utility");return;}
+	if(strstr(PKG_CAT_Multimedia7, name)) {printf("Multimedia;audiovideo");return;}
 
 	if(strstr(PKG_CAT_Fun1, name)) {printf("Fun");return;}
 	if(strstr(PKG_CAT_Fun2, name)) {printf("Fun;adventure");return;}
 	if(strstr(PKG_CAT_Fun3, name)) {printf("Fun;boardgame");return;}
 	if(strstr(PKG_CAT_Fun4, name)) {printf("Fun;cardgame");return;}
@@ -370,20 +386,20 @@
 	if(strstr(desc, "msn ")) {printf("Internet;chat");return;}
 	if(strstr(desc, " instant messag")) {printf("Internet;chat");return;}
 	if(strstr(desc, " im client ")) {printf("Internet;chat");return;}
 	if(strstr(desc, " ftp ")) {printf("Internet;transfer");return;}
 	if(strstr(desc, " sftp ")) {printf("Internet;transfer");return;}
-	if(strstr(desc, " ssh ")) {printf("Internet;remotelogin");return;}
-	if(strstr(desc, " secure shell ")) {printf("Internet;remotelogin");return;}
+	if(strstr(desc, " ssh ")) {printf("Internet;login");return;}
+	if(strstr(desc, " secure shell ")) {printf("Internet;login");return;}
 	if(strstr(desc, " torrent ")) {printf("Internet;transfer");return;}
 	if(strstr(desc, " podcast ")) {printf("Internet;transfer");return;}
 	if(strstr(desc, " mail ")) {printf("Internet;mailnews");return;}
 	if(strstr(desc, " email ")) {printf("Internet;mailnews");return;}
 	if(strstr(desc, " news ")) {printf("Internet;mailnews");return;}
 	if(strstr(desc, " browser ")) {printf("Internet");return;}
 	if(strstr(desc, " web ")) {printf("Internet");return;}
-	if(strstr(desc, " telnet ")) {printf("Internet;remotelogin");return;}
+	if(strstr(desc, " telnet ")) {printf("Internet;login");return;}
 	if(strstr(desc, " network ")) {printf("Network");return;}
 	if(strstr(desc, " modem ")) {printf("Network;phone");return;}
 	if(strstr(desc, " dialup ")) {printf("Network;phone");return;}
 	if(strstr(desc, " firewall ")) {printf("Network;firewall");return;}
 	if(strstr(desc, " file sharing ")) {printf("Network");return;}