* New upstream version.

  * Fix debian/rules clean to really clean.
  * Use upstream docbook build mechanism now.
  * Force usage of w3m -dump to convert HTML to ASCII (build depend on it).
  * Exclude CVS files from dh_installdocs (when compiling from CVS).
  * Add user.action and standard.action to /etc/privoxy.

diff --git a/debian/changelog b/debian/changelog
index 7727ad6..428ea76 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+privoxy (2.9.15-beta-0) unstable; urgency=low
+
+  * New upstream version.
+  * Fix debian/rules clean to really clean.
+  * Use upstream docbook build mechanism now.
+  * Force usage of w3m -dump to convert HTML to ASCII (build depend on it).
+  * Exclude CVS files from dh_installdocs (when compiling from CVS).
+  * Add user.action and standard.action to /etc/privoxy.
+
+ -- Roland Rosenfeld <roland@debian.org>  Sat, 11 May 2002 20:38:16 +0200
+

 privoxy (2.9.14-beta-1) unstable; urgency=low
 
   * New upstream version.
 privoxy (2.9.14-beta-1) unstable; urgency=low
 
   * New upstream version.

diff --git a/debian/control b/debian/control
index 85777ea..2d235d7 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,12 @@ Source: privoxy
 Section: web
 Priority: optional
 Maintainer: Roland Rosenfeld <roland@debian.org>
 Section: web
 Priority: optional
 Maintainer: Roland Rosenfeld <roland@debian.org>

-Build-Depends: debhelper (>> 3.0.0), autoconf, libpcre3-dev, docbook-utils
+Build-Depends: debhelper (>> 3.0.0), autoconf, libpcre3-dev, docbook-utils, w3m

 Standards-Version: 3.5.6
 
 Package: privoxy
 Architecture: any
 Depends: ${shlibs:Depends}, logrotate, adduser
 Standards-Version: 3.5.6
 
 Package: privoxy
 Architecture: any
 Depends: ${shlibs:Depends}, logrotate, adduser

-Conflicts: junkbuster
-Replaces: junkbuster

 Description: Privacy enhancing HTTP Proxy
  Privoxy is a web proxy with advanced filtering capabilities for
  protecting privacy, filtering web page content, managing cookies,
 Description: Privacy enhancing HTTP Proxy
  Privoxy is a web proxy with advanced filtering capabilities for
  protecting privacy, filtering web page content, managing cookies,

diff --git a/debian/docs b/debian/docs
index 835e215..2b0dd84 100644 (file)
--- a/debian/docs
+++ b/debian/docs
@@ -1,8 +1,8 @@
 README
 AUTHORS
 README
 AUTHORS

-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
+doc/text/faq.txt
+doc/text/user-manual.txt
+doc/text/developer-manual.txt
+doc/webserver/faq
+doc/webserver/user-manual
+doc/webserver/developer-manual

diff --git a/debian/rules b/debian/rules
index be5438e..a8c0f0a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -15,9 +15,6 @@ DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 DEBDIR=`pwd`/debian/privoxy
 
 
 DEBDIR=`pwd`/debian/privoxy
 

-DB2HTML=jw -f docbook -b html -d `pwd`/ldpOK.dsl\#html
-
-

 CFLAGS="-O2"
 WITHDEBUG=""
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 CFLAGS="-O2"
 WITHDEBUG=""
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))


@@ -31,7 +28,7 @@ configure-stamp:
 
        autoheader
        autoconf
 
        autoheader
        autoconf

-       env CFLAGS=$(CFLAGS) \
+       env CFLAGS=$(CFLAGS) WDUMP=w3m \

                ./configure --prefix=/usr --sysconfdir=/etc \
                --mandir=/usr/share/man $(WITHDEBUG) \
                --with-docbook=/usr/share/sgml/docbook/stylesheet/dsssl/modular
                ./configure --prefix=/usr --sysconfdir=/etc \
                --mandir=/usr/share/man $(WITHDEBUG) \
                --with-docbook=/usr/share/sgml/docbook/stylesheet/dsssl/modular


@@ -43,16 +40,7 @@ build-stamp: configure-stamp
        dh_testdir
 
        $(MAKE)
        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)
+       $(MAKE) dok-devel dok-user dok-faq

 
        touch build-stamp
 
 
        touch build-stamp
 


@@ -61,13 +49,11 @@ clean:
        dh_testroot
        rm -f build-stamp configure-stamp
 
        dh_testroot
        rm -f build-stamp configure-stamp
 

-       -$(MAKE) clobber
+       -$(MAKE) clean
+       -$(MAKE) distclean

        rm -f privoxy 
        rm -f configure config.h GNUmakefile 
        rm -f privoxy 
        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
+       rm -f doc/source/ldp.dsl

 
        dh_clean
 
 
        dh_clean
 


@@ -84,6 +70,8 @@ install: build
            -e 's#^logdir \.#logdir /var/log/privoxy#' \
                < config > $(DEBDIR)/etc/privoxy/config
        install -m 0644 default.action $(DEBDIR)/etc/privoxy/default.action
            -e 's#^logdir \.#logdir /var/log/privoxy#' \
                < 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
+       install -m 0644 user.action $(DEBDIR)/etc/privoxy/user.action

        install -m 0644 default.filter $(DEBDIR)/etc/privoxy/default.filter
        install -m 0644 trust $(DEBDIR)/etc/privoxy/trust
 
        install -m 0644 default.filter $(DEBDIR)/etc/privoxy/default.filter
        install -m 0644 trust $(DEBDIR)/etc/privoxy/trust
 


@@ -101,7 +89,7 @@ binary-arch: build install
        dh_testdir
        dh_testroot
 #      dh_installdebconf       
        dh_testdir
        dh_testroot
 #      dh_installdebconf       

-       dh_installdocs
+       dh_installdocs -XCVS

        dh_installexamples
        dh_installmenu
        dh_installlogrotate
        dh_installexamples
        dh_installmenu
        dh_installlogrotate