Revision: miles@gnu.org--gnu-2005/gnus--devo--0--patch-77

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 48)

   - Update from CVS

2005-03-23  Reiner Steib  <Reiner.Steib@gmx.de>

   * texi/Makefile.in (gnus-faq-full-update, gnus-faq-clean)
   (gnus-faq.texi): New targets.
   (distclean): Remove some gnus-faq.* files.

   * texi/xml2texi.sh: Mention requirements.

   * texi/xml2texi.scm (boilerplate): Add "Do not modify ...".

   * texi/gnus-faq.texi: Generated.

diff --git a/texi/ChangeLog b/texi/ChangeLog
index b17995e..c130def 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,15 @@
+2005-03-23  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * Makefile.in (gnus-faq-full-update, gnus-faq-clean)
+       (gnus-faq.texi): New targets.
+       (distclean): Remove some gnus-faq.* files.
+
+       * xml2texi.sh: Mention requirements.
+
+       * xml2texi.scm (boilerplate): Add "Do not modify ...".
+
+       * gnus-faq.texi: Generated.
+
 2005-03-22  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * gnus-faq.texi: Generated from gnus-faq.xml using xml2texi.*.

diff --git a/texi/Makefile.in b/texi/Makefile.in
index 8a022af..f46e360 100644 (file)
--- a/texi/Makefile.in
+++ b/texi/Makefile.in
@@ -87,6 +87,25 @@ booklet.pdf: booklet.tex gnuslogo-refcard.eps gnusref.tex
                mv bk-lt.pdf booklet.pdf ;\
        fi
 
+gnus-faq-full-update:  gnus-faq-clean gnus-faq.texi
+
+gnus-faq.xml:
+       cvs -z3 -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/gnus \
+         co -p gnus-faq/src/gnus-faq.xml > $@.tmp
+       head -n 1 $@.tmp | grep '^<.xml version' || \
+         { echo "Update of $@ failed."; : rm $@.tmp; exit 1; }
+       mv $@.tmp $@
+
+gnus-faq.texi: gnus-faq.xml
+       ./xml2texi.sh $< $@.tmp
+       @echo
+# FIXME: This should be done in xml2texi.scm or gnus-faq.xml should be
+# changed:
+       sed '/\$$Id: Makefile.in,v 6.29.2.3 2005/03/23 14:52:41 rsteib Exp $$/d' < $@.tmp > $@
+
+gnus-faq-clean:
+       rm -f gnus-faq.xml gnus-faq.*.tmp gnus-faq.texi
+
 clean:
        rm -f *.[cgk]idx *.aux *.cp *.cps *.dvi *.dvi-x *.fn *.ky       \
        *.kys *.latexi *.log *.orig *.pdf *.pdf-x *.pg *.rej            \
@@ -187,6 +206,7 @@ distclean: veryclean
        rm -f message-[0-9]
        rm -f $(INFO_DEPS)
        rm -f gnusconfig.tex
+       rm -f gnus-faq.xml gnus-faq.*.tmp
 
 install: $(INFO_DEPS)
        $(SHELL) $(top_srcdir)/mkinstalldirs $(infodir)

diff --git a/texi/gnus-faq.texi b/texi/gnus-faq.texi
index ea70c27..742227b 100644 (file)
--- a/texi/gnus-faq.texi
+++ b/texi/gnus-faq.texi
@@ -2,9 +2,14 @@
 @c Uncomment 1st line before texing this file alone.
 @c %**start of header
 @c Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+@c
+@c Do not modify this file, it was generated from gnus-faq.xml, available from
+@c <URL:http://my.gnus.org/FAQ/>.
+@c
 @setfilename gnus-faq.info
 @settitle Frequently Asked Questions
 @c %**end of header
+@c
 
 @node Frequently Asked Questions
 @section Frequently Asked Questions

diff --git a/texi/xml2texi.scm b/texi/xml2texi.scm
index de68c37..b2a6161 100644 (file)
--- a/texi/xml2texi.scm
+++ b/texi/xml2texi.scm
@@ -78,9 +78,14 @@
 @c Uncomment 1st line before texing this file alone.~%\
 @c %**start of header~%\
 @c Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.~%\
+@c~%\
+@c Do not modify this file, it was generated from gnus-faq.xml, available from~%\
+@c <URL:http://my.gnus.org/FAQ/>.~%\
+@c~%\
 @setfilename gnus-faq.info~%\
 @settitle ~A~%\
 @c %**end of header~%\
+@c~%\
 " titel)))
 
 ;; Inserted right before the end of the file

diff --git a/texi/xml2texi.sh b/texi/xml2texi.sh
index e40e770..779de36 100755 (executable)
--- a/texi/xml2texi.sh
+++ b/texi/xml2texi.sh
@@ -25,7 +25,20 @@ exec mzscheme -mr $0 ${1+"$@"}
 ;;  Boston, MA 02111-1307, USA.
 
 ;;; Commentary:
+;;
+;; Requirements:
+;;
+;; To run this scheme program you need MzScheme and DrScheme.
+;;
+;; Some URLs:
+;; http://www.plt-scheme.org/software/mzscheme/
+;; http://www.drscheme.org/
+;; http://www.plt-scheme.org/software/
 ;; 
+;; ,----[ http://www.plt-scheme.org/license/ ]
+;; | PLT software is distributed under the
+;; |  GNU Lesser General Public License (LGPL).
+;; `----
 
 ;;; Code:
 
@@ -42,7 +55,7 @@ exec mzscheme -mr $0 ${1+"$@"}
    (set! +in+ in))
   (("-o" "--output") out "Name of output file (default gnus-faq.texi)"
    (set! +out+ out))
-  (("-l" "--library") lib "Name of Scheme library to load (default faqxml2texi.scm)"
+  (("-l" "--library") lib "Name of Scheme library to load (default xml2texi.scm)"
    (set! +scmfile+ lib)))
  (help-labels "The first (or only) remaining argument is used as the name of the Input file"
               "The second argument is used as the name of the Output file")