build HTML, text and PDF versions of the documentation from source

diff --git a/debian/rules b/debian/rules
index 33384c7..90f6a04 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -30,7 +30,7 @@ configure-stamp:
        env CFLAGS="$(OPTIMIZE) -g" \
                ./configure --prefix=/usr --sysconfdir=/etc \
                --mandir=/usr/share/man $(WITHDEBUG) \
-               --with-docbook=no
+               --with-docbook=/usr/share/sgml/docbook/stylesheet/dsssl/modular
 
        touch configure-stamp
 
@@ -38,7 +38,27 @@ build: build-stamp
 build-stamp: configure-stamp 
        dh_testdir
 
+#      backup formatted upstream documentation:
+       for x in source text webserver pdf; do \
+               if [ ! -d doc/$$x.dist ]; then \
+                       cp -a doc/$$x doc/$$x.dist; \
+               fi; \
+       done
+       for x in INSTALL README AUTHORS privoxy.1; do \
+               if [ ! -f $$x.dist ]; then \
+                       cp -a $$x $$x.dist; \
+               fi; \
+       done
+
        $(MAKE)
+       $(MAKE) dok-pdf
+       $(MAKE) dok
+
+#      remove trailing whitespaces:
+       for x in developer-manual user-manual faq; do \
+               sed -e 's/[     ]*$$//' < doc/text/$$x.txt > doc/text/$$x.nws;\
+               mv -f doc/text/$$x.nws doc/text/$$x.txt; \
+       done
 
        touch build-stamp
 
@@ -49,8 +69,27 @@ clean:
 
        -$(MAKE) clean
        -$(MAKE) distclean
-       rm -f privoxy 
+       rm -f privoxy privoxy.8
        rm -f configure config.h GNUmakefile 
+
+       rm -rf obj
+       rm -f ActivityConsole.jar
+       rm -f src/java/org/privoxy/activityconsole/*.class
+
+#      restore formatted upstream documentation:
+       for x in source 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 AUTHORS privoxy.1; do \
+               if [ -f $$x.dist ]; then \
+                       rm -f $$x; \
+                       mv $$x.dist $$x; \
+               fi; \
+       done
+
        rm -f doc/source/ldp.dsl
 
        dh_clean
@@ -65,11 +104,12 @@ 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 $$/' \
+           -e 's/ *$$//' \
                < config > $(DEBDIR)/etc/privoxy/config
        install -m 0644 default.action $(DEBDIR)/etc/privoxy/default.action
        install -m 0644 standard.action $(DEBDIR)/etc/privoxy/standard.action
@@ -77,6 +117,8 @@ install: build
        install -m 0644 default.filter $(DEBDIR)/etc/privoxy/default.filter
        install -m 0644 trust $(DEBDIR)/etc/privoxy/trust
 
+       sed -e 's/"1"/"8"/' < privoxy.1 > privoxy.8
+
        cp -r templates $(DEBDIR)/etc/privoxy/
        rm -f $(DEBDIR)/etc/privoxy/templates/*~
        rm -rf $(DEBDIR)/etc/privoxy/templates/CVS
@@ -92,6 +134,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
@@ -106,7 +150,7 @@ binary-arch: build install
        dh_installchangelogs ChangeLog
        dh_link
        dh_strip
-       dh_compress
+       dh_compress -Xpdf
        dh_fixperms
 #      dh_makeshlibs
        dh_installdeb