[commit-womb] gnumaint Makefile gm-read.pl gnupackages.txt

[karl]

CVSROOT:        /sources/womb
Module name:    gnumaint
Changes by:     karl <karl>     14/06/07 13:26:06

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

Log message:
        fsf copyright cases

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnumaint/Makefile?cvsroot=womb&r1=1.58&r2=1.59
http://cvs.savannah.gnu.org/viewcvs/gnumaint/gm-read.pl?cvsroot=womb&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnumaint/gnupackages.txt?cvsroot=womb&r1=1.243&r2=1.244

Patches:
Index: Makefile
===================================================================
RCS file: /sources/womb/gnumaint/Makefile,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- Makefile    5 May 2014 20:54:46 -0000       1.58
+++ Makefile    7 Jun 2014 13:26:05 -0000       1.59
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.58 2014/05/05 20:54:46 brandon Exp $
+# $Id: Makefile,v 1.59 2014/06/07 13:26:05 karl Exp $
 # Copyright 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
 # Free Software Foundation, Inc.
 #
@@ -17,7 +17,7 @@
        gm generate blurbs html   >$(gw)/server/home-pkgblurbs.html
 
 html-diff:
-       cd $(gw) && cvs diff -u0 */allgnupkgs.html server/home-pkgblurbs.html
+       -cd $(gw) && cvs diff -u0 */allgnupkgs.html server/home-pkgblurbs.html
 
 pkg-blurbs-html bhtml:
        gm generate blurbs html | tee ~/tmp/x.html

Index: gm-read.pl
===================================================================
RCS file: /sources/womb/gnumaint/gm-read.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- gm-read.pl  5 May 2014 16:14:26 -0000       1.18
+++ gm-read.pl  7 Jun 2014 13:26:05 -0000       1.19
@@ -1,4 +1,4 @@
-# $Id: gm-read.pl,v 1.18 2014/05/05 16:14:26 karl Exp $
+# $Id: gm-read.pl,v 1.19 2014/06/07 13:26:05 karl Exp $
 # Subroutines for gm script that read various external data file.
 # 
 # Copyright 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
@@ -113,7 +113,7 @@
       }
       
       # keyword ANY in copyright.list is not a package name for us, etc.
-      next if $w =~ /^(ANY|MISC|SPECIAL|TRANSLATIONS|UNUSED)$/;
+      next if $w =~ /^(ANY|MISC|TRANSLATIONS|UNUSED)$/;
       
       # Special case assignment, not a GNU package.
       next if $w =~ /^(READINGRECORD)$/;
@@ -191,7 +191,7 @@
     $w =~ s/_manual//;  # manuals are not separate packages for us.
 
     %map = (
-      "dotgnu"          => "dotgnu-pnet",#remain?
+#      "dotgnu"          => "dotgnu-pnet",#decommissioned
       "enterprise"      => "gnue",     # remain?
       "glibc"           => "libc",     # will remain
 #      "gnu-c"           => "gcc",
@@ -231,11 +231,11 @@
 #      "regcmp"          => "libc",
 #      "regex"           => "libc",
 #      "regexp"          => "regex",
-      "sasl"            => "gsasl",
-      "shogi"           => "gnushogi",
-      "shred"           => "coreutils",
+#      "sasl"            => "gsasl",
+#      "shogi"           => "gnushogi",
+#      "shred"           => "coreutils",
 #      "snprintfv"       => "libc",
-      "sql.el"          => "emacs",
+#      "sql.el"          => "emacs",
 #      "strchr"          => "libc",
 #      "strftime"        => "libc",
 #      "strtod"          => "libc",

Index: gnupackages.txt
===================================================================
RCS file: /sources/womb/gnumaint/gnupackages.txt,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -b -r1.243 -r1.244
--- gnupackages.txt     4 Jun 2014 19:19:59 -0000       1.243
+++ gnupackages.txt     7 Jun 2014 13:26:05 -0000       1.244
@@ -1,4 +1,4 @@
-# $Id: gnupackages.txt,v 1.243 2014/06/04 19:19:59 brandon Exp $
+# $Id: gnupackages.txt,v 1.244 2014/06/07 13:26:05 karl Exp $
 # Public domain.
 #
 # This file is maintained in the CVS repository of GNU womb,
@@ -12,7 +12,7 @@
 # unique to the maintainer(s), it seems cleanest to have two files.
 #
 # Canonical order (idea is more frequently updated items toward the end):
-# package - mundane-name - copyright-holder
+# package - alias- mundane-name - copyright-holder
 # - savannah - fsd - language - logo
 # - doc-category - doc-summary - doc-url - download-url
 # - gplv3-status - activity-status - last-contact
@@ -1566,7 +1566,7 @@
 doc-summary: Print lines matching a pattern
 doc-url: /software/grep/manual/
 gplv3-status: done-in-2.5.4
-activity-status: ok 20140522 (2.19)
+activity-status: ok 20140603 (2.20)
 
 package: gretl
 logo: http://gretl.sourceforge.net/images/gretl-image.png