From: Roland Rosenfeld <roland@spinnaker.de> Date: Sat, 1 Mar 2003 15:10:10 +0000 (+0000) Subject: * Build HTML, text, and PDF versions of the documentation from source. X-Git-Tag: v_3_1_archive_branchpoint~27 X-Git-Url: http://www.privoxy.org/gitweb/%22https:/@default-cgi@/faq/user-manual/static/gitweb.js?a=commitdiff_plain;h=b8682bae15e95356d19d72ba8042a879cc66df3a;p=privoxy.git * Build HTML, text, and PDF versions of the documentation from source. * Mention PDF and text version of the documentation in doc-base files. * Install PDF version of the documentation, too. * Install HTML version of the man page, too. --- diff --git a/debian/changelog b/debian/changelog index fa2b6463..4865bc2c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +privoxy (3.1.1-3) unstable; urgency=low + + * New build based on CVS as of 2003-03-01. + * Build HTML, text, and PDF versions of the documentation from source. + * Mention PDF and text version of the documentation in doc-base files. + * Install PDF version of the documentation, too. + * Install HTML version of the man page, too. + + -- Roland Rosenfeld <roland@debian.org> Sat, 1 Mar 2003 13:54:32 +0100 + privoxy (3.1.1-2) unstable; urgency=low * Stop creating documentation, it's usually available upstream and can diff --git a/debian/control b/debian/control index 85ff2b30..f7e81ea6 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 (>= 4.0.0), autoconf, libpcre3-dev +Build-Depends: debhelper (>= 4.0.0), autoconf, libpcre3-dev, jade, docbook-dsssl, w3m, sp, sgmlspl, groff, htmldoc Standards-Version: 3.5.8 Package: privoxy diff --git a/debian/doc-base.developer b/debian/doc-base.developer index 6a606b90..4b5abbcb 100644 --- a/debian/doc-base.developer +++ b/debian/doc-base.developer @@ -10,3 +10,9 @@ Section: Apps/Net Format: HTML Index: /usr/share/doc/privoxy/developer-manual/index.html Files: /usr/share/doc/privoxy/developer-manual/*.html + +Format: text +Files: /usr/share/doc/privoxy/developer-manual.txt.gz + +Format: pdf +Files: /usr/share/doc/privoxy/privoxy-developer-manual.pdf diff --git a/debian/doc-base.faq b/debian/doc-base.faq index 117c2a3b..210e3278 100644 --- a/debian/doc-base.faq +++ b/debian/doc-base.faq @@ -9,3 +9,9 @@ Section: Apps/Net Format: HTML Index: /usr/share/doc/privoxy/faq/index.html Files: /usr/share/doc/privoxy/faq/*.html + +Format: text +Files: /usr/share/doc/privoxy/faq.txt.gz + +Format: pdf +Files: /usr/share/doc/privoxy/privoxy-faq.pdf diff --git a/debian/doc-base.user b/debian/doc-base.user index 2a7f5e69..4d21c6e9 100644 --- a/debian/doc-base.user +++ b/debian/doc-base.user @@ -8,3 +8,10 @@ Section: Apps/Net Format: HTML Index: /usr/share/doc/privoxy/user-manual/index.html Files: /usr/share/doc/privoxy/user-manual/*.html + +Format: text +Files: /usr/share/doc/privoxy/user-manual.txt.gz + +Format: pdf +Files: /usr/share/doc/privoxy/privoxy-user-manual.pdf + diff --git a/debian/docs b/debian/docs index 43320693..bb8f2b44 100644 --- a/debian/docs +++ b/debian/docs @@ -8,3 +8,8 @@ doc/webserver/user-manual doc/webserver/developer-manual doc/webserver/images doc/webserver/p_doc.css +doc/webserver/privoxy-index.html +doc/webserver/man-page +doc/pdf/privoxy-developer-manual.pdf +doc/pdf/privoxy-user-manual.pdf +doc/pdf/privoxy-faq.pdf diff --git a/debian/rules b/debian/rules index ad7116ae..dbf7bc16 100755 --- a/debian/rules +++ b/debian/rules @@ -27,8 +27,7 @@ configure-stamp: autoconf env CFLAGS="$(OPTIMIZE) -g" \ ./configure --prefix=/usr --sysconfdir=/etc \ - --mandir=/usr/share/man $(WITHDEBUG) \ - --with-docbook=no + --mandir=/usr/share/man $(WITHDEBUG) touch configure-stamp @@ -38,6 +37,21 @@ build-stamp: configure-stamp $(MAKE) +# backup formatted upstream documentation: + for x in text webserver pdf; do \ + if [ ! -d doc/$$x.dist ]; then \ + cp -a doc/$$x doc/$$x.dist; \ + fi; \ + done + for x in INSTALL README privoxy.1; do \ + if [ ! -f $$x.dist ]; then \ + cp -a $$x $$x.dist; \ + fi; \ + done + + (cd doc/source; $(MAKE) pdf) + (cd doc/source; $(MAKE) all) + touch build-stamp clean: @@ -50,6 +64,23 @@ clean: rm -f privoxy rm -f configure config.h GNUmakefile rm -f doc/source/ldp.dsl + rm -rf obj + rm -f ActivityConsole.jar + rm -f src/java/org/privoxy/activityconsole/*.class + +# restore formatted upstream documentation: + for x in text webserver pdf; do \ + if [ -d doc/$$x.dist ]; then \ + rm -rf doc/$$x; \ + mv doc/$$x.dist doc/$$x; \ + fi; \ + done + for x in INSTALL README privoxy.1; do \ + if [ -f $$x.dist ]; then \ + rm -f $$x; \ + mv $$x.dist $$x; \ + fi; \ + done dh_clean @@ -63,8 +94,8 @@ install: build sed -e 's/^\(\(trust\|proxy\)-info-url\|admin-address\)/#\1/' \ -e 's/^\(enable-\(edit-actions\|remote-toggle\)\)[ ]*1/\1 0/' \ - -e 's#^confdir \.#confdir /etc/privoxy#' \ - -e 's#^logdir \.#logdir /var/log/privoxy#' \ + -e 's#^confdir .*#confdir /etc/privoxy#' \ + -e 's#^logdir .*#logdir /var/log/privoxy#' \ -e 's%^#\(user-manual\).*%\1 /usr/share/doc/privoxy/user-manual%' \ -e 's/\(Sample Configuration File for Privoxy\).*/\1/' \ -e 's/Id: config,v.*/Id: config,v $$/' \ @@ -90,6 +121,8 @@ binary-arch: build install dh_testroot # dh_installdebconf dh_installdocs -XCVS + (cd $(DEBDIR)/usr/share/doc/privoxy/; \ + mv privoxy-index.html index.html) dh_installexamples dh_installmenu dh_installlogrotate