[commit-womb] gnumaint gm-generate.pl gm-read.pl rec/gnupacka...

[Mike Gerwitz]

CVSROOT:        /sources/womb
Module name:    gnumaint
Changes by:     Mike Gerwitz <mikegerwitz>      19/04/09 21:00:45

Modified files:
        .              : gm-generate.pl gm-read.pl 
        rec            : gnupackages.rec pkgblurbs.rec 

Log message:
        Applying Jami patch for Therese Godefroy
        
        <address@hidden>

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnumaint/gm-generate.pl?cvsroot=womb&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnumaint/gm-read.pl?cvsroot=womb&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/gnumaint/rec/gnupackages.rec?cvsroot=womb&r1=1.132&r2=1.133
http://cvs.savannah.gnu.org/viewcvs/gnumaint/rec/pkgblurbs.rec?cvsroot=womb&r1=1.32&r2=1.33

Patches:
Index: gm-generate.pl
===================================================================
RCS file: /sources/womb/gnumaint/gm-generate.pl,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- gm-generate.pl      10 Dec 2018 11:25:53 -0000      1.22
+++ gm-generate.pl      10 Apr 2019 01:00:44 -0000      1.23
@@ -1,4 +1,4 @@
-# $Id: gm-generate.pl,v 1.22 2018/12/10 11:25:53 th_g Exp $
+# $Id: gm-generate.pl,v 1.23 2019/04/10 01:00:44 mikegerwitz Exp $
 # The generate actions for the gm script (see --help message).
 # 
 # Copyright 2007, 2008, 2009, 2010, 2012, 2013, 2014
@@ -94,9 +94,9 @@
     next if &skip_pkg_p ($pkgname);
     my %p = %{$pkgs{$pkgname}};
 
-    my $short_cat = $p{"doc-category"};
+    my $short_cat = $p{"doc_category"};
     if (! $short_cat) {
-      warn (&gnupkgs_msg ("lacks doc-category\n", %p));
+      warn (&gnupkgs_msg ("lacks doc_category\n", %p));
       next;
     }
     
@@ -125,9 +125,9 @@
     # For each package ...
     for my $pkg_ref (sort by_pkgname @{$cat{$short_cat}}) {
       my %p = %$pkg_ref;
-      my ($doc_url,$doc_summary) = ($p{"doc-url"}, $p{"doc-summary"});
+      my ($doc_url,$doc_summary) = ($p{"doc_url"}, $p{"doc_summary"});
       if (! $doc_url || ! $doc_summary) {
-        warn (&gnupkgs_msg ("lacks doc-(url|summary)\n", %p));
+        warn (&gnupkgs_msg ("lacks doc_(url|summary)\n", %p));
         next;
       }
       
@@ -135,7 +135,7 @@
       my $pkgname = $p{"package"};
       my $home_url = "/software/$pkgname/";
       
-      my %doc_urls = &find_doc_urls ($pkgname, $p{"doc-url"});      
+      my %doc_urls = &find_doc_urls ($pkgname, $p{"doc_url"});      
       
       # if there was no explicit url for the package, use the home page.
       if (! exists ($doc_urls{$pkgname})) {
@@ -157,7 +157,7 @@
       
       # the main package identifier and its doc url.  If we have a
       # mundane name, use it.  Otherwise, prettify the pkg identifier.
-      my $human_label = $p{"human-label"};
+      my $human_label = $p{"human_label"};
       $str .= qq!<a href="$doc_urls{$pkgname}">$human_label</a>!;
       
       # followed by other manual identifiers if present.
@@ -274,7 +274,7 @@
         }
 
       } else {
-        warn "$pkgname: overwriting first doc-url value ($ret{$pkgname}) "
+        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.
@@ -290,7 +290,7 @@
   sub find_shop_urls {
     my (%pkg) = @_;
     my $ret;
-    my @shop = split (/\|/, $pkg{"doc-shop"});
+    my @shop = split (/\|/, $pkg{"doc_shop"});
     if (@shop) {
       $ret =  "\n       <br/>Available in print:";
       # keep same ordering as input.
@@ -299,7 +299,7 @@
         my $title = $shop[$i];
         my $url = $shop[$i+1];
         if ($url !~ /https?:/) {
-          warn (&gnupkgs_msg ("doc-shop url lacks http (misordered?)\n",%pkg));
+          warn (&gnupkgs_msg ("doc_shop url lacks http (misordered?)\n",%pkg));
         }
         push (@books, qq!\n       <cite><a href="$url">$title</a></cite>!);
       }
@@ -354,7 +354,7 @@
       if ! exists $gnupkgs{$pkgname};
     #
     # Retrieve info from packages file.
-    my $pkglabel = $gnupkgs{$pkgname}->{"human-label"};
+    my $pkglabel = $gnupkgs{$pkgname}->{"human_label"};
     my $pkgactivity = $gnupkgs{$pkgname}->{"activity_status"};
     my $pkglogo = $gnupkgs{$pkgname}->{"logo"};
     delete $gnupkgs{$pkgname}; # so we can see what's left over

Index: gm-read.pl
===================================================================
RCS file: /sources/womb/gnumaint/gm-read.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- gm-read.pl  10 Dec 2018 11:26:40 -0000      1.25
+++ gm-read.pl  10 Apr 2019 01:00:44 -0000      1.26
@@ -1,4 +1,4 @@
-# $Id: gm-read.pl,v 1.25 2018/12/10 11:26:40 th_g Exp $
+# $Id: gm-read.pl,v 1.26 2019/04/10 01:00:44 mikegerwitz Exp $
 # Subroutines for gm script that read various external data file.
 # 
 # Copyright 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
@@ -412,8 +412,8 @@
 # A key "lineno" is synthesized with the line number of the blank line
 # following the package.
 # 
-# Another key "human-label" is synthesized as a human-oriented package
-# name: the mundane-name: field if it's present, else a prettified
+# Another key "human_label" is synthesized as a human-oriented package
+# name: the mundane_name: field if it's present, else a prettified
 # version of the package identifier.
 # 
 sub read_gnupackages {
@@ -441,7 +441,7 @@
           ($human_label = $pkg{"package"}) =~ s/^gnu/GNU/; # gnufoo -> GNUfoo
           $human_label = ucfirst ($human_label);    # bar -> Bar
         }
-        $copy{"human-label"} = $human_label;
+        $copy{"human_label"} = $human_label;
 
         # save the constructed hash.
         $ret{$pkg{"package"}} = \%copy;

Index: rec/gnupackages.rec
===================================================================
RCS file: /sources/womb/gnumaint/rec/gnupackages.rec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -b -r1.132 -r1.133
--- rec/gnupackages.rec 9 Mar 2019 20:03:01 -0000       1.132
+++ rec/gnupackages.rec 10 Apr 2019 01:00:44 -0000      1.133
@@ -1,4 +1,4 @@
-# $Id: gnupackages.rec,v 1.132 2019/03/09 20:03:01 th_g Exp $
+# $Id: gnupackages.rec,v 1.133 2019/04/10 01:00:44 mikegerwitz Exp $
 # Public domain.
 #
 # This file is maintained in the CVS repository of GNU womb,
@@ -4201,7 +4201,8 @@
 activity_status: ok
 last_activity: 20160425
 
-package: ring
+package: jami
+alias: ring
 doc_category: Live
 doc_summary: A privacy-respecting communication program
 doc_url: none

Index: rec/pkgblurbs.rec
===================================================================
RCS file: /sources/womb/gnumaint/rec/pkgblurbs.rec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- rec/pkgblurbs.rec   20 Jan 2019 16:57:00 -0000      1.32
+++ rec/pkgblurbs.rec   10 Apr 2019 01:00:44 -0000      1.33
@@ -1,4 +1,4 @@
-# $Id: pkgblurbs.rec,v 1.32 2019/01/20 16:57:00 jmd Exp $
+# $Id: pkgblurbs.rec,v 1.33 2019/04/10 01:00:44 mikegerwitz Exp $
 # Public domain.
 #
 # This file is maintained in the CVS repository of GNU womb,
@@ -2362,10 +2362,10 @@
 + LaTeX macros: label, ref, cite and index.  It automates the common
 + tasks that normally are required when using these macros.
 
-id: ring_blurb
-package: ring
-blurb: Ring is a program for universal communication which respects freedoms
-+ and privacy of its users. Ring uses distributed hash tables for
+id: jami_blurb
+package: jami
+blurb: Jami is a program for universal communication which respects freedoms
++ and privacy of its users. Jami uses distributed hash tables for
 + establishing communication. This avoids keeping centralized registries
 + of users and storing personal data.