Check-in [c79220de2a]
Not logged in

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

Overview

SHA1 Hash:c79220de2abb7521b814941aa1d308bbbaabe599
Date: 2012-08-19 12:00:53
User: BarryK
Comment:some fixes for pkg categories, small ppm fix

Tags And Properties
Changes

Changes to woof-arch/x86/build/support/find_cat

cannot compute difference between binary files

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

@@ -33,10 +33,11 @@
 
 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
+Utility    :help                                             #linux-faqs linux-howtos man-pages
 
 Filesystem :Sub            FileSystem                        #
 Filesystem :filemanager    FileManager                       #gfnrename gwhere mc nautilus rox_filer
 Filesystem :mount          X-FilesystemMount                 #pdrive
 Filesystem :find           X-FilesystemFind                  #pfind zfind

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

@@ -1,1 +1,39 @@
-
+/* XPM */
+static char *noname[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 16 1",
+/* colors */
+"  c None",
+". c #D6C5A3",
+"X c #E3DAC0",
+"o c #B3B9BF",
+"O c #41352A",
+"+ c #91836A",
+"@ c #DEA07A",
+"# c #8A694F",
+"$ c #ECC598",
+"% c #3C92F3",
+"& c #75B5EF",
+"* c #7692A7",
+"= c #F0D8A4",
+"- c #B0926F",
+"; c #FFF2BC",
+": c #FFECA8",
+/* pixels */
+"#++++++++++++O  ",
+"+.....**o$...   ",
+"+.;;;X%&&;;;;   ",
+"+.;==:&%o:=;:   ",
+"+.;:::o&:::;:   ",
+"+$;&&&&&&&&;:   ",
+"+.&%oX&&oo%&:   ",
+"+.%&&:Xo:&&%X   ",
+"+.&%o=;;;X%&;   ",
+"+=X&: O##@o==   ",
+"+.&&o @@@####   ",
+"+o&&% $:=#@+=-  ",
+"+$o&:##$$#++#:-O",
+"+.&%o;=#$----:;#",
+"+.%&&;;=+#+#$=:#",
+"+-**o....-@.#O  "
+};

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

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

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

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

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

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

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

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

@@ -12,10 +12,11 @@
 #120504 Mavrothal: search with multiple keywords, both pkg name and description.
 #120504 some files moved into /tmp/petget
 #120515 common code from pkg_chooser.sh, findnames.sh, filterpkgs.sh, extracted to /usr/local/petget/postfilterpkgs.sh.
 #120529 fix if icon name appended each line.
 #120811 category field now supports sub-category |category;subcategory|, use as icon in ppm main window.
+#120819 fix for 120811.
 
 #puppy package database format:
 #pkgname|nameonly|version|pkgrelease|category|size|path|fullfilename|dependencies|description|compileddistro|compiledrelease|repo|
 #...'compileddistro|compiledrelease' (fields 11,12) identify where the package was compiled.
 
@@ -81,20 +82,24 @@
  #120811 need category field (#5), and subcategory part of it...
  #120504 Mavrothal:
  #FNDENTRIES="`cat /root/.packages/Packages-${ONEREPO} | grep -i "$entryPATTERN"`"
  if [ "$entryPATTERN4" != "" ]; then
   #FNDENTRIES="`cat /root/.packages/Packages-${ONEREPO} | cut -f1,10 -d \| | grep -i "$entryPATTERN1" | grep -i "$entryPATTERN2" | grep -i "$entryPATTERN3" | grep -i "$entryPATTERN4"`"
-  FNDENTRIES="`cat /root/.packages/Packages-${ONEREPO} | cut -f1,5,10 -d \| | cut -f 2-99 -d ';' | grep -i "$entryPATTERN1" | grep -i "$entryPATTERN2" | grep -i "$entryPATTERN3" | grep -i "$entryPATTERN4"`"
+  #FNDENTRIES="`cat /root/.packages/Packages-${ONEREPO} | cut -f1,5,10 -d \| | cut -f 2-99 -d ';' | grep -i "$entryPATTERN1" | grep -i "$entryPATTERN2" | grep -i "$entryPATTERN3" | grep -i "$entryPATTERN4"`"
+  FNDENTRIES="`cat /root/.packages/Packages-${ONEREPO} | cut -f1,5,10 -d \| | grep -i "$entryPATTERN1" | grep -i "$entryPATTERN2" | grep -i "$entryPATTERN3" | grep -i "$entryPATTERN4"`" #120819
  elif [ "$entryPATTERN3" != "" ]; then
   #FNDENTRIES="`cat /root/.packages/Packages-${ONEREPO} | cut -f1,10 -d \| | grep -i "$entryPATTERN1" | grep -i "$entryPATTERN2" | grep -i "$entryPATTERN3"`"
-  FNDENTRIES="`cat /root/.packages/Packages-${ONEREPO} | cut -f1,5,10 -d \| | cut -f 2-99 -d ';' | grep -i "$entryPATTERN1" | grep -i "$entryPATTERN2" | grep -i "$entryPATTERN3"`"
+  #FNDENTRIES="`cat /root/.packages/Packages-${ONEREPO} | cut -f1,5,10 -d \| | cut -f 2-99 -d ';' | grep -i "$entryPATTERN1" | grep -i "$entryPATTERN2" | grep -i "$entryPATTERN3"`"
+  FNDENTRIES="`cat /root/.packages/Packages-${ONEREPO} | cut -f1,5,10 -d \| | grep -i "$entryPATTERN1" | grep -i "$entryPATTERN2" | grep -i "$entryPATTERN3"`" #120819
  elif [ "$entryPATTERN2" != "" ]; then
   #FNDENTRIES="`cat /root/.packages/Packages-${ONEREPO} | cut -f1,10 -d \| | grep -i "$entryPATTERN1" | grep -i "$entryPATTERN2"`"
-  FNDENTRIES="`cat /root/.packages/Packages-${ONEREPO} | cut -f1,5,10 -d \| | cut -f 2-99 -d ';' | grep -i "$entryPATTERN1" | grep -i "$entryPATTERN2"`"
+  #FNDENTRIES="`cat /root/.packages/Packages-${ONEREPO} | cut -f1,5,10 -d \| | cut -f 2-99 -d ';' | grep -i "$entryPATTERN1" | grep -i "$entryPATTERN2"`"
+  FNDENTRIES="`cat /root/.packages/Packages-${ONEREPO} | cut -f1,5,10 -d \| | grep -i "$entryPATTERN1" | grep -i "$entryPATTERN2"`" #120819
  else
   #FNDENTRIES="`cat /root/.packages/Packages-${ONEREPO} | cut -f1,10 -d \| | grep -i "$entryPATTERN1"`"
-  FNDENTRIES="`cat /root/.packages/Packages-${ONEREPO} | cut -f1,5,10 -d \| | cut -f 2-99 -d ';' | grep -i "$entryPATTERN1"`"
+  #FNDENTRIES="`cat /root/.packages/Packages-${ONEREPO} | cut -f1,5,10 -d \| | cut -f 2-99 -d ';' | grep -i "$entryPATTERN1"`"
+  FNDENTRIES="`cat /root/.packages/Packages-${ONEREPO} | cut -f1,5,10 -d \| | grep -i "$entryPATTERN1"`" #120819
  fi
 
  if [ "$FNDENTRIES" != "" ];then
   FIRSTCHAR="`echo "$FNDENTRIES" | cut -c 1 | tr '\n' ' ' | sed -e 's% %%g'`"
   #write these just in case needed...

Changes to woof-code/rootfs-skeleton/usr/local/petget/petget

@@ -22,10 +22,11 @@
 #120116 rev. 514 introduced icon rendering method which broke -reload at 547. fixed at rev. 574.
 #120203 BK: internationalized.
 #120323 replace 'xmessage' with 'pupmessage'.
 #120504 now have /tmp/petget folder.
 #120719 support raspbian.
+#120819 having a category does not mean there will also be a menu entry.
 
 export TEXTDOMAIN=petget___petget
 export OUTPUT_CHARSET=UTF-8
 
 [ "`whoami`" != "root" ] && exec sudo -A ${0} ${@} #110505
@@ -247,10 +248,15 @@
 INSTALLEDCAT="`echo -n "$INSTALLEDMSG" | rev | cut -f 1 -d ' ' | rev`"
 if [ "$INSTALLEDCAT" = "none" ];then
  MENUMSG="<text><label>$(gettext '...note, this package does not have a menu entry.')</label></text>"
 else
  MENUMSG="<text><label>$(gettext '...look in') '${INSTALLEDCAT}' $(gettext 'in the menu (bottom-left of screen) to run the application.')</label></text>"
+fi
+
+#120819 having a category does not mean there will also be a menu entry...
+if [ "`grep '/usr/.*share/applications/.*\.desktop$' /root/.packages/${PKGNAME}.files`" = "" ];then
+ MENUMSG="<text><label>$(gettext '...note, this package does not have a menu entry.')</label></text>"
 fi
 
 #installpkg.sh will have logged to /tmp/petget-installed-pkgs-log
 export INSTALL_DIALOG="<window title=\"$(gettext 'Puppy Package Manager')\" icon-name=\"gtk-about\">
  <vbox>

Changes to woof-code/support/find_cat.c

@@ -139,11 +139,11 @@
 	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_System4[]=" gtklp hpijs hplip "; /*print*/
 	char PKG_CAT_System5[]=" gparted "; /*storage*/
 	char PKG_CAT_System6[]="  "; /*security*/
 
 	char PKG_CAT_Setup1[]="  "; /*Setup*/
 	char PKG_CAT_Setup2[]=" petget "; /*puppy*/
@@ -169,11 +169,11 @@
 	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_Document1[]=" adobereader chmsee cssed emacs ghex gv jove libreoffice openoffice openoffice.org "; /*Document*/
 	char PKG_CAT_Document2[]="  "; /*catalog*/
 	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*/
 
@@ -320,22 +320,22 @@
 
 	/*if(strstr(PKG_CAT_Develop, name)) {printf("Develop");return;}*/
 	if(strstr(PKG_CAT_Develop, name)) {printf("Utility;development");return;}
 
 	if(strstr(PKG_CAT_BuildingBlock, name)) {printf("BuildingBlock");return;}
-	if(strstr(PKG_CAT_Help, name)) {printf("Help");return;}
+	if(strstr(PKG_CAT_Help, name)) {printf("Utility;help");return;}
 
 	if(strstr(name, " lib")) {printf("BuildingBlock");return;} //check if library
 
 	//words in description
 	if(strstr(desc, " library ")) {printf("BuildingBlock");return;}
-	if(strstr(desc, " howto ")) {printf("Help");return;}
-	if(strstr(desc, " documentation ")) {printf("Help");return;}
-	if(strstr(desc, " faq ")) {printf("Help");return;}
-	if(strstr(desc, " doc ")) {printf("Help");return;}
-	if(strstr(desc, " docs ")) {printf("Help");return;}
-	if(strstr(desc, " help ")) {printf("Help");return;}
+	if(strstr(desc, " howto ")) {printf("Utility;help");return;}
+	if(strstr(desc, " documentation ")) {printf("Utility;help");return;}
+	if(strstr(desc, " faq ")) {printf("Utility;help");return;}
+	if(strstr(desc, " doc ")) {printf("Utility;help");return;}
+	if(strstr(desc, " docs ")) {printf("Utility;help");return;}
+	if(strstr(desc, " help ")) {printf("Utility;help");return;}
 	if(strstr(desc, " develop ")) {printf("Utility;development");return;}
 	if(strstr(desc, " development ")) {printf("Utility;development");return;}
 	if(strstr(desc, " programming ")) {printf("Utility;development");return;}
 	if(strstr(desc, " language ")) {printf("Utility;development");return;}
 	if(strstr(desc, " lua ")) {printf("Utility;development");return;}
@@ -427,25 +427,25 @@
 	if(strstr(desc, " financ")) {printf("Business;finance");return;}
 	if(strstr(desc, " measure")) {printf("Business");return;}
 	if(strstr(desc, " accounting ")) {printf("Business;finance");return;}
 	if(strstr(desc, " bookkeeping ")) {printf("Business;finance");return;}
 	if(strstr(desc, " document ")) {printf("Document");return;}
-	if(strstr(desc, " wordprocessor ")) {printf("Document;doclayout");return;}
+	if(strstr(desc, " wordprocessor ")) {printf("Document;layout");return;}
 	if(strstr(desc, " text editor ")) {printf("Document;edit");return;}
 	if(strstr(desc, " hex editor ")) {printf("Document;edit");return;}
 	if(strstr(desc, " html editor ")) {printf("Document;edit");return;}
 	if(strstr(desc, "pdf editor ")) {printf("Document;edit");return;}
 	if(strstr(desc, "pdf viewer ")) {printf("Document;viewer");return;}
 	if(strstr(desc, " dictionary ")) {printf("Document;catalog");return;}
-	if(strstr(desc, " wysiwyg ")) {printf("Document;doclayout");return;}
-	if(strstr(desc, " libreoffice")) {printf("Document;doclayout");return;}
-	if(strstr(desc, " open office")) {printf("Document;doclayout");return;}
-	if(strstr(desc, " openoffice ")) {printf("Document;doclayout");return;}
+	if(strstr(desc, " wysiwyg ")) {printf("Document;layout");return;}
+	if(strstr(desc, " libreoffice")) {printf("Document;layout");return;}
+	if(strstr(desc, " open office")) {printf("Document;layout");return;}
+	if(strstr(desc, " openoffice ")) {printf("Document;layout");return;}
 	if(strstr(desc, " postscript viewer ")) {printf("Document;viewer");return;}
-	if(strstr(desc, " presentation ")) {printf("Document;doclayout");return;}
-	if(strstr(desc, " desktop publishing ")) {printf("Document;doclayout");return;}
-	if(strstr(desc, " word processor")) {printf("Document;doclayout");return;}
+	if(strstr(desc, " presentation ")) {printf("Document;layout");return;}
+	if(strstr(desc, " desktop publishing ")) {printf("Document;layout");return;}
+	if(strstr(desc, " word processor")) {printf("Document;layout");return;}
 	if(strstr(desc, " filesystem ")) {printf("Filesystem");return;}
 	if(strstr(desc, " disk ")) {printf("Filesystem;storage");return;}
 	if(strstr(desc, " batch ")) {printf("Filesystem");return;}
 	if(strstr(desc, " catalog")) {printf("Filesystem");return;}
 	if(strstr(desc, " file manager ")) {printf("Filesystem;filemanager");return;}

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

@@ -188,12 +188,12 @@
 yes|gconf|gconf2-common,gconf2,libgconf2-4,libgconf2-dev,libgconf-2-4,gconf-service,gconf-service-backend|exe,dev,doc,nls
 yes|gdb|gdb|exe>dev,dev,doc,nls
 yes|gdbm|libgdbm3,libgdbm-dev|exe,dev,doc,nls
 yes|gdk-pixbuf|libgdk-pixbuf2.0-0,libgdk-pixbuf2.0-common,libgdk-pixbuf2.0-dev|exe,dev,doc,nls
 yes|gdmap|gdmap|exe,dev>null,doc,nls
-yes|geany|geany,geany-common,geany-plugins-common,geany-plugin-addons,geany-plugin-codenav,geany-plugin-extrasel,geany-plugin-numberedbookmarks,geany-plugin-prettyprinter,geany-plugin-spellcheck,geany-plugin-treebrowser,geany-plugin-xmlsnippets|exe,dev>null,doc,nls
-no|geany||exe
+no|geany|geany,geany-common,geany-plugins-common,geany-plugin-addons,geany-plugin-codenav,geany-plugin-extrasel,geany-plugin-numberedbookmarks,geany-plugin-prettyprinter,geany-plugin-spellcheck,geany-plugin-treebrowser,geany-plugin-xmlsnippets|exe,dev>null,doc,nls| #weird pink background, use my wary pet.
+yes|geany||exe,dev,doc,nls|pet:wary5
 no|gecko-mediaplayer|gecko-mediaplayer|exe,dev,doc,nls| #does not  work, use my pet.
 yes|gecko-mediaplayer||exe,dev,doc,nls
 no|gedit||exe
 yes|getcurpos||exe
 no|getdir||exe,dev>null,doc,nls

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

@@ -1,9 +1,9 @@
 #One or more words that identify this distribution:
 DISTRO_NAME='Precise Puppy'
 #version number of this distribution:
-DISTRO_VERSION=5.2.65
+DISTRO_VERSION=5.2.66
 #The distro whose binary packages were used to build this distribution:
 DISTRO_BINARY_COMPAT='ubuntu'
 #Prefix for some filenames: exs: precisesave.2fs, precise-4.99.0.sfs
 DISTRO_FILE_PREFIX='precise'
 #The version of the distro whose binary packages were used to build this distro: