[commit-womb] gnumaint gm gnupackages.txt

[Karl Berry]

CVSROOT:        /sources/womb
Module name:    gnumaint
Changes by:     Karl Berry <karl>       10/12/25 18:15:56

Modified files:
        .              : gm gnupackages.txt 

Log message:
        (list_copyrightfsf): do not work about decommissioned packages

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnumaint/gm?cvsroot=womb&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/gnumaint/gnupackages.txt?cvsroot=womb&r1=1.80&r2=1.81

Patches:
Index: gm
===================================================================
RCS file: /sources/womb/gnumaint/gm,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- gm  17 Dec 2010 18:31:18 -0000      1.35
+++ gm  25 Dec 2010 18:15:55 -0000      1.36
@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-# $Id: gm,v 1.35 2010/12/17 18:31:18 karl Exp $
+# $Id: gm,v 1.36 2010/12/25 18:15:55 karl Exp $
 # GNU maintainer-related operations.
 # 
 # Copyright 2007, 2008, 2009, 2010 Free Software Foundation Inc.
@@ -26,6 +26,7 @@
 $GNUPACKAGES_FILE = "gnupackages.txt";
 $HTMLXREF_FILE = "htmlxref.cnf";
 $MAINTAINERS_FILE = "maintainers";
+$OLDPACKAGES_FILE = "oldpackages.txt";
 $RECENTREL_FILE = "recentrel.txt";
 $SAVANNAH_FILE = "groups.tsv";
 
@@ -511,9 +512,9 @@
 
 
 
-# Return the packages, and their maintainers, for which the FSF is the
-# copyright holder.  Or, if the NOT argument is set, for which it is not
-# the copyright holder.  Output is one line for each package.
+# Return a list of strings: the packages and their maintainers, for
+# which the FSF is the copyright holder.  Or, if the NOT argument is
+# set, for which it is not the copyright holder.
 # 
 sub list_copyrightfsf_
 {
@@ -521,12 +522,13 @@
   my @ret = ();
 
   my %fsf_pkgs = &read_copyright_list ();
+  my %old_pkgs = &read_oldpackages ();
   my %maint_pkgs = &read_maintainers ("by-package");
 
-  for my $fsf_pkg (sort keys %fsf_pkgs) {
-    if (! exists $maint_pkgs{$fsf_pkg}) {
-      if (! &skip_fsf ($fsf_pkg)) {
-        # xx should also exclude old-packages.txt
+  for my $fsf_pkg (sort keys %fsf_pkgs) {  # packages in copyright.list
+    if (! exists $maint_pkgs{$fsf_pkg}) {  # if not in maintainers ...
+      # warn about stray names unless known special case, or decommissioned.
+      if (! &skip_fsf ($fsf_pkg) && ! exists $old_pkgs{$fsf_pkg}) {
         $fsf_line = $fsf_pkgs{$fsf_pkg};
         warn "$COPYRIGHT_LIST_FILE:$fsf_line: $fsf_pkg not in maintainers\n";
       }
@@ -969,7 +971,6 @@
 # 
 sub read_gnupackages
 {
-  my ($how) = @_;
   my %ret;
   
   open (GNUPACKAGES_FILE) || die "open($GNUPACKAGES_FILE) failed: $!";
@@ -1218,6 +1219,18 @@
 # Return list of entries in $RECENTREL_FILE -- one per line, ignoring
 # comments starting with # and blank lines.
 # 
+sub read_oldpackages
+{
+  local $GNUPACKAGES_FILE = $OLDPACKAGES_FILE;
+  my %ret = &read_gnupackages ();    # reuse routine via dynamic scoping
+  return %ret;
+}  
+
+
+
+# Return list of entries in $RECENTREL_FILE -- one per line, ignoring
+# comments starting with # and blank lines.
+# 
 sub read_recentrel
 {
   my @ret = ();

Index: gnupackages.txt
===================================================================
RCS file: /sources/womb/gnumaint/gnupackages.txt,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- gnupackages.txt     17 Dec 2010 18:31:18 -0000      1.80
+++ gnupackages.txt     25 Dec 2010 18:15:56 -0000      1.81
@@ -1,4 +1,4 @@
-# $Id: gnupackages.txt,v 1.80 2010/12/17 18:31:18 karl Exp $
+# $Id: gnupackages.txt,v 1.81 2010/12/25 18:15:56 karl Exp $
 # Public domain.
 #
 # This file records information on a per-package basis, *not* including
@@ -404,7 +404,7 @@
 doc-summary: Core GNU utilities (file, text, shell)
 doc-url: /software/coreutils/manual/
 gplv3-status: done-in-7.1
-activity-status: ok 20101113 (8.7)
+activity-status: ok 20101222 (8.8)
 
 package: cpio
 doc-category: Archiving
@@ -1003,7 +1003,7 @@
 doc-url: none
 gplv3-status: not-done-in-4.0.0-newmaint
 activity-status: newmaint/20100622 20030729 (4.00)
-last-contact: 12nov10,3oct10 wrote about update
+last-contact: 21dec10 replied about ftp
 
 package: gnome
 mundane-name: GNOME
@@ -1244,7 +1244,7 @@
 doc-summary: A secure peer-to-peer framework
 doc-url: http://gnunet.org/book
 gplv3-status: depends-on-mysql (gnumaint-reply 20 Aug 2007 20:40:48)
-activity-status: ok 20100703 (0.9.0pre1)
+activity-status: ok 20101223 (0.9.0pre2)
 
 package: gnupg
 mundane-name: GnuPG
@@ -2313,7 +2313,7 @@
 doc-summary: Build and execute command lines in parallel
 doc-url: /software/parallel/man.html
 gplv3-status: done-in-20100424
-activity-status: ok 20101121 (20101121)
+activity-status: ok 20101222 (20101222)
 
 package: parted
 doc-category: Sysadmin
@@ -2559,7 +2559,7 @@
 doc-category: Database
 doc-summary: Manipulate plain text files as databases
 doc-url: none
-activity-status: ok 20101128 (1.0)
+activity-status: ok 20101223 (1.1)
 
 package: reftex
 doc-category: Text
@@ -2696,7 +2696,7 @@
 doc-url: htmlxref
 logo: http://www.smalltalk.org/images/balloon2.gif
 gplv3-status: needs-exception-#362488, brett 29 Oct 2009 18:02:27
-activity-status: ok 20100731 (3.2.2)
+activity-status: ok 20101217 (3.2.3)
 note: html manuals are constructed ok, but have generic names ("manual")
 
 package: smarteiffel
@@ -2830,7 +2830,7 @@
 doc-summary: POSIX software packaging utilities
 doc-url: htmlxref
 gplv3-status: done-in-0.951 (20apr08)
-activity-status: ok 20100914 (1.6)
+activity-status: ok 20101219 (1.7)
 
 package: sxml
 download-url: http://medialab.di.unipi.it/Project/SXML/resources.html