RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: popt                             Date:   11-Feb-2008 21:49:29
  Branch: HEAD                             Handle: 2008021120492900

  Modified files:
    popt                    CHANGES popthelp.c

  Log:
    - jbj: include "-- Terminate options" end-of-options msg in
    poptHelpOptions.

  Summary:
    Revision    Changes     Path
    1.38        +1  -0      popt/CHANGES
    1.72        +2  -0      popt/popthelp.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: popt/CHANGES
  ============================================================================
  $ cvs diff -u -r1.37 -r1.38 CHANGES
  --- popt/CHANGES	11 Feb 2008 19:46:59 -0000	1.37
  +++ popt/CHANGES	11 Feb 2008 20:49:29 -0000	1.38
  @@ -1,4 +1,5 @@
   1.13 -> 1.14:
  +    - jbj: include "-- Terminate options" end-of-options msg in poptHelpOptions.
       - jbj: opt->argDescrip[0] determines "--foo=bar" or "--foo bar".
       - jbj: --long always padded for alignment with/without "-X, ".
       - jbj: Display shortName iff printable non-space.
  @@ .
  patch -p0 <<'@@ .'
  Index: popt/popthelp.c
  ============================================================================
  $ cvs diff -u -r1.71 -r1.72 popthelp.c
  --- popt/popthelp.c	11 Feb 2008 19:46:59 -0000	1.71
  +++ popt/popthelp.c	11 Feb 2008 20:49:29 -0000	1.72
  @@ -73,6 +73,7 @@
     { NULL, '\0', POPT_ARG_CALLBACK, (void *)displayArgs, 0, NULL, NULL },
     { "help", '?', 0, NULL, (int)'?', N_("Show this help message"), NULL },
     { "usage", '\0', 0, NULL, (int)'u', N_("Display brief usage message"), NULL },
  +  { "", '\0',	0, NULL, 0, N_("Terminate options"), NULL },
       POPT_TABLEEND
   } ;
   
  @@ -88,6 +89,7 @@
     { "defaults", '\0', POPT_ARG_NONE, &show_option_defaults, 0,
   	N_("Display option defaults in message"), NULL },
   #endif
  +  { "", '\0',	0, NULL, 0, N_("Terminate options"), NULL },
       POPT_TABLEEND
   } ;
   
  @@ .