Check-in [85ec359858]
Not logged in

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

Overview

SHA1 Hash:85ec35985874614acd642750f307941347a6545d
Date: 2012-05-25 03:24:00
User: BarryK
Comment:ppm: exe,dev,doc,nls checkboxes fixed, help page updated

Tags And Properties
Changes

Changes to woof-code/rootfs-skeleton/usr/local/petget/help.htm

@@ -13,19 +13,22 @@
       <h1>Puppy Package Manager (PPM)</h1>
 
 A "package" is Linux terminology for an application. These are held in
 online repositories, and you can download and install any package.<br>
 
-      <h2>How to install</h2>
+      <h2>How to install a package<br>
+</h2>
 
 You click a radio-button along the top to choose the desired repository
 -- usually the left-most one is the one most suitable for your current
 version of Puppy.<br>
 
       <br>
 
-The radio-buttons aligned vertically on the left enable you to narrow the display to a specific category.<br>
+The radio-buttons aligned vertically on the left enable you to narrow
+the display to a specific category (these notes are for the 'Classic'
+user interface, 'Ziggy' UI has slightly different layout).<br>
 
       <br>
 
 Notice the checkboxes labeled EXE, DEV, DOC and NLS. Many Puppy PET packages are split into smaller packages, as follows:<br>
 
@@ -72,12 +75,12 @@
 splitting PET packages into these component parts. In some cases there
 may be, for example, 'abiword-1.2.3.pet' which has everything in it. The
 reason that the splitting is usually done is to reduce the size of the
 main EXE package.<br>
 <br>
-As from May 2012, the PPM is enhanced to support EXE,DEV,DOC,NLS
-filtering of Debian and Ubuntu DEB packages. For example,
+As from late May 2012, the PPM is enhanced to support EXE,DEV,DOC,NLS
+filtering of Debian and Ubuntu DEB packages and Mageia RPM packages. For example,
 'abiword-doc_1.2.3-3build1_all.deb' is recognised as a documentation
 package.<br>
 
       <br>
 
@@ -84,19 +87,20 @@
 When you click on one of the packages displayed in the big window,
 another window pops up asking if you really want to install the
 package, and also offers further information about the package -- so
 you can learn more about it before deciding whether to install it.<br>
 
-      <h2>How to uninstall</h2>
+      <h2>How to uninstall a package<br>
+</h2>
 
 When a package is installed, it appears in the window bottom-right.<br>
 
 To uninstall a package, simply click on it. There will be another window asking you to confirm deletion.<br>
 
       <h2>Package repositories</h2>
 
-There are various PET repositories. PETs are the Puppy format for packages, an acronym that we tongue-in-cheek say stands for <span style="font-style: italic;">Puppy Extra Treats</span>. Those on offer will depend on which
+There are various PET repositories. PETs are the Puppy format for packages, an acronym that we humourously say stands for <span style="font-style: italic;">Puppy Extra Treats</span>. Those on offer will depend on which
 Puppy you are using, but usually there will be these available at least:<br>
 
       <br>
       <div style="margin-left: 40px;">
 puppy-2: The very old Puppy 2.x series<br>
@@ -104,15 +108,27 @@
 puppy-3: Puppy 3.x series<br>
 
 puppy-4: Puppy 4.x series<br>
 
 puppy-5: Puppy 5.x series<br>
+puppy-noarch: These have no compiled executables and work in any Puppy (and any CPU)<br>
+puppy-common: These have compiled executables and are intended to work in any Puppy<br>
       </div>
 
       <br>
+A note about those last two: "noarch" packages do not have any compiled
+executables, so they will work regardless of CPU -- x86, ARM, whatever.
+"common" have compiled executables, and are a collection of packages
+used in most builds of Puppy.<br>
+<br>
 
-For your Puppy, you may also have others, such as 'puppy-quirky', 'puppy-wary5', or 'puppy-lucid'.<br>
+For your Puppy, you may also have others, such as 'puppy-quirky',
+'puppy-wary5', or 'puppy-lucid'. One of these will be a collection of
+packages created specifically for your particular Puppy. For example,
+Precise Puppy is built from Ubuntu Precise Pangolin binary packages, and
+ PET repo 'puppy-precise' has PET packages created explicitly for this
+pup.<br>
 
       <br>
 
 Generally, use those that seem most appropriate to your version of
 Puppy. The older ones have packages that may or may not work in your
@@ -128,21 +144,25 @@
       <br>
 
 Your Puppy may be built from the packages of one of the other major
 Linux distributions, such as Debian, Ubuntu or Slackware. In that case,
 PPM will offer those repositories. They are going to be the most
-compatible and the ones that you should look in first.<br>
+compatible and the ones that you should look in first. For example,
+Precise Puppy, built from Ubuntu Precise Pangolin, will have the
+'ubuntu-precise-main', 'ubuntu-precise-universe' and
+'ubuntu-precise-multiverse' repositories.<br>
       <br>
 Of course, the packages of other distributions are not going to be PET
 packages. PETs have ".pet" on the end of the filename (file extension).<br>
 Debian and Ubuntu have DEB packages, with ".deb" on the end of the filename.<br>
 Slackware packages have ".tgz" or ".txz" file extension.<br>
+Mageia has RPM packages, with ".rpm" file extension.<br>
 Whatever the type of package, PPM is capable of installing it.<br>
       <h2>
 Searching</h2>
 
-The "Find:" box enables you to search for any file, but note that it only searches the currently-selected repository.<br>
+The "Find:" box enables you to search for any package.<br>
       <br>
 You can type in a partial name, but a match is only found from the
 left. For example, if you do a search for "pan" you might find this:<br>
       <br>
       <div style="margin-left: 40px;">pango-1.28.1-w5 Library for layout and rendering of internationalized text<br>
@@ -165,14 +185,18 @@
 As from May 2012, PPM also supports searching for multiple keywords. Also,
 the Description field is searched as well as the package name. For
 example, it you type into the search-box, "abiword plugins", it
 will find packages with these two words, either in the package name or
 the description.<br>
+<br>
+Also from May 2012, you can choose to search just the current repository
+ or all repositories. Previously, it was restricted to current repo
+only.<br>
 
       <br>
 One thing to note about the search is that it searches the entire
-repository, and ignores the vertical Category radiobuttons on the left
+repository (or repositories), and ignores the vertical Category radiobuttons on the left
 side.<br>
       <h2>Installing without the PPM GUI</h2>
 You can actually download any package, from anywhere, and install it.
 All that you have to do is click on the package in the file-manager
 window, and the package-installer component of PPM will run and install
@@ -183,15 +207,30 @@
 going through the PPM GUI interface, any dependencies are not
 installed, and you will have to take care of that yourself.<br>
       <br>
 One good thing, a package installed in this way will show up in the PPM
 GUI installed-packages-window and it can thus be uninstalled.<br>
+<h2>How to update Puppy to next version</h2>
+A little while ago, someone criticised PPM, stating that it did not
+allow a complete upgrade of Puppy to the next version. The package
+managers in some distributions allow you to install all packages
+required to completely upgrade to the latest version of the distro.<br>
 <br>
-
+PPM does not offer that, because Puppy does not work that way. It is
+outside the ambit, or we could say the "contract" of what PPM is
+required to do. A new version of Puppy is provided as just three or four
+ files. Say for example you have a "frugal" installation of Puppy on
+hard drive, it will consist of just three files, vmlinuz, initrd.gz and
+the main Puppy filesystem (for example precise-5.3.sfs). There is also a
+ fourth file known as the "devx" (for example devx_precise_5.3.sfs). To
+upgrade, all you do is replace those files. It is a totally different
+system to a package-by-package upgrade. This page has more details: <a href="http://puppylinux.com/hard-puppy.htm">http://puppylinux.com/hard-puppy.htm</a> <br>
+<br>
 Regards,<br>
 
-Barry Kauler, Dec. 2010</td>
+Barry Kauler, May 2012<br>
+</td>
     </tr>
   </tbody>
 </table>
 <br>
 </body></html>

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

@@ -1,9 +1,10 @@
 #!/bin/sh
 #called from pkg_chooser.sh, findnames.sh, filterpkgs.sh
 #post-process the selection of pkgs that is to be displayed, according to the exe, dev, doc, nls checkboxes.
 #120515 script created, common code extracted from above 3 scripts.
+#120525 fix post-filtering.
 
 #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...
@@ -14,43 +15,21 @@
 [ -e /var/local/petget/postfilter_EXE ] && DEF_CHK_EXE="`cat /var/local/petget/postfilter_EXE`"
 [ -e /var/local/petget/postfilter_DEV ] && DEF_CHK_DEV="`cat /var/local/petget/postfilter_DEV`"
 [ -e /var/local/petget/postfilter_DOC ] && DEF_CHK_DOC="`cat /var/local/petget/postfilter_DOC`"
 [ -e /var/local/petget/postfilter_NLS ] && DEF_CHK_NLS="`cat /var/local/petget/postfilter_NLS`"
 cp -f /tmp/petget/filterpkgs.results /tmp/petget/filterpkgs.results.post
-#[ "$DEF_CHK_EXE" = "false" ] && sed -i -e '/_EXE/d' /tmp/petget/filterpkgs.results.post
-[ "$DEF_CHK_DEV" = "false" ] && sed -i -e '/_DEV/d' /tmp/petget/filterpkgs.results.post
-[ "$DEF_CHK_DOC" = "false" ] && sed -i -e '/_DOC/d' /tmp/petget/filterpkgs.results.post
-[ "$DEF_CHK_NLS" = "false" ] && sed -i -e '/_NLS/d' /tmp/petget/filterpkgs.results.post
-#120504b fix filtering out _EXE...
+
+#120525 quick filtering but not perfect...
+#PETs: _DEV _DOC _NLS
+#Ubuntu,Debian DEBs: -dev_ -doc_ -docs_ -langpack -lang-
+#Mageia RPMs: -devel- -doc-
+sed -i -e '/-dbg_/d' /tmp/petget/filterpkgs.results.post #120525 always take out the debug pkgs.
+[ "$DEF_CHK_DEV" = "false" ] && sed -i -e '/_DEV/d' -e '/-dev_/d' -e '/-devel-/d' /tmp/petget/filterpkgs.results.post
+[ "$DEF_CHK_DOC" = "false" ] && sed -i -e '/_DOC/d' -e '/-doc_/d' -e '/-docs_/d' -e '/-doc-/d' /tmp/petget/filterpkgs.results.post
+[ "$DEF_CHK_NLS" = "false" ] && sed -i -e '/_NLS/d' -e '/-langpack/d' -e '/-lang-/d' /tmp/petget/filterpkgs.results.post
+#120504b fix filtering out _EXE... 120515 must escape the dashes...
 if [ "$DEF_CHK_EXE" = "false" ];then
- grep -E '_DEV|_DOC|_NLS' /tmp/petget/filterpkgs.results.post > /tmp/petget/filterpkgs.results.post.tmp
- mv -f /tmp/petget/filterpkgs.results.post.tmp /tmp/petget/filterpkgs.results.post
-fi
-
-#120504b for .deb pkgs, we have alternate naming for dev, doc, nls...
-if [ "`grep -E 'ubuntu|debian' /tmp/petget/filterpkgs.results.post`" != "" ];then
- #ex line: abiword-doc_1.2.3|[ubuntu-lucid-official] Abiword word processor|ubuntu-lucid-official| (part in [] may not be there, refer findnames.sh)
- [ "$DEF_CHK_DEV" = "false" ] && sed -i -e '/-dev_/d' /tmp/petget/filterpkgs.results.post
- [ "$DEF_CHK_DOC" = "false" ] && sed -i -e '/-doc_/d' /tmp/petget/filterpkgs.results.post
- [ "$DEF_CHK_DOC" = "false" ] && sed -i -e '/-docs_/d' /tmp/petget/filterpkgs.results.post
- [ "$DEF_CHK_NLS" = "false" ] && sed -i -e '/-langpack/d' /tmp/petget/filterpkgs.results.post
- [ "$DEF_CHK_NLS" = "false" ] && sed -i -e '/-lang-/d' /tmp/petget/filterpkgs.results.post
- #filtering out _EXE... 120515 must escape the dashes...
- if [ "$DEF_CHK_EXE" = "false" ];then
-  grep -E '\-dev_|\-doc_|\-docs_|\-langpack|\-lang\-' /tmp/petget/filterpkgs.results.post > /tmp/petget/filterpkgs.results.post.tmp
-  mv -f /tmp/petget/filterpkgs.results.post.tmp /tmp/petget/filterpkgs.results.post
- fi
-fi
-
-#120515 for Mageia .rpm pkgs...
-if [ "`grep 'mageia' /tmp/petget/filterpkgs.results.post`" != "" ];then
- #ex line: abiword-doc-1.2.3|[mageia-2-official] Abiword word processor|mageia-2-official| (part in [] may not be there, refer findnames.sh)
- [ "$DEF_CHK_DEV" = "false" ] && sed -i -e '/-devel-/d' /tmp/petget/filterpkgs.results.post
- [ "$DEF_CHK_DOC" = "false" ] && sed -i -e '/-doc-/d' /tmp/petget/filterpkgs.results.post
- #filtering out _EXE...
- if [ "$DEF_CHK_EXE" = "false" ];then
-  grep -E '\-devel\-|\-doc\-' /tmp/petget/filterpkgs.results.post > /tmp/petget/filterpkgs.results.post.tmp
-  mv -f /tmp/petget/filterpkgs.results.post.tmp /tmp/petget/filterpkgs.results.post
- fi
+ grep -E '_DEV|_DOC|_NLS|\-dev_|\-doc_|\-docs_|\-langpack|\-lang\-|\-devel\-|\-doc\-' /tmp/petget/filterpkgs.results.post > /tmp/petget/filterpkgs.results.post.tmp
+ mv -f /tmp/petget/filterpkgs.results.post.tmp /tmp/petget/filterpkgs.results.post
 fi
 
 ###END###

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

@@ -473,12 +473,12 @@
 yes|nettle|libnettle4|exe,dev,doc,nls| #needed by libarchive.
 yes|network_tray||exe
 no|nicoedit||exe
 yes|normalize|normalize-audio|exe,dev,doc,nls
 yes|notecase||exe,dev,doc,nls
-yes|nspr|libnspr4-0d,libnspr4-dev|exe,dev,doc,nls| #using seamonkey pkg with these built-in.
-yes|nss|libnss3-1d,libnss3-dev|exe,dev,doc,nls| #using seamonkey pkg with these built-in.
+no|nspr|libnspr4-0d,libnspr4-dev|exe,dev,doc,nls| #using seamonkey pkg with these built-in.
+no|nss|libnss3-1d,libnss3-dev|exe,dev,doc,nls| #using seamonkey pkg with these built-in.
 yes|ntfs-3g|ntfs-3g,ntfs-3g-dev|exe,dev,doc,nls
 no|ntfs-3g||exe,dev,doc,nls
 yes|ntfsprogs|ntfsprogs,libntfs10,libntfs-dev|exe,dev,doc,nls
 yes|numlockx||exe| #needed by shinobars firstrun.
 no|obconf||exe,dev>null,doc,nls|+openbox

Changes to woof-distro/x86/ubuntu/precise/Packages-puppy-precise-official

@@ -1,5 +1,6 @@
 z_xorg_fix_precise-1.11.4-up|z_xorg_fix_precise|1.11.4-up||BuildingBlock|19176K||z_xorg_fix_precise-1.11.4-up.pet|+xorg_base|Precise Pangolin xorg server segfaults, use this recompile. xorg-server 1.11.4, xf86-input-evdev 2.6.0, -synaptics 1.5.0, -keyboard 1.6.0, -mouse 1.7.2|ubuntu|precise||
 z_xorg_fix_precise_DEV-1.11.4-up|z_xorg_fix_precise_DEV|1.11.4-up||BuildingBlock|1640K||z_xorg_fix_precise_DEV-1.11.4-up.pet|+z_xorg_fix_precise|xorg recompile for precise|ubuntu|precise||
 linux_headers-3.2.13|linux_headers|3.2.13||BuildingBlock|4772K||linux_headers-3.2.13.pet||header files for 3.2.13 kernel||||
 linux_kernel-3.2.13-pae-i686-up|linux_kernel|3.2.13-pae-i686-up||BuildingBlock|65400K||linux_kernel-3.2.13-pae-i686-up.pet||Linux kernel 3.2.13 compiled in Precise Puppy version 5.2.52|ubuntu|precise||
-seamonkey-2.8|seamonkey|2.8||Document|39908K||seamonkey-2.8.pet||SeaMonkey, compiled by pemasu|ubuntu|precise||
+seamonkey-2.9.1-up|seamonkey|2.9.1-up||Internet|58020K||seamonkey-2.9.1-up.pet|+libvpx,+gtk+|full-featured web browser suite, with browser/mail&news/addressbook/composer|ubuntu|precise||
+seamonkey_DEV-2.9.1-up|seamonkey_DEV|2.9.1-up||BuildingBlock|33504K||seamonkey_DEV-2.9.1-up.pet|+seamonkey|Seamonkey browser suite|ubuntu|precise||