Promote Advanced (10.73) to Stable

git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@2692 9d0c8265-081b-0410-96cb-a4ca84ce46f8

1 files changed, 31 insertions, 11 deletions

diff --git a/netpbm.c b/netpbm.c
index c47cb37e..f647ad15 100644
--- a/netpbm.c
+++ b/netpbm.c
@@ -29,13 +29,17 @@
 int
 main(int argc, char *argv[]) {
 
-    char* cp;
+    const char * cp;
     
     if (strcmp(pm_arg0toprogname(argv[0]), "netpbm") == 0) {
         ++argv;
         --argc;
         if (argc < 1 || !*argv)	{
-            fprintf(stderr, "Usage: netpbm netpbm_program_name [args ...]\n");
+            fprintf(stderr,
+                    "When you invoke this program by the name 'netpbm', "
+                    "You must supply at least one argument: the name of "
+                    "the Netpbm program to run, e.g. "
+                    "'netpbm pamfile /tmp/myfile.ppm'\n");
             exit(1);
 		}
 	}
@@ -52,25 +56,41 @@ main(int argc, char *argv[]) {
 #include "mergetrylist"
 
     /* Add the obsolete names for some programs */
+    TRY("bmptoppm", main_bmptopnm);
     TRY("gemtopbm", main_gemtopnm);
-    TRY("pnminterp", main_pamstretch);
+    TRY("icontopbm", main_sunicontopnm);
+    TRY("pbmtoicon", main_pbmtosunicon);
+    TRY("pgmedge", main_pamedge);
+    TRY("pgmnorm", main_pnmnorm);
     TRY("pgmoil", main_pamoil);
+    TRY("pgmslice", main_pamslice);
+    TRY("pnmarith", main_pamarith);
+    TRY("pngtopnm", main_pngtopam);
+    TRY("pnmarith", main_pamarith);
+    TRY("pnmcomp", main_pamcomp);
+    TRY("pnmcut", main_pamcut);
+    TRY("pnmdepth", main_pamdepth);
+    TRY("pnmfile", main_pamfile);
+    TRY("pnminterp", main_pamstretch);
+    TRY("pnmenlarge", main_pamenlarge);
+    TRY("pnmscale", main_pamscale);
+    TRY("pnmsplit", main_pamsplit);
+    TRY("pnmtofits", main_pamtofits);
+    TRY("pnmtopnm", main_pamtopnm);
+    TRY("ppmnorm", main_pnmnorm);
+    TRY("ppmtotga", main_pamtotga);
+    TRY("ppmtouil", main_pamtouil);
 
     /* We don't do the ppmtojpeg alias because if user doesn't have a JPEG
        library, there is no main_pnmtojpeg library.  The right way to do
        this is to have these TRY's generated by the subdirectory makes,
        which would know whether pnmtojpeg was built into the merged binary
-       or not.  But that's too much work.
+       or not.  But that's too much work.  Same with TIFF converters.
 
     TRY("ppmtojpeg", main_pnmtojpeg); 
+    TRY("pngtopnm", main_pngtopam); 
+    TRY("pnmtotiff", main_pamtotiff);
     */
-    TRY("bmptoppm", main_bmptopnm);
-    TRY("pgmnorm", main_pnmnorm);
-    TRY("ppmnorm", main_pnmnorm);
-    TRY("ppmtotga", main_pamtotga);
-    TRY("pnmarith", main_pamarith);
-    TRY("pnmfile", main_pamfile);
-    TRY("pgmedge", main_pamedge);
 
     fprintf(stderr,"'%s' is an unknown Netpbm program name \n", cp );
     exit(1);