From: Roland Rosenfeld <roland@spinnaker.de>
Date: Sun, 31 Mar 2002 22:05:41 +0000 (+0000)
Subject: Create HTML and ASCII versions of the documentation using docbook now.
X-Git-Tag: v_2_9_14~293
X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=daecd4737ed179358a8f8b415f1a61b881d3ad1e

Create HTML and ASCII versions of the documentation using docbook now.
---

diff --git a/debian/changelog b/debian/changelog
index a29c0aa0..b89428ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+privoxy (2.9.13-beta-2) unstable; urgency=low
+
+  * Create HTML and ASCII versions of the documentation using docbook now.
+
+ -- Roland Rosenfeld <roland@debian.org>  Sun, 31 Mar 2002 23:53:28 +0200
+
 privoxy (2.9.13-beta-1) unstable; urgency=low
 
   * Initial Release.
diff --git a/debian/control b/debian/control
index 252ec514..580b85b0 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: privoxy
 Section: web
 Priority: optional
 Maintainer: Roland Rosenfeld <roland@debian.org>
-Build-Depends: debhelper (>> 3.0.0), autoconf, libpcre3-dev
+Build-Depends: debhelper (>> 3.0.0), autoconf, libpcre3-dev, docbook-utils
 Standards-Version: 3.5.6
 
 Package: privoxy
diff --git a/debian/docs b/debian/docs
index 4e98cf44..835e2157 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,6 +1,8 @@
 README
 AUTHORS
-doc/text/faq.txt
-doc/text/user-manual.txt
-doc/text/developer-manual.txt
-
+doc/source/faq.txt
+doc/source/user-manual.txt
+doc/source/developer-manual.txt
+doc/source/faq
+doc/source/user-manual
+doc/source/developer-manual
diff --git a/debian/rules b/debian/rules
index 6fecafde..be5438e6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,6 +15,9 @@ DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 DEBDIR=`pwd`/debian/privoxy
 
+DB2HTML=jw -f docbook -b html -d `pwd`/ldpOK.dsl\#html
+
+
 CFLAGS="-O2"
 WITHDEBUG=""
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
@@ -30,18 +33,27 @@ configure-stamp:
 	autoconf
 	env CFLAGS=$(CFLAGS) \
 		./configure --prefix=/usr --sysconfdir=/etc \
-			--mandir=/usr/share/man --with-docbook=no \
-			$(WITHDEBUG)
+		--mandir=/usr/share/man	$(WITHDEBUG) \
+		--with-docbook=/usr/share/sgml/docbook/stylesheet/dsssl/modular
 
 	touch configure-stamp
 
 build: build-stamp
-
 build-stamp: configure-stamp 
 	dh_testdir
 
 	$(MAKE)
 
+# 	And now we create the documentation (manually):
+	$(MAKE) doc/source/ldpOK.dsl
+	(cd doc/source; \
+	 $(DB2HTML) -o faq faq.sgml; \
+	 $(DB2HTML) -o user-manual user-manual.sgml; \
+	 $(DB2HTML) -o developer-manual developer-manual.sgml; \
+	 docbook2txt faq.sgml; \
+	 docbook2txt user-manual.sgml; \
+	 docbook2txt developer-manual.sgml)
+
 	touch build-stamp
 
 clean:
@@ -49,10 +61,13 @@ clean:
 	dh_testroot
 	rm -f build-stamp configure-stamp
 
-	-$(MAKE) clean
+	-$(MAKE) clobber
 	rm -f privoxy 
-	rm -f configure config.h config.h.in config.log config.cache \
-		config.status GNUmakefile
+	rm -f configure config.h GNUmakefile 
+	rm -f doc/source/ldpOK.dsl
+	rm -rf doc/source/faq doc/source/user-manual \
+		doc/source/developer-manual
+	rm -f doc/source/*.txt
 
 	dh_clean
 
@@ -76,10 +91,6 @@ install: build
 	rm -f $(DEBDIR)/etc/privoxy/templates/*~
 	rm -rf $(DEBDIR)/etc/privoxy/templates/CVS
 
-	cp -r doc/webserver/user-manual $(DEBDIR)/usr/share/doc/privoxy/
-	cp -r doc/webserver/faq $(DEBDIR)/usr/share/doc/privoxy/
-	cp -r doc/webserver/developer-manual $(DEBDIR)/usr/share/doc/privoxy/
-
 
 # Build architecture-independent files here.
 binary-indep: build install