[svn] GnuPG - r5437 - in branches/STABLE-BRANCH-1-4: . doc

[svn author wk]

Author: wk
Date: 2010-10-05 16:37:43 +0200 (Tue, 05 Oct 2010)
New Revision: 5437

Added:
   branches/STABLE-BRANCH-1-4/doc/FAQ
Removed:
   branches/STABLE-BRANCH-1-4/doc/faq.raw
Modified:
   branches/STABLE-BRANCH-1-4/ChangeLog
   branches/STABLE-BRANCH-1-4/configure.ac
   branches/STABLE-BRANCH-1-4/doc/ChangeLog
   branches/STABLE-BRANCH-1-4/doc/Makefile.am
Log:
Remove FAQ stuff


Modified: branches/STABLE-BRANCH-1-4/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/ChangeLog	2010-10-05 14:29:37 UTC (rev 5436)
+++ branches/STABLE-BRANCH-1-4/ChangeLog	2010-10-05 14:37:43 UTC (rev 5437)
@@ -1,3 +1,7 @@
+2010-10-05  Werner Koch  <wk at g10code.com>
+
+	* configure.ac: Remove check for the faqprog.
+
 2010-09-28  Werner Koch  <wk at g10code.com>
 
 	* configure.ac (AH_BOTTOM) [__VMS]: Fix homedir.

Modified: branches/STABLE-BRANCH-1-4/doc/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/doc/ChangeLog	2010-10-05 14:29:37 UTC (rev 5436)
+++ branches/STABLE-BRANCH-1-4/doc/ChangeLog	2010-10-05 14:37:43 UTC (rev 5437)
@@ -1,3 +1,9 @@
+2010-10-05  Werner Koch  <wk at g10code.com>
+
+	* FAQ: Make it a static file with a pointer to the online location.
+	* Makefile.am (EXTRA_DIST): Remove faq.raw and faq.html.
+	(FAQ, faq.html): Remove these targets
+
 2010-02-11  Werner Koch  <wk at g10code.com>
 
 	* faq.raw: Fixed the bug reporting address.

Added: branches/STABLE-BRANCH-1-4/doc/FAQ
===================================================================
--- branches/STABLE-BRANCH-1-4/doc/FAQ	                        (rev 0)
+++ branches/STABLE-BRANCH-1-4/doc/FAQ	2010-10-05 14:37:43 UTC (rev 5437)
@@ -0,0 +1,13 @@
+GnuPG Frequently Asked Questions
+
+A FAQ is a fast moving target and thus we don't distribute it anymore
+with GnuPG.  You may retrieve the current FAQ in HTML format at
+
+  http://www.gnupg.org/faq/GnuPG-FAQ.html
+
+or in plain text format at the FTP server:
+
+  ftp://ftp.gnupg.org/gcrypt/gnupg/GnuPG-FAQ.txt
+
+
+

Modified: branches/STABLE-BRANCH-1-4/configure.ac
===================================================================
--- branches/STABLE-BRANCH-1-4/configure.ac	2010-10-05 14:29:37 UTC (rev 5436)
+++ branches/STABLE-BRANCH-1-4/configure.ac	2010-10-05 14:37:43 UTC (rev 5437)
@@ -530,7 +530,6 @@
 AC_PROG_AWK
 AC_CHECK_PROG(DOCBOOK_TO_MAN, docbook-to-man, yes, no)
 AM_CONDITIONAL(HAVE_DOCBOOK_TO_MAN, test "$ac_cv_prog_DOCBOOK_TO_MAN" = yes)
-GNUPG_CHECK_FAQPROG
 GNUPG_CHECK_USTAR
 
 

Modified: branches/STABLE-BRANCH-1-4/doc/Makefile.am
===================================================================
--- branches/STABLE-BRANCH-1-4/doc/Makefile.am	2010-10-05 14:29:37 UTC (rev 5436)
+++ branches/STABLE-BRANCH-1-4/doc/Makefile.am	2010-10-05 14:37:43 UTC (rev 5437)
@@ -16,7 +16,7 @@
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 ## Process this file with automake to create Makefile.in
 
-EXTRA_DIST = DETAILS faq.raw FAQ faq.html \
+EXTRA_DIST = DETAILS FAQ \
              HACKING OpenPGP README.W32 samplekeys.asc gnupg.7 \
              TRANSLATE gpg.ru.sgml gpg.ru.1 highlights-1.4.txt \
              gpg.texi gpgv.texi specify-user-id.texi see-also-note.texi \
@@ -39,13 +39,12 @@
 # Need this to avoid building of dvis with automake 1.4
 DVIS =
 
-pkgdata_DATA = FAQ faq.html
+pkgdata_DATA = FAQ
 
-BUILT_SOURCES = FAQ faq.html 
 # we can't add gpg.texi gpgv.texi here because automake does not like them to
 # be built files. 
 
-CLEANFILES = faq.raw.xref gpg.xml gpgv.xml gpg.ru.xml 
+CLEANFILES = gpg.xml gpgv.xml gpg.ru.xml 
 DISTCLEANFILES = yat2m yat2m-stamp.tmp yat2m-stamp $(myman_pages)
 
 AM_MAKEINFOFLAGS = -I $(srcdir) --css-include=$(srcdir)/texi.css -D gpgone
@@ -89,24 +88,6 @@
 	echo "No man page due to missing docbook-to-man" >>$@
 endif
 
-FAQ : faq.raw
-if WORKING_FAQPROG
-	$(FAQPROG) -f $<  $@ || $(FAQPROG) -f $< $@
-else
-	: Warning: missing faqprog.pl, cannot make $@
-	echo "No $@ due to missing faqprog.pl" > $@
-	echo "See ftp://ftp.gnupg.org/gcrypt/contrib/faqprog.pl" >> $@
-endif
-
-faq.html : faq.raw
-if WORKING_FAQPROG
-	$(FAQPROG) -h -f $< $@ 2>&1 || $(FAQPROG) -h -f $< $@
-else
-	: Warning: missing faqprog.pl, cannot make $@
-	echo "No $@ due to missing faqprog.pl" > $@
-	echo "See ftp://ftp.gnupg.org/gcrypt/contrib/faqprog.pl" >> $@
-endif
-
 dist-hook:
 	@if test "`wc -c < gpg.1`" -lt 200; then \
 	    echo 'ERROR: dummy man page'; false; fi