[commit-womb] gnumaint Makefile gm gm-read.pl gm-util.pl gnup...

[Karl Berry]

CVSROOT:        /sources/womb
Module name:    gnumaint
Changes by:     Karl Berry <karl>       12/01/19 01:21:42

Modified files:
        .              : Makefile gm gm-read.pl gm-util.pl 
                         gnupackages.txt oldpackages.txt 

Log message:
        .

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnumaint/Makefile?cvsroot=womb&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/gnumaint/gm?cvsroot=womb&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/gnumaint/gm-read.pl?cvsroot=womb&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnumaint/gm-util.pl?cvsroot=womb&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnumaint/gnupackages.txt?cvsroot=womb&r1=1.98&r2=1.99
http://cvs.savannah.gnu.org/viewcvs/gnumaint/oldpackages.txt?cvsroot=womb&r1=1.11&r2=1.12

Patches:
Index: Makefile
===================================================================
RCS file: /sources/womb/gnumaint/Makefile,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- Makefile    21 Dec 2011 21:01:00 -0000      1.35
+++ Makefile    19 Jan 2012 01:21:41 -0000      1.36
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.35 2011/12/21 21:01:00 karl Exp $
+# $Id: Makefile,v 1.36 2012/01/19 01:21:41 karl Exp $
 # Copyright 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
@@ -12,7 +12,6 @@
 
 test-genmhtml mhtml:  # result included from www.gnu.org/manual/manual.html
        gm generate manual html | tee ~/tmp/x.html
-       scp -q ~/tmp/x.html c2:/u/karl/gnu/www/manual/allgnupkgs.html
 
 test-genphtml shtml:  # result included from www.gnu.org/software/software.html
        gm generate packages html
@@ -32,7 +31,7 @@
 test-nophysical:
        gm list maintainers nophysical
 
-test-listactivity:
+test-listactivity stale:
        gm list packages activity
 
 test-gplv3 gplv3:

Index: gm
===================================================================
RCS file: /sources/womb/gnumaint/gm,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- gm  21 Dec 2011 21:01:00 -0000      1.48
+++ gm  19 Jan 2012 01:21:42 -0000      1.49
@@ -1,8 +1,8 @@
 #!/usr/bin/env perl
-# $Id: gm,v 1.48 2011/12/21 21:01:00 karl Exp $
+# $Id: gm,v 1.49 2012/01/19 01:21:42 karl Exp $
 # GNU maintainer-related operations.
 # 
-# Copyright 2007, 2008, 2009, 2010, 2011 Free Software Foundation Inc.
+# Copyright 2007, 2008, 2009, 2010, 2011, 2012 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
@@ -22,7 +22,7 @@
 require "gm-util.pl";
 require "gm-read.pl";
 
-$DEBUG = 0;
+$DEBUG = 1;
 $ACTIVITY_FILE = "activity-report.txt";
 $COPYRIGHT_LIST_FILE = "copyright.list";
 $COPYRIGHT_PAPERS_FILE = "copyright-papers.txt";
@@ -704,21 +704,25 @@
 
   # sort activity statuses in this order.  If other strings are used,
   # they'll show up first so they can be easily fixed.
-  my %activity_order = ("stale" => 1, "moribund" => 2,
-                        "ok" => 3, "stable" => 4);
+  my %activity_order = ("stale" => 1,
+                        "moribund" => 2,
+                        "ok" => 3,
+                        "stable" => 4,
+                        "container" => 5,
+                       );
   
   my %pkgs = &read_gnupackages ();
   for my $pkgname (sort by_activity keys %pkgs) {
     my %p = %{$pkgs{$pkgname}};
     my $activity = $p{"activity-status"};
-    push (@ret, &gnupkgs_msg ($activity));
+    push (@ret, &gnupkgs_msg ($activity, %p));
   }
   
   return @ret;
   
   sub by_activity {
-    (my $a_status = $pkgs{$a}->{"activity-status"}) =~ s/ .*//;;
-    (my $b_status = $pkgs{$b}->{"activity-status"}) =~ s/ .*//;;
+    (my $a_status = $pkgs{$a}->{"activity-status"}) =~ s/ .*//;
+    (my $b_status = $pkgs{$b}->{"activity-status"}) =~ s/ .*//;
     $activity_order{$a_status} <=> $activity_order{$b_status}
     || $pkgs{$a}->{"activity-status"} cmp $pkgs{$b}->{"activity-status"}
     || $a cmp $b;
@@ -744,8 +748,8 @@
   return @ret;
   
   sub by_gplv3 {
-    (my $a_status = $pkgs{$a}->{"gplv3-status"});# =~ s/ .*//;;
-    (my $b_status = $pkgs{$b}->{"gplv3-status"});# =~ s/ .*//;;
+    (my $a_status = $pkgs{$a}->{"gplv3-status"});# =~ s/ .*//;
+    (my $b_status = $pkgs{$b}->{"gplv3-status"});# =~ s/ .*//;
     $pkgs{$a}->{"gplv3-status"} cmp $pkgs{$b}->{"gplv3-status"}
     || $a cmp $b;
   }

Index: gm-read.pl
===================================================================
RCS file: /sources/womb/gnumaint/gm-read.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gm-read.pl  21 Dec 2011 21:01:00 -0000      1.1
+++ gm-read.pl  19 Jan 2012 01:21:42 -0000      1.2
@@ -1,9 +1,10 @@
-# $Id: gm-read.pl,v 1.1 2011/12/21 21:01:00 karl Exp $
+# $Id: gm-read.pl,v 1.2 2012/01/19 01:21:42 karl Exp $
 # Subroutines for gm script that read various external data file.
 # (In this particular case, using require seemed better than setting up
 # modules.  Certainly simpler.)
 # 
-# Copyright 2007, 2008, 2009, 2010, 2011 Free Software Foundation Inc.
+# Copyright 2007, 2008, 2009, 2010, 2011, 2012 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
@@ -39,9 +40,45 @@
   while (<COPYRIGHT_LIST_FILE>) {
     # Look at lines following a blank line.
     next unless /^\s*$/;
-    $_ = <COPYRIGHT_LIST_FILE>; # go past blank line.
+    $_ = <COPYRIGHT_LIST_FILE>;
     chomp;
     
+#new    # Split at tabs.
+#new    my (@parts) = split (/\t+/);
+#new    
+#new    # If there is only one part, or more than five, something is totally 
awry.
+#new    if (@parts == 1 || @parts > 5) {
+#new      warn "$COPYRIGHT_LIST_FILE:$.: strange line tabs: $_\n";
+#new      next;
+#new
+#new    # If there are only two or three parts, we hope it is a company
+#new    # assignment, like
+#new    # Telmark      2010-4-29
+#new    # Just skip those for now.
+#new    } elsif (@parts == 2) { # xx complain if a pkgname is first?
+#new      warn "2 parts: @parts\n";
+#new      next;
+#new    
+#new    # If there are three parts, we hope it is also a company assignment
+#new    # with package name, like
+#new    # ANY  CNOC vof        2010-5-26
+#new    # Just skip these, too.
+#new    } elsif (@parts == 3) { # xx complain if a pkgname is first?
+#new      warn "3 parts: @parts\n";
+#new      next;
+#new    
+#new    # If there are four parts, it is a mystery.
+#new    } elsif (@parts == 4) { # xx complain if a pkgname is first?
+#new      warn "4 parts?: @parts\n";
+#new      next;
+#new    }
+#new    
+#new    # Five parts is the normal case of a personal assignment, like
+#new    # EMACS        Richard Stallman        USA     1953    1986-09-29
+#new    my ($pkgs,$name,$birthplace,$birthyear,$date) = @parts;
+#new    warn "$pkgs by $name on $date\n";
+#new
+    
     # Drop everything after the first tab, we don't want to see all-caps
     # company names.
     s/\t.*//;
@@ -61,6 +98,9 @@
       # or we're done with this line.
       last unless $w =~ /^[A-Z0-9][A-Z0-9._-]+$/;
       
+      # and if it is only digits, never mind (1559643 Ontario Limited).
+      next if $w =~ /^\d+$/;
+      
       # and if it is only digits and -, that's a date.
       # remember the year if we need it, and we're done with this line.
       if ($w =~ /^\d+-[-\d]+$/) {
@@ -113,11 +153,10 @@
     %map = (
       "dotgnu"         => "dotgnu-pnet", # make container?
       "enterprise"     => "gnue",
+#      "gas"           => "binutils",
       "getopt"         => "libc",
       "glibc"          => "libc",
       "glob"           => "libc",
-      "gnm"            => "binutils",
-      "gnm960"         => "binutils",
       "gnu.regexp"     => "libc",
       "gnu-c"          => "gcc",
       "gnuchess"       => "chess",
@@ -126,17 +165,12 @@
       "gnus"           => "emacs",
       "gnuucp"         => "uucp",
       "gpc"            => "pascal",
-      "gprof"          => "binutils",
+#      "gprof"         => "binutils",
       "graphics"       => "plotutils",
-      "grub2"          => "grub",
-      "gsize"          => "binutils",
-      "gsize960"       => "binutils",
-      "gstrip"         => "binutils",
-      "gstrip960"      => "binutils",
       "hashcash.el"    => "emacs",
       "info"           => "texinfo",
       "interactive"    => "gnuit",
-      "ld"             => "binutils",
+#      "ld"            => "binutils",
       "libavl"         => "avl",
       "libbfd.a"       => "bfd",
       "libgcj"         => "gcc",
@@ -167,7 +201,7 @@
       "regcmp"         => "libc",
       "regex"          => "libc",
       "regexp"         => "regex",
-      "robotussin"     => "binutils",
+#      "robotussin"    => "binutils",
       "sasl"           => "gsasl",
       "shogi"          => "gnushogi",
       "shred"          => "coreutils",
@@ -179,7 +213,7 @@
       "superoptimizer" => "superopt",
       "texi2html"      => "texinfo",
       "verilog-mode.el"        => "emacs",
-      "winboard"       => "xboard",
+#      "winboard"      => "xboard",
     );
     return $map{$w} || $w;
   }
@@ -347,6 +381,8 @@
     }
     
     if ($key eq "package" && $val =~ /[A-Z]/) {
+      # as a convention for simplicitly, we want to eschew uppercase in
+      # package identifiers.
       warn "$GNUPACKAGES_FILE:$.: forcing package name to lowercase\n";
       $val = lc ($val);
     }

Index: gm-util.pl
===================================================================
RCS file: /sources/womb/gnumaint/gm-util.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gm-util.pl  21 Dec 2011 21:01:00 -0000      1.1
+++ gm-util.pl  19 Jan 2012 01:21:42 -0000      1.2
@@ -1,4 +1,4 @@
-# $Id: gm-util.pl,v 1.1 2011/12/21 21:01:00 karl Exp $
+# $Id: gm-util.pl,v 1.2 2012/01/19 01:21:42 karl Exp $
 # Utilities for the gm script.
 # (In this particular case, using require seemed better than setting up
 # modules.  Certainly simpler.)
@@ -36,8 +36,8 @@
 # avoid repeating the field widths.
 # 
 sub gnupkgs_msg {
-  my ($msg, %p) = @_;
-  warn "gnupkgs_msg: no lineno/package elements in %p hash"
+  my ($msg,%p) = @_;
+  warn "gnupkgs_msg: oops, no lineno/package elements in %p hash"
     unless $p{"lineno"} && $p{"package"};
   return sprintf ("$GNUPACKAGES_FILE:%4d:%-16s $msg",
                   $p{"lineno"}, $p{"package"});

Index: gnupackages.txt
===================================================================
RCS file: /sources/womb/gnumaint/gnupackages.txt,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -b -r1.98 -r1.99
--- gnupackages.txt     29 Dec 2011 00:30:49 -0000      1.98
+++ gnupackages.txt     19 Jan 2012 01:21:42 -0000      1.99
@@ -1,4 +1,4 @@
-# $Id: gnupackages.txt,v 1.98 2011/12/29 00:30:49 karl Exp $
+# $Id: gnupackages.txt,v 1.99 2012/01/19 01:21:42 karl Exp $
 # Public domain.
 #
 # This file records information on a per-package basis, *not* including
@@ -155,7 +155,7 @@
 doc-summary: Automated program generator
 doc-url: /software/autogen/manual/
 gplv3-status: done-in-5.9.5
-activity-status: ok 20111204 (5.13)
+activity-status: ok 20111214 (5.14)
 
 package: automake
 language: perl
@@ -399,7 +399,7 @@
 doc-summary: (u)Common C++ framework
 doc-url: none
 gplv3-status: not-done-commoncpp2-1.6.3.tar.gz, done-ucommon-1.9.1
-activity-status: ok commoncpp2-1.8.0/20100224 (ucommon-5.1.0/20111218)
+activity-status: ok commoncpp2-1.8.0/20100224 (ucommon-5.1.2/20120115)
 last-contact: 8jun10 wrote
 
 package: complexity
@@ -421,7 +421,7 @@
 doc-summary: Core GNU utilities (file, text, shell)
 doc-url: /software/coreutils/manual/
 gplv3-status: done-in-7.1
-activity-status: ok 20110908 (8.13)
+activity-status: ok 20120106 (8.13)
 
 package: cpio
 doc-category: Archiving
@@ -477,7 +477,7 @@
 doc-summary: Data recovery utility
 doc-url: htmlxref
 gplv3-status: done-in-1.5
-activity-status: ok 20110111 (1.14)
+activity-status: ok 20120101 (1.14)
 
 package: dejagnu
 mundane-name: DejaGnu
@@ -582,7 +582,7 @@
 doc-summary: Web services and C#
 doc-url: none
 gplv3-status: ok-since-container
-activity-status: container-package-for-dotgnu-pnet-etc.
+activity-status: container for-dotgnu-pnet-etc.
 
 package: dotgnu-forum
 doc-category: Internet
@@ -615,7 +615,7 @@
 doc-summary: Line editor
 doc-url: htmlxref
 gplv3-status: done-in-1.0
-activity-status: ok 20100903 (1.5)
+activity-status: ok 20120101 (1.6)
 
 package: edma
 mundane-name: EDMA
@@ -688,7 +688,7 @@
 doc-category: Software
 doc-summary: A purely functional programming language.
 doc-url: /software/epsilon/manual/
-activity-status: no-release
+activity-status: stale no-release
 last-contact: 13jun10 wrote
 
 package: fdisk
@@ -750,7 +750,7 @@
 logo: /software/freeipmi/images/freeipmi-logo-small.jpg
 gplv3-status: in-dev-sources
 last-contact: 14jan10 replied, next major release
-activity-status: ok 20111213 (1.0.10)
+activity-status: ok 20120103 (1.1.1)
 
 package: freetalk
 doc-category: Internet
@@ -882,7 +882,7 @@
 
 package: gg-network
 gplv3-status: not-applicable
-activity-status: not-applicable
+activity-status: container for-gnu-group
 note: first gnu group
 
 package: ggradebook
@@ -900,7 +900,7 @@
 doc-url: none
 logo: /software/ghostscript/images/gnugs-head.png
 gplv3-status: done-in-8.71.0
-activity-status: ok 20100908 (8.71.1)
+activity-status: ok 20120101 (9.04.1)
 
 package: gift
 mundane-name: GIFT
@@ -1160,7 +1160,7 @@
 doc-summary: Overview of GNU Telephony
 doc-url: /software/gnucomm/overview.html
 gplv3-status: ok-since-container
-activity-status: container-package-for-bayonne-etc.
+activity-status: container for-bayonne-etc.
 
 package: gnue
 mundane-name: Enterprise
@@ -1350,7 +1350,7 @@
 doc-url: none
 gplv3-status: not-done-since-no-release
 activity-status: stale no-release
-last-contact: 24jun09 wrote
+last-contact: 24jun09 wrote, 2011 copyright finally done
 
 package: gnusound
 doc-category: Audio
@@ -1398,7 +1398,7 @@
 doc-summary: Transport layer security library
 doc-url: /software/gnutls/manual/
 gplv3-status: stays-v2-indefinitely (gnumaint-reply 21 Aug 2007 11:13:04)
-activity-status: ok 20111213 (3.0.9, 2.12.14/20111107)
+activity-status: ok 20120106 (3.0.11, 2.12.16/20120106)
 
 package: gnutrition
 doc-category: Health
@@ -1413,7 +1413,7 @@
 doc-summary: Entirely free browser derived from Mozilla Firefox
 doc-url: none
 gplv3-status: ok-since-container
-activity-status: container-package-for-icecat
+activity-status: container for-icecat
 
 package: goldwater
 doc-category: Business
@@ -1436,8 +1436,8 @@
 doc-category: Libraries
 doc-summary: C++ optical design and simulation library
 doc-url: /software/goptical/manual/
-gplv3-status: in-dev-sources
-activity-status: new 25oct09
+gplv3-status: done
+activity-status: ok 20120107 (1.0)
 last-contact: 29nov10 replied, before xmas
 
 package: gorm
@@ -1553,7 +1553,7 @@
 doc-summary: Install latest official GNU releases from original source
 doc-url: /software/gsrc/manual/
 gplv3-status: not-applicable-since-collection
-activity-status: ok 20110824 (1.0.1)
+activity-status: nomaint 20110824 (1.0.1)
 
 package: gss
 mundane-name: Generic Security Service
@@ -1591,7 +1591,7 @@
 doc-summary: Typing tutor
 doc-url: htmlxref
 gplv3-status: done-in-2.8
-activity-status: 20111128 (2.9.1)
+activity-status: ok 20111128 (2.9.1)
 last-contact: 5dec10 volunteer
 
 package: guile
@@ -1702,7 +1702,7 @@
 doc-summary: Automatically generate man pages from program output
 doc-url: none
 gplv3-status: done-in-1.37.1
-activity-status: ok 20110619 (1.40.4)
+activity-status: ok 20120102 (1.40.5)
 
 package: hp2xx
 copyright-holder: not-fsf
@@ -1774,7 +1774,7 @@
 doc-summary: Basic networking utilities
 doc-url: /software/inetutils/manual/
 gplv3-status: done
-activity-status: ok 20100515 (1.8)
+activity-status: ok 20120106 (1.9)
 
 package: intlfonts
 doc-category: Fonts
@@ -1855,7 +1855,7 @@
 doc-summary: Libraries and engines for game programming
 doc-url: none
 gplv3-status: not-done-since-no-release
-activity-status: nomaint no-release
+activity-status: newmaint/20110519
 last-contact: 8nov10 replied, soon
 
 package: less
@@ -1923,7 +1923,7 @@
 doc-summary: Internationalized string processing library
 doc-url: /software/libidn/manual/
 gplv3-status: not-done-partially-in-1.6-except-java?-20mar08
-activity-status: ok 20111125 (1.23)
+activity-status: ok 20120110 (1.24)
 
 package: libmatheval
 doc-category: Mathematics
@@ -2235,7 +2235,8 @@
 doc-summary: C library for arbitrary precision complex arithmetic
 doc-url: http://www.multiprecision.org/index.php?prog=mpc&page=documentation
 gplv3-status: promised-for-next-release-following-mpfr
-activity-status: new/20110305
+download-url: http://www.multiprecision.org/mpc/download/
+activity-status: ok 20110221 (0.9)
 
 package: mtools
 doc-category: Sysadmin
@@ -2293,7 +2294,7 @@
 doc-summary: Initiative to encourage development of free network services
 doc-url: none
 gplv3-status: ok-since-container
-activity-status: container-package-for-group
+activity-status: container for-gnu-"group"
 
 package: ocrad
 doc-category: Interface
@@ -2307,7 +2308,7 @@
 doc-summary: High-level language for numerical computation
 doc-url: /software/octave/docs.html
 gplv3-status: done-in-3.0.1 (licensing #345079)
-activity-status: ok 20111010 (3.4.3)
+activity-status: ok 20120115 (3.6.0)
 
 package: oleo
 doc-category: Spreadsheets
@@ -2607,7 +2608,7 @@
 doc-summary: Manipulate plain text files as databases
 doc-url: /software/recutils/manual/
 gplv3-status: done
-activity-status: ok 20111103 (1.4)
+activity-status: ok 20120113 (1.5)
 
 package: reftex
 doc-category: Text
@@ -2718,7 +2719,7 @@
 doc-summary: Secure peer-to-peer VoIP server for the SIP protocol
 doc-url: none
 gplv3-status: done-in-0.1
-activity-status: ok 20111211 (1.1.4)
+activity-status: ok 20120115 (1.2.1)
 
 package: slib
 mundane-name: SLIB
@@ -2847,7 +2848,7 @@
 doc-summary: Managing installed software packages
 doc-url: /software/stow/manual.html
 gplv3-status: not-done-since-stale
-activity-status: ok 20111211 (2.1.2)
+activity-status: ok 20120110 (2.1.3)
 
 package: stump
 logo: http://www.algebra.com/~ichudov/images/active/stump.jpg
@@ -2979,7 +2980,7 @@
 doc-summary: Transparent Remote Access, Multiple Protocol GNU Emacs package
 doc-url: htmlxref
 gplv3-status: done-in-2.1.14
-activity-status: ok 20111023 (2.2.3)
+activity-status: ok 20120115 (2.2.4)
 
 package: trans-coord
 fsd: none
@@ -2987,7 +2988,7 @@
 doc-summary: Organizational infrastructure for translating www.gnu.org
 doc-url: /software/trans-coord/manual/
 gplv3-status: ok-since-container
-activity-status: container-package-for-gnun
+activity-status: container for-gnun
 note: savannah project for www.gnu.org translation coordination
 
 package: trueprint
@@ -3174,6 +3175,7 @@
 doc-url: /software/xlogmaster/tutorial_toc.html
 gplv3-status: done-as-of-1.6.2
 activity-status: ok 20090624 (1.6.2)
+last-contact: 14jan12 john(darrington) wrote
 
 package: xnee
 doc-category: Software

Index: oldpackages.txt
===================================================================
RCS file: /sources/womb/gnumaint/oldpackages.txt,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- oldpackages.txt     28 Aug 2011 18:51:34 -0000      1.11
+++ oldpackages.txt     19 Jan 2012 01:21:42 -0000      1.12
@@ -1,4 +1,4 @@
-# $Id: oldpackages.txt,v 1.11 2011/08/28 18:51:34 karl Exp $
+# $Id: oldpackages.txt,v 1.12 2012/01/19 01:21:42 karl Exp $
 # Public domain.
 # 
 # This file records information and the old gnupackages entries for
@@ -6,6 +6,9 @@
 # 
 # There is nothing private in this file.
 
+#package: winboard
+#note: part of xboard
+
 package: proto
 copyright-holder: confused
 note: copyright.list says fsf, sources don't