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

[karl]

CVSROOT:        /sources/womb
Module name:    gnumaint
Changes by:     karl <karl>     14/03/06 23:43:54

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

Log message:
        no SSI for logos in blurb per ineiev; comment out logos that need extra 
url quoting

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnumaint/Makefile?cvsroot=womb&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/gnumaint/gm-generate.pl?cvsroot=womb&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnumaint/gnupackages.txt?cvsroot=womb&r1=1.223&r2=1.224

Patches:
Index: Makefile
===================================================================
RCS file: /sources/womb/gnumaint/Makefile,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- Makefile    18 Oct 2013 13:30:38 -0000      1.55
+++ Makefile    6 Mar 2014 23:43:53 -0000       1.56
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.55 2013/10/18 13:30:38 karl Exp $
+# $Id: Makefile,v 1.56 2014/03/06 23:43:53 karl Exp $
 # Copyright 2007, 2008, 2009, 2010, 2011, 2012, 2013
 # 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
+       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-generate.pl
===================================================================
RCS file: /sources/womb/gnumaint/gm-generate.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- gm-generate.pl      26 Feb 2014 00:05:09 -0000      1.16
+++ gm-generate.pl      6 Mar 2014 23:43:53 -0000       1.17
@@ -1,7 +1,7 @@
-# $Id: gm-generate.pl,v 1.16 2014/02/26 00:05:09 karl Exp $
+# $Id: gm-generate.pl,v 1.17 2014/03/06 23:43:53 karl Exp $
 # The generate actions for the gm script (see --help message).
 # 
-# Copyright 2007, 2008, 2009, 2010, 2012, 2013
+# Copyright 2007, 2008, 2009, 2010, 2012, 2013, 2014
 # Free Software Foundation Inc.
 # 
 # This program is free software: you can redistribute it and/or modify
@@ -370,15 +370,10 @@
                   . qq,#if expr="\$pkg_selection = /:($rxsafe_id|ALL):/" -->,);
 
     # Include the package logo (scaled) in the head, if there is one.
-    my $logo_xhtml = "";
-    if ($pkglogo) {
-      # SSI stuff so that our <img>s do not become localizable texts
-      # that the translators have to deal with.
-      $logo_xhtml
-        = qq,\n<!--#set var="logoimage",
-        . qq, value='<img src="$pkglogo" style="height:1em" />'\n,
-        . qq,  --> <!--#echo encoding="none" var="logoimage" -->,;
-    }
+    $logo_xhtml = $pkglogo
+      ?    qq!\n  <img src="$pkglogo" style="height:1em"\n!
+         . qq!       alt="logo for $pkgname" />'!
+      : "";
     
     # Note for translators if the package is stale.
     my $stale_comment = "";

Index: gnupackages.txt
===================================================================
RCS file: /sources/womb/gnumaint/gnupackages.txt,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -b -r1.223 -r1.224
--- gnupackages.txt     6 Mar 2014 23:30:18 -0000       1.223
+++ gnupackages.txt     6 Mar 2014 23:43:54 -0000       1.224
@@ -1,4 +1,4 @@
-# $Id: gnupackages.txt,v 1.223 2014/03/06 23:30:18 karl Exp $
+# $Id: gnupackages.txt,v 1.224 2014/03/06 23:43:54 karl Exp $
 # Public domain.
 #
 # This file is maintained in the CVS repository of GNU womb,
@@ -380,7 +380,7 @@
 
 package: classpath
 copyright-holder: fsf-no-reply
-xlogo: 
http://developer.classpath.org/mediation/ClasspathBanners?action=AttachFile&amp;do=get&amp;target=GNU_Classpath_badge-180x180.png
+#logowithtoomuchquoting: 
http://developer.classpath.org/mediation/ClasspathBanners?action=AttachFile&amp;do=get&amp;target=GNU_Classpath_badge-180x180.png
 doc-category: Libraries
 doc-summary: Core class libraries for Java
 doc-url: /software/classpath/docs/
@@ -669,7 +669,7 @@
 
 package: emacs
 copyright-holder: fsf-maybe-ok-with-external-#786663
-xlogo: 
http://cvs.savannah.gnu.org/viewvc/*checkout*/emacs/etc/images/icons/emacs_48.png?root=emacs&amp;revision=1.3
+#logowithtoomuchquoting: 
http://cvs.savannah.gnu.org/viewvc/*checkout*/emacs/etc/images/icons/emacs_48.png?root=emacs&amp;revision=1.3
 doc-category: Editors
 doc-summary: The extensible, customizable, self-documenting text editor
 doc-url: /software/emacs/#Manuals
@@ -1100,7 +1100,7 @@
 
 package: gnome
 mundane-name: GNOME
-xlogo: 
http://live.gnome.org/BrandGuidelines?action=AttachFile&amp;do=get&amp;target=GnomeBrandBook-FullLogo.png
+logo: http://www.gnome.org/wp-content/themes/gnome-grass/images/gnome-logo.png
 copyright-holder: notfsf
 doc-category: Interface
 doc-summary: The GNU desktop environment