From 918c7f1f943e572b3bee30cd80b2419d9e27fc79 Mon Sep 17 00:00:00 2001 From: Roland Rosenfeld Date: Thu, 30 May 2002 12:23:48 +0000 Subject: [PATCH] - Do no longer build html and txt versions of documentation using docbook, but use the converted versions which come with the upstream package. - merge official Debian version entries into debian/changelog. --- debian/changelog | 20 +++++++++++++++----- debian/control | 2 +- debian/rules | 12 ++++++++---- 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 78cce24e..546e92bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,22 +1,32 @@ privoxy (2.9.15-beta-0) unstable; urgency=low * New upstream version. - * 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. * Install images for html version of documentation. - * Install p_doc.css in documentation directory. + * Do no longer build html and txt versions of documentation using + docbook, but use the converted versions which come with the upstream + package. + + -- Roland Rosenfeld Thu, 30 May 2002 14:21:10 +0200 + +privoxy (2.9.14-beta-4) unstable; urgency=low - -- Roland Rosenfeld Sun, 26 May 2002 01:37:33 +0200 + * Damn, why did I write "i386-linux" into the rules file, when I try to + write a work around for hppa? Fixed now (Closes #148227). + + -- Roland Rosenfeld Sun, 26 May 2002 22:33:26 +0200 privoxy (2.9.14-beta-3) unstable; urgency=low * Fix typo ('[' instead of '{') in default.action (Closes: #148122). * Disable edit-actions and remote-toggle in config file by default (Closes: #148125). + * Use --disable-pthread on hppa, to avoid problem with hppa gcc not + supporting -pthread option (Closes: #148117). + * Install p_doc.css in documentation directory. - -- Roland Rosenfeld Sat, 25 May 2002 11:53:49 +0200 + -- Roland Rosenfeld Sun, 26 May 2002 01:40:18 +0200 privoxy (2.9.14-beta-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 2d235d7c..252ec514 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: privoxy Section: web Priority: optional Maintainer: Roland Rosenfeld -Build-Depends: debhelper (>> 3.0.0), autoconf, libpcre3-dev, docbook-utils, w3m +Build-Depends: debhelper (>> 3.0.0), autoconf, libpcre3-dev Standards-Version: 3.5.6 Package: privoxy diff --git a/debian/rules b/debian/rules index 06fb8a21..3e2a1419 100755 --- a/debian/rules +++ b/debian/rules @@ -22,16 +22,21 @@ ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) WITHDEBUG="--with-debug" endif +# hppa doesn't support -pthread option, so we complety disable pthread +# on hppa until there is a better solution in configure. +ifeq "$(DEB_HOST_GNU_TYPE)" "hppa-linux" + WITHOUTPTHREAD="--disable-pthread" +endif + configure: configure-stamp configure-stamp: dh_testdir autoheader autoconf - env CFLAGS=$(CFLAGS) WDUMP=w3m \ + env CFLAGS=$(CFLAGS) ./configure --prefix=/usr --sysconfdir=/etc \ - --mandir=/usr/share/man $(WITHDEBUG) \ - --with-docbook=/usr/share/sgml/docbook/stylesheet/dsssl/modular + --mandir=/usr/share/man $(WITHDEBUG) $(WITHOUTPTHREAD) touch configure-stamp @@ -40,7 +45,6 @@ build-stamp: configure-stamp dh_testdir $(MAKE) - $(MAKE) dok-devel dok-user dok-faq touch build-stamp -- 2.49.0