[commit-womb] gnumaint .cvsignore README gm gm-generate.pl gn...

[karl]

CVSROOT:        /sources/womb
Module name:    gnumaint
Changes by:     karl <karl>     13/06/24 18:05:08

Modified files:
        .              : .cvsignore README gm gm-generate.pl 
                         gnupackages.txt 
Added files:
        .              : gnumaint.README 

Log message:
        put basic info into README, move old stuff to gnumaint.README

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnumaint/.cvsignore?cvsroot=womb&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnumaint/README?cvsroot=womb&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnumaint/gm?cvsroot=womb&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/gnumaint/gm-generate.pl?cvsroot=womb&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnumaint/gnupackages.txt?cvsroot=womb&r1=1.177&r2=1.178
http://cvs.savannah.gnu.org/viewcvs/gnumaint/gnumaint.README?cvsroot=womb&rev=1.1

Patches:
Index: .cvsignore
===================================================================
RCS file: /sources/womb/gnumaint/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- .cvsignore  10 Mar 2013 21:39:09 -0000      1.12
+++ .cvsignore  24 Jun 2013 18:05:07 -0000      1.13
@@ -1,5 +1,6 @@
 ChangeLog
 activity-report.txt
+copyright-papers.txt
 m.test
 msg.*
 *.mbox*

Index: README
===================================================================
RCS file: /sources/womb/gnumaint/README,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- README      17 Feb 2008 15:07:44 -0000      1.11
+++ README      24 Jun 2013 18:05:07 -0000      1.12
@@ -1,42 +1,36 @@
-Copyright 2007 Free Software Foundation, Inc.
+Copyright 2013 Free Software Foundation, Inc.
+
+  Copying and distribution of this file, with or without modification,
+  are permitted in any medium without royalty provided the copyright
+  notice and this notice are preserved.
+
+The gm script is about performing various GNU maintainer/package
+operations.  Run gm --help for a list.  What's been done is what has
+been needed in practice, rather than any kind of theoretical list of
+what might be useful.
+
+gm combines information from several files.  The most important are
+./gnupackages.txt (maintained in the CVS here, can be updated whenever
+and by whomever) and the fp:/gd/gnuorg/maintainers (maintained on
+fencepost, in RCS, and should only be modified if you have explicit
+permission from rms to do so).
+
+For a list of all the files needed to do the various jobs, see the
+variables given at the top the gm file.  You yourself need to set up
+symlinks to them as needed, and arrange your own cron jobs (or whatever)
+to ensure your versions stay current.
+
+Perhaps the most frequent operation is updating the allgnupkgs.html on
+www.gnu.org.  If you set the envvar gw to the path of your www checkout,
+running make update-html will do this.  (It is just running three "gm
+generate" invocations, no magic involved, so go ahead and do it
+individually as needed.)
+
+The Makefile has a variety of other current and historical tasks, so
+it is good to peruse it, adapt it, update it.
+
+Happy maintaining.
+
+P.S. The gnumaint script was a first attempt at this job, dealing with
+the first mass email we did, ca.2007; see gnumaint.README.
 
-Copying and distribution of this file, with or without modification,
-are permitted in any medium without royalty provided the copyright
-notice and this notice are preserved.
-
-
-gnumaint is a manager for the /gd/gnuorg/maintainers file, the
-official list of GNU packages and maintainers.
-It was written by Jose Marchesi in 2006-07.
-
-You can get listings (see ./gnumaint help list),
-send email to maintainers (./gnumaint help sendemail),
-and receive answers from the maintainers (./gnumaint help recemail).
-The ./Makefile shows sample invocations testing the various features.
-
-The file ./template-active.txt defines the mail message sent.  The first
-line is the Subject: header, the rest is the body.  The receive function
-looks for the specific string in the Subject:, so don't change it in one
-place without the other.
-
-Lines in the template starting with fmt: are piped through fmt before
-sending.
-
-If any questions/suggestions about the software, please email
address@hidden
-
-todo:
-- check for inconsistent case in maintainers package names.
-- send different msg to people in recentrel.txt.
-
-bugs from last send:
-fsd-by-license did not find gplv3 tar?!
-and what about slib publicdomain? should not have been mailed.
-ditto speex, which was xiph -- shouldn't have been mailed.
-then review mixed msgs to go out -- not tar, not gcc.
-unknown, unconfirmed maintainers
-sort both maintainers and gnupackages by block
-no non-email maintainers in .bypkg
-multiple email fields -> error
-on receipt, have to match any altemail not just primary
-must ignore maintainers without email, not send to empty

Index: gm
===================================================================
RCS file: /sources/womb/gnumaint/gm,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- gm  3 Mar 2013 23:59:52 -0000       1.55
+++ gm  24 Jun 2013 18:05:07 -0000      1.56
@@ -1,8 +1,9 @@
 #!/usr/bin/env perl
-# $Id: gm,v 1.55 2013/03/03 23:59:52 karl Exp $
+# $Id: gm,v 1.56 2013/06/24 18:05:07 karl Exp $
 # GNU maintainer-related operations.
 # 
-# Copyright 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation Inc.
+# Copyright 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software
+# Foundation Inc.
 # 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,6 +20,9 @@
 #
 # Originally written by Karl Berry.
 
+$DEBUG = 0;
+my $ver = '$Id: gm,v 1.56 2013/06/24 18:05:07 karl Exp $';
+
 # In this particular case, using require seemed better than setting up
 # modules.  It's certainly simpler.
 require "gm-check.pl";
@@ -28,8 +32,6 @@
 require "gm-read.pl";
 require "gm-util.pl";
 
-$DEBUG = 0;
-
 # Recommended way to deal with the foreign data files: have a cron job
 # that copies them locally and nightly; put symlinks in this directory
 # to the cron-updated files.
@@ -38,15 +40,9 @@
 $ACTIVITY_FILE = "activity-report.txt";
   # fp:/gd/gnuorg/copyright.list
 $COPYRIGHT_LIST_FILE = "copyright.list";
-  # list received from address@hidden:
-$COPYRIGHT_PAPERS_FILE = "copyright-papers.txt";
   # maintained here:
 $DOC_CATEGORIES_FILE = "doc-categories.txt";
-  # rsync://ftp.gnu.org/gnu/
-$FTPLISTING_FILE = "ftplisting.txt";
-  # fp:/srv/data/ftp-upload/maintainers_emails.txt
-$FTPUPLOAD_EMAIL_FILE = "ftp-upload-email.txt";
-  # maintainer here:
+  # maintained here:
 $GNUPACKAGES_FILE = "gnupackages.txt";
   # http://ftp.gnu.org/gnu/texinfo/htmlxref.cnf
 $HTMLXREF_FILE = "htmlxref.cnf";
@@ -54,10 +50,20 @@
 $MAINTAINERS_FILE = "maintainers";
   # maintained here:
 $OLDPACKAGES_FILE = "oldpackages.txt";
+
+# The routines using these additional files are not yet fully implemented.
+  # rsync://ftp.gnu.org/gnu/
+$FTPLISTING_FILE = "ftplisting.txt";
+  # fp:/srv/data/ftp-upload/maintainers_emails.txt
+$FTPUPLOAD_EMAIL_FILE = "ftp-upload-email.txt";
+  # (undone) list received from address@hidden:
+$COPYRIGHT_PAPERS_FILE = "copyright-papers.txt";
+  # (undone) http://savannah.gnu.org/cooperation/groups.tsv
+$SAVANNAH_FILE = "groups.tsv";
   # maintained here (stale):
 $RECENTREL_FILE = "recentrel.txt";
-  # http://savannah.gnu.org/cooperation/groups.tsv
-$SAVANNAH_FILE = "groups.tsv";
+
+# (Not all of the above are fully implemented yet.)
 
 exit (&main ());
 
@@ -66,7 +72,7 @@
   my $arg1 = $ARGV[1];
   my $arg2 = $ARGV[2];
   
-  if ($cmd =~ /^--?help *$/) {
+  if ($cmd =~ /^-?-?help *$/) {
     print <<END_USAGE;
 Usage: $0 CMD ARG...
 
@@ -97,12 +103,18 @@
 "generate" actions write output that's intended to be used directly, and
 "list" actions are for information and further consumption.
 
+$ver
 Correspondence to address@hidden
 END_USAGE
     return 0;
   }
 
-# More features started but not finished:
+  elsif ($cmd =~ /^-?-?version *$/) {
+    print "$ver\n";
+    return 0;
+  }
+
+# Features started but not finished:
 #check activityfile              verify activity-report.txt
 #list copyrightpapers            copyright.list vs. paperwork
 #check ftplisting                verify consistency: ftplisting.txt

Index: gm-generate.pl
===================================================================
RCS file: /sources/womb/gnumaint/gm-generate.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gm-generate.pl      8 Feb 2013 19:27:59 -0000       1.1
+++ gm-generate.pl      24 Jun 2013 18:05:07 -0000      1.2
@@ -1,4 +1,4 @@
-# $Id: gm-generate.pl,v 1.1 2013/02/08 19:27:59 karl Exp $
+# $Id: gm-generate.pl,v 1.2 2013/06/24 18:05:07 karl Exp $
 # The generate actions for the gm script (see --help message).
 # 
 # Copyright 2007, 2008, 2009, 2010, 2012, 2013 Free Software Foundation
@@ -246,7 +246,7 @@
   # identifiers and values are their urls.
   #
   sub find_doc_urls {
-    my ($pkgname, $doc_url_val) = @_;
+    my ($pkgname,$doc_url_val) = @_;
     my %ret;
     
     my @vals = split (/\|/, $doc_url_val); # result of parsing is | separators
@@ -275,6 +275,9 @@
         }
 
       } else {
+        warn "$pkgname: overwriting first doc-url value ($ret{$pkgname}) "
+             . "with $val"  # source file should not do this.
+          if (exists $ret{$pkgname}); 
         $ret{$pkgname} = $val;  # always prefer url given in gnupackages.
       }
     }

Index: gnupackages.txt
===================================================================
RCS file: /sources/womb/gnumaint/gnupackages.txt,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -b -r1.177 -r1.178
--- gnupackages.txt     18 Jun 2013 22:11:45 -0000      1.177
+++ gnupackages.txt     24 Jun 2013 18:05:07 -0000      1.178
@@ -1,4 +1,4 @@
-# $Id: gnupackages.txt,v 1.177 2013/06/18 22:11:45 karl Exp $
+# $Id: gnupackages.txt,v 1.178 2013/06/24 18:05:07 karl Exp $
 # Public domain.
 # 
 # This file is maintained in the CVS repository of GNU womb,
@@ -26,10 +26,12 @@
 #
 # - Default for download-url is http://ftp.gnu.org/gnu/PKGNAME.
 #
-# - A doc-url value of "htmlxref" means to use the Texinfo htmlxref.cnf file,
-#   "none" means no specific documentation page (home page should be used).
-#   htmlxref.cnf also contains entries in addition to those here.
-#   There can be more than doc-url for a given package.
+# - A doc-url value of "none" means no specific documentation page (home
+#     page is used).
+#   "htmlxref" means to extract a list of additional manuals from the
+#     Texinfo htmlxref.cnf file.
+#   Otherwise, it can be a url, which can be used together with htmlxref,
+#   but multiple explicit urls or other combinations are not supported.
 #
 # - doc-category values are in doc-categories.txt (following FSD).
 # (doc stuff is used to generate gnu.org/manual.)
@@ -164,7 +166,7 @@
 doc-summary: Making GNU standards-compliant Makefiles
 doc-url: /software/automake/manual/
 gplv3-status: done-with-exception-#349136
-activity-status: ok 20130614 (1.13.4)
+activity-status: ok 20130621 (1.14)
 
 package: avl
 copyright-holder: fsf-ok-#786498
@@ -632,7 +634,7 @@
 doc-summary: Line-oriented text editor
 doc-url: htmlxref
 gplv3-status: done-in-1.0
-activity-status: ok 20130423 (1.7)
+activity-status: ok 20130621 (1.9)
 
 package: edma
 mundane-name: EDMA
@@ -649,7 +651,7 @@
 doc-url: http://www.staticfreesoft.com/jmanual/
 doc-summary: electrical CAD system
 gplv3-status: in-dev-sources (gnumaint-reply 20 Aug 2007 18:50:41 -0700)
-activity-status: ok 20130614 (9.04)
+activity-status: ok 20130620 (9.04)
 
 package: emacs
 copyright-holder: fsf-maybe-ok-with-external-#786663
@@ -785,7 +787,7 @@
 logo: /software/freeipmi/images/freeipmi-logo-small.jpg
 gplv3-status: in-dev-sources
 last-contact: 14jan10 replied, next major release
-activity-status: ok 20130516 (1.2.7)
+activity-status: ok 20130621 (1.2.8)
 
 package: freetalk
 doc-category: Internet
@@ -1013,7 +1015,7 @@
 doc-summary: GNU Linear Programming Kit, supporting the MathProg language
 doc-url: none
 gplv3-status: done-in-directory
-activity-status: ok 20130524 (4.50)
+activity-status: ok 20130619 (4.51)
 
 package: glue
 mundane-name: GLUE
@@ -1111,7 +1113,7 @@
 doc-summary: Reference manual for the C programming language
 doc-url: htmlxref
 gplv3-status: doc
-activity-status: ok 20111105 (0.2.2)
+activity-status: ok 20130618 (0.2.2)
 note: to be superseded by rms manual? #786666
 
 package: gnu-crypto
@@ -1988,7 +1990,6 @@
 language: c
 doc-category: Libraries
 doc-summary: C library implementing an HTTP 1.1 server
-doc-url: /software/libmicrohttpd/#using
 doc-url: /software/libmicrohttpd/manual/
 gplv3-status: depends-on-gnunet-lgplv2.1+
 activity-status: ok 20130505 (0.9.27)
@@ -2454,7 +2455,7 @@
 doc-summary: Build and execute command lines in parallel
 doc-url: /software/parallel/man.html
 gplv3-status: done-in-20100424
-activity-status: ok 20130522 (20130522)
+activity-status: ok 20130622 (20130622)
 
 package: parted
 copyright-holder: fsf-no-reply
@@ -3080,7 +3081,7 @@
 doc-category: Text
 doc-summary: Convert Rich Text Format documents to other formats
 doc-url: none
-activity-status: ok 20130125 (0.21.3)
+activity-status: ok 20130618 (0.21.4)
 
 package: userv
 doc-category: Security
@@ -3271,6 +3272,3 @@
 activity-status: ok 20121001 (2.4.9)
 
 # End. (Do not remove this line or the blank line before it.  Thanks.)
-doc-category: 
-doc-summary: 
-doc-url: none

Index: gnumaint.README
===================================================================
RCS file: gnumaint.README
diff -N gnumaint.README
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ gnumaint.README     24 Jun 2013 18:05:07 -0000      1.1
@@ -0,0 +1,42 @@
+Copyright 2007 Free Software Foundation, Inc.
+
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.
+
+
+gnumaint is a manager for the /gd/gnuorg/maintainers file, the
+official list of GNU packages and maintainers.
+It was written by Jose Marchesi in 2006-07.
+
+You can get listings (see ./gnumaint help list),
+send email to maintainers (./gnumaint help sendemail),
+and receive answers from the maintainers (./gnumaint help recemail).
+The ./Makefile shows sample invocations testing the various features.
+
+The file ./template-active.txt defines the mail message sent.  The first
+line is the Subject: header, the rest is the body.  The receive function
+looks for the specific string in the Subject:, so don't change it in one
+place without the other.
+
+Lines in the template starting with fmt: are piped through fmt before
+sending.
+
+If any questions/suggestions about the software, please email
address@hidden
+
+todo:
+- check for inconsistent case in maintainers package names.
+- send different msg to people in recentrel.txt.
+
+bugs from last send:
+fsd-by-license did not find gplv3 tar?!
+and what about slib publicdomain? should not have been mailed.
+ditto speex, which was xiph -- shouldn't have been mailed.
+then review mixed msgs to go out -- not tar, not gcc.
+unknown, unconfirmed maintainers
+sort both maintainers and gnupackages by block
+no non-email maintainers in .bypkg
+multiple email fields -> error
+on receipt, have to match any altemail not just primary
+must ignore maintainers without email, not send to empty