From: Roland Rosenfeld Date: Sat, 20 Sep 2008 16:39:53 +0000 (+0000) Subject: merge Debian changes from 3.0.7 to 3.0.10 X-Git-Tag: v_3_0_11~236 X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=f4464cf737ef3de89c27a86c20595bebc802b29a merge Debian changes from 3.0.7 to 3.0.10 --- diff --git a/debian/changelog b/debian/changelog index 4f48e86b..90e0aa9b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,64 @@ -privoxy (3.0.7~CSV20071202-0.1) UNRELEASED; urgency=low +privoxy (3.0.10-1) unstable; urgency=low - * CVS as of 2007-12-01. + * New upstream version 3.0.10-stable. + * Install privoxy-log-parser into /usr/bin. + * Add lintian-override for libtool warnings according pcre, because we + do not use this version of pcre but the one from libpcre3-dev. + + -- Roland Rosenfeld Sat, 20 Sep 2008 17:33:30 +0200 + +privoxy (3.0.9-1) unstable; urgency=low + + * New upstream version 3.0.9-beta. + * Upgrade all patches to new version: + - 20_makefile_fixup included upstream. + * The new version doesn't support PDF documentation any more, so remove + it from the Debian package. + -> Stop Build-Depending on htmldoc. + * The new version doesn't support text/plain documentation any more, so + remove it from the Debian package. + * Upgrade to Standards-Version 3.8.0 (no changes) + * Move documentation from doc-base section Apps/Net to Network/Web Browsing. + * chown user:group instead of user.group in postinst to be more compatible. + * 05_defaut_action: unblock qa.debian.org/popcon.php (Closes: #479525). + + -- Roland Rosenfeld Mon, 07 Jul 2008 22:35:17 +0200 + +privoxy (3.0.8-1) unstable; urgency=low + + * New upstream release 3.0.8-stable. + * Upgrade all patches to new version. + + -- Roland Rosenfeld Sun, 20 Jan 2008 22:19:02 +0100 + +privoxy (3.0.7-2) unstable; urgency=low + + * Remove trailing space from debian/patches/00list to make lintian happy. + * postinst: On upgrade from 3.0.6 and below the config file format + changed: actionsfile now needs filename.action as parameter instead of + filename. Fix this config file change in postinst if necessary. + (Closes: #456274). + * Upgrade to Standards-Version 3.7.3 (no changes). + * 19_manpage_fixup: Replace "ö" by "\[:o]" in privoxy.8. + + -- Roland Rosenfeld Sat, 12 Jan 2008 16:02:14 +0100 + +privoxy (3.0.7-1) unstable; urgency=low + + * New upstream version 3.0.7-beta. + * Adapt all patches to new version. * Enable new zlib feature (Closes: #368448): - build-depend on zlib1g-dev - disable prevent-compression in 25_standard_medium.dpatch * Remove 28_pcre_returncode.dpatch, which is now applied upstream. * Remove 23_fix_faq_id.dpatch, which is now applied upstream. + * Fix Homepage header in control file. + * 05_defaut_action: disable filter{js-annoyances} for + http://www.memo.de/ (Closes: #441256). + * Update debian/watch file based on an idea of Raphael Geissert. + (Closes: #449643) - -- Roland Rosenfeld Sun, 02 Dec 2007 16:11:10 +0100 + -- Roland Rosenfeld Tue, 11 Dec 2007 19:34:35 +0100 privoxy (3.0.6-4) unstable; urgency=low diff --git a/debian/control b/debian/control index 085e5bf7..e2efb22c 100644 --- a/debian/control +++ b/debian/control @@ -2,12 +2,14 @@ Source: privoxy Section: web Priority: optional Maintainer: Roland Rosenfeld -Build-Depends: debhelper (>= 5.0.0), autoconf, autotools-dev, libpcre3-dev, jade, docbook-dsssl, w3m, sp, sgmlspl, groff, htmldoc (>= 1.8.25-1), man2html, dpatch, zlib1g-dev -Standards-Version: 3.7.2 +Build-Depends: debhelper (>= 5.0.0), autoconf, autotools-dev, libpcre3-dev, + jade, docbook-dsssl, w3m, sp, sgmlspl, groff, man2html, dpatch, zlib1g-dev +Standards-Version: 3.8.0 +Homepage: http://www.privoxy.org/ Package: privoxy Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, logrotate, adduser +Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, logrotate, adduser Recommends: doc-base Description: Privacy enhancing HTTP Proxy Privoxy is a web proxy with advanced filtering capabilities for @@ -18,5 +20,3 @@ Description: Privacy enhancing HTTP Proxy has application for both stand-alone systems and multi-user networks. . Privoxy is based on Internet Junkbuster (tm). - . - Homepage: http://www.privoxy.org/ diff --git a/debian/copyright b/debian/copyright index 4b0ed5ed..f2de8cbe 100644 --- a/debian/copyright +++ b/debian/copyright @@ -19,8 +19,8 @@ Originally developed by: Junkbusters Corp. Anonymous Coders -Copyright: Written by and Copyright (C) 2001 the SourceForge - Privoxy team. http://ijbswa.sourceforge.net +Copyright: Written by and Copyright (C) 2001-2008 the SourceForge + Privoxy team. http://www.privoxy.org/ Based on the Internet Junkbuster originally written by and Copyright (C) 1997 Anonymous Coders and diff --git a/debian/dirs b/debian/dirs index 3414d3bc..eb41624d 100644 --- a/debian/dirs +++ b/debian/dirs @@ -1,4 +1,6 @@ etc/privoxy +usr/bin usr/sbin usr/share/doc/privoxy var/log/privoxy +usr/share/man/man1 diff --git a/debian/doc-base.developer b/debian/doc-base.developer index 4b5abbcb..916471f0 100644 --- a/debian/doc-base.developer +++ b/debian/doc-base.developer @@ -5,14 +5,8 @@ Abstract: The provoxy developer manual gives the users information on how to help the developer team. It provides guidance on coding, testing, documentation and other issues. Privoxy is a filtering web proxy. -Section: Apps/Net +Section: Network/Web Browsing 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 210e3278..8156aabe 100644 --- a/debian/doc-base.faq +++ b/debian/doc-base.faq @@ -4,14 +4,8 @@ Author: Privoxy Developers Abstract: The FAQ document gives users and developers alike answers to frequently asked questions about Privoxy. Privoxy is a filtering web proxy. -Section: Apps/Net +Section: Network/Web Browsing 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 1828834b..72dc795d 100644 --- a/debian/doc-base.user +++ b/debian/doc-base.user @@ -3,14 +3,8 @@ Title: Privoxy User Manual Author: Privoxy Developers Abstract: The user manual gives users information on how to install, configure and use Privoxy. Privoxy is a filtering web proxy. -Section: Apps/Net +Section: Network/Web Browsing 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 bb8f2b44..6b014606 100644 --- a/debian/docs +++ b/debian/docs @@ -1,8 +1,5 @@ README AUTHORS -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 @@ -10,6 +7,3 @@ 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/patches/00list b/debian/patches/00list index d8b0a2ed..3207162b 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,4 +1,3 @@ -02_linkcolor.dpatch # 03_ipv6.dpatch # still has bugs: #391600, #393605 05_defaut_action.dpatch 06_8bit_manual.dpatch @@ -6,9 +5,8 @@ 11_backup_autotools.dpatch 14_config.dpatch 15_mansection8.dpatch -17_502_no_such_domain.dpatch +17_502_no_such_domain.dpatch 19_manpage_fixup.dpatch -20_makefile_fixup.dpatch 24_global_action.dpatch 25_standard_medium.dpatch 27_remove_nsl.dpatch diff --git a/debian/patches/02_linkcolor.dpatch b/debian/patches/02_linkcolor.dpatch deleted file mode 100644 index 966d5760..00000000 --- a/debian/patches/02_linkcolor.dpatch +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 02_linkcolor.dpatch by Roland Rosenfeld -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Run htmldoc with --linkcolor #0000ff and --no-embedfonts - -@DPATCH@ -diff -urNad privoxy~/utils/ldp_print/ldp_print privoxy/utils/ldp_print/ldp_print ---- privoxy~/utils/ldp_print/ldp_print -+++ privoxy/utils/ldp_print/ldp_print -@@ -54,7 +54,7 @@ - - my($cmd) = "htmldoc --size universal --bodyfont helvetica --fontsize 8 " . - "-t pdf -f ${fname_wo_ext}.pdf --firstpage p1 --titlefile title.html" . -- " body.html --footer c.1"; -+ " body.html --footer c.1 --linkcolor #0000ff --no-embedfonts"; - - # For postscript output; append onto the above cmd string: - # diff --git a/debian/patches/05_defaut_action.dpatch b/debian/patches/05_defaut_action.dpatch index f49dda5b..941baac9 100644 --- a/debian/patches/05_defaut_action.dpatch +++ b/debian/patches/05_defaut_action.dpatch @@ -8,17 +8,29 @@ diff -urNad privoxy~/default.action.master privoxy/default.action.master --- privoxy~/default.action.master +++ privoxy/default.action.master -@@ -613,6 +613,8 @@ - .*[epu]ad*. - county*. - countr*. -+#MASTER# Do not block Andorra ccTLD: -+.ad +@@ -1490,6 +1490,10 @@ + #MASTER# REMARKS: Actionsfile feedback item #2043327 2008-08-08 + # URL = http://kb.adobe.com/selfservice/viewContent.do?externalId=kb402747&sliceId=1 + .adobe.com ++#MASTER# REMARKS: Debian Bug report #479525 ++# URL = http://qa.debian.org/popcon.php ++qa.debian.org/popcon.php ++ ############################################################################# - # Generic block patterns by path: -@@ -1854,6 +1856,11 @@ - {+filter{tiny-textforms} +prevent-compression} + # Site-specific special rules: +@@ -1917,6 +1921,9 @@ + #MASTER# REMARKS: Exclude per Debian bug report #377843 + # URL = http://blogs.msdn.com/wga/archive/2006/07/16/667063.aspx + blogs.msdn.com ++#MASTER# REMARKS: Exclude per Debian bug report #441256 ++#MASTER# PROBLEM-URL: http://www.memo.de/ ++www.memo.de + + {-filter{unsolicited-popups}} + # Sticky Actions = -filter{unsolicited-popups} +@@ -1958,6 +1965,11 @@ + {+filter{tiny-textforms}} .sourceforge.net/tracker +{-filter{ie-exploits}} diff --git a/debian/patches/10_backup_doc.dpatch b/debian/patches/10_backup_doc.dpatch index f168f820..050df8fe 100644 --- a/debian/patches/10_backup_doc.dpatch +++ b/debian/patches/10_backup_doc.dpatch @@ -7,7 +7,7 @@ dpatch_patch () { tar cf debian/patched/doc.bak.tar README - for i in doc/source doc/text doc/webserver doc/pdf \ + for i in doc/source doc/text doc/webserver \ INSTALL AUTHORS privoxy.1 do if [ -e $i ] @@ -19,7 +19,6 @@ dpatch_patch () dpatch_unpatch () { - rm -rf doc/pdf tar xf debian/patched/doc.bak.tar } diff --git a/debian/patches/14_config.dpatch b/debian/patches/14_config.dpatch index 5e7d20e7..d5bfeb06 100644 --- a/debian/patches/14_config.dpatch +++ b/debian/patches/14_config.dpatch @@ -8,13 +8,16 @@ diff -urNad privoxy~/config privoxy/config --- privoxy~/config +++ privoxy/config -@@ -1,4 +1,4 @@ --# Sample Configuration File for Privoxy v3.0.7 +@@ -1,6 +1,6 @@ +-# Sample Configuration File for Privoxy v3.0.10 +# Sample Configuration File for Privoxy # - # $Id: config,v 1.59 2007/11/15 02:46:31 hal9 Exp $ +-# $Id: config,v 1.66 2008/08/14 10:35:28 hal9 Exp $ ++# Id: config,v # -@@ -128,7 +128,7 @@ + # Copyright (C) 2001-2008 Privoxy Developers http://www.privoxy.org/ + # +@@ -130,7 +130,7 @@ # If set, this option should be the first option in the config # file, because it is used while the config file is being read. # @@ -23,7 +26,7 @@ diff -urNad privoxy~/config privoxy/config # # # 1.2. trust-info-url -@@ -163,8 +163,8 @@ +@@ -166,8 +166,8 @@ # don't end up locked out from the information on why they were # locked out in the first place! # @@ -34,7 +37,7 @@ diff -urNad privoxy~/config privoxy/config # # # 1.3. admin-address -@@ -260,7 +260,7 @@ +@@ -267,7 +267,7 @@ # # No trailing "/", please. # @@ -43,7 +46,7 @@ diff -urNad privoxy~/config privoxy/config # # # 2.2. templdir -@@ -315,7 +315,7 @@ +@@ -324,7 +324,7 @@ # # No trailing "/", please. # @@ -52,12 +55,3 @@ diff -urNad privoxy~/config privoxy/config # # # 2.4. actionsfile -@@ -609,7 +609,7 @@ - # it's reached, messages are logged truncated and marked with - # "... [too long, truncated]". - # --debug 1 # show each GET/POST/CONNECT request -+#debug 1 # show each GET/POST/CONNECT request - debug 4096 # Startup banner and warnings - debug 8192 # Errors - *we highly recommended enabling this* - # diff --git a/debian/patches/15_mansection8.dpatch b/debian/patches/15_mansection8.dpatch index 4cbc6f3a..d6bb910d 100644 --- a/debian/patches/15_mansection8.dpatch +++ b/debian/patches/15_mansection8.dpatch @@ -9,15 +9,15 @@ diff -urNad privoxy~/GNUmakefile.in privoxy/GNUmakefile.in --- privoxy~/GNUmakefile.in +++ privoxy/GNUmakefile.in @@ -177,7 +177,7 @@ - `find doc/text/ -type f | grep -v "CVS" | grep -v "\.\#" | grep -v ".*~" | grep -v ".cvsignore" | grep -v "TAGS"` \ + DOC_FILES = AUTHORS LICENSE README ChangeLog INSTALL \ `find doc/webserver/ -name "*.html" | grep -v "\(webserver\|team\)\/index\.html"` \ `find doc/webserver/ -name "*.css"` \ -- privoxy.1 \ -+ privoxy.8 \ - doc/pdf/*.pdf +- privoxy.1 ++ privoxy.8 ############################################################################# -@@ -515,7 +515,7 @@ + # Filenames and libraries +@@ -514,7 +514,7 @@ $(RM) /etc/init.d/privoxy $(RM) /usr/sbin/privoxy $(RM) /usr/sbin/rcprivoxy @@ -26,7 +26,7 @@ diff -urNad privoxy~/GNUmakefile.in privoxy/GNUmakefile.in ############################################################################# # generic distribution -@@ -691,7 +691,7 @@ +@@ -687,7 +687,7 @@ $(RM) doc/man/* doc/webserver/man-page/*.html ifneq ($(MAN2HTML),false) $(ECHO) "Privoxy Man page

NAME

" > doc/webserver/man-page/privoxy-man-page.html @@ -35,7 +35,7 @@ diff -urNad privoxy~/GNUmakefile.in privoxy/GNUmakefile.in $(ECHO) "" >> doc/webserver/man-page/privoxy-man-page.html else $(MAKE) groff2html -@@ -703,14 +703,14 @@ +@@ -699,14 +699,14 @@ man: dok-release mkdir -p doc/source/temp && cd doc/source/temp && $(RM) * ;\ nsgmls ../privoxy-man-page.sgml | sgmlspl ../../../utils/docbook2man/docbook2man-spec.pl &&\ @@ -53,7 +53,7 @@ diff -urNad privoxy~/GNUmakefile.in privoxy/GNUmakefile.in $(PERL) -pi.bak -e 's///; s//man2html/' tmp.html $(PERL) -pi.bak -e 's/(<\/HEAD>)/<\/HEAD>/' tmp.html # Twice because my version of man2html is pulling in commas and periods in URLs. -@@ -725,7 +725,7 @@ +@@ -721,7 +721,7 @@ # Otherwise we get plain groff conversion. groff2html: @@ -62,24 +62,24 @@ diff -urNad privoxy~/GNUmakefile.in privoxy/GNUmakefile.in # readme page and INSTALL file -@@ -1132,8 +1132,8 @@ - $(INSTALL) $(INSTALL_T) $(DOK_WEB)/p_doc.css $$DOC/user-manual;\ +@@ -1071,8 +1071,8 @@ + $(INSTALL) $(INSTALL_T) $(DOK_WEB)/p_doc.css $(DESTDIR)$$DOC/user-manual;\ fi @# Not all platforms support gzipped man pages. -- @$(ECHO) Installing man page to $(MAN_DEST)/privoxy.1 -- -$(INSTALL) $(INSTALL_T) privoxy.1 $(MAN_DEST)/privoxy.1 -+ @$(ECHO) Installing man page to $(MAN_DEST)/privoxy.8 -+ -$(INSTALL) $(INSTALL_T) privoxy.8 $(MAN_DEST)/privoxy.8 +- @$(ECHO) Installing man page to $(DESTDIR)$(MAN_DEST)/privoxy.1 +- -$(INSTALL) $(INSTALL_T) privoxy.1 $(DESTDIR)$(MAN_DEST)/privoxy.1 ++ @$(ECHO) Installing man page to $(DESTDIR)$(MAN_DEST)/privoxy.8 ++ -$(INSTALL) $(INSTALL_T) privoxy.8 $(DESTDIR)$(MAN_DEST)/privoxy.8 @# Change the config file default directories according to the configured ones @$(ECHO) Rewriting config for this installation -@@ -1293,7 +1293,7 @@ +@@ -1233,7 +1233,7 @@ @# man page and docs @$(ECHO) Removing $(PROGRAM) docs -- -$(RM) $(MAN_DEST)/privoxy.1* -+ -$(RM) $(MAN_DEST)/privoxy.8* - -$(RM) -r $(DOC_DEST) || $(RM) -r $(prefix)/doc/privoxy +- -$(RM) $(DESTDIR)$(MAN_DEST)/privoxy.1* ++ -$(RM) $(DESTDIR)$(MAN_DEST)/privoxy.8* + -$(RM) -r $(DESTDIR)$(DOC_DEST) || $(RM) -r $(DESTDIR)$(prefix)/doc/privoxy @# Log and jarfile and pidfile diff -urNad privoxy~/doc/source/privoxy-man-page.sgml privoxy/doc/source/privoxy-man-page.sgml diff --git a/debian/patches/19_manpage_fixup.dpatch b/debian/patches/19_manpage_fixup.dpatch index e40b360f..2ddc6e01 100755 --- a/debian/patches/19_manpage_fixup.dpatch +++ b/debian/patches/19_manpage_fixup.dpatch @@ -9,18 +9,19 @@ diff -urNad privoxy~/GNUmakefile.in privoxy/GNUmakefile.in --- privoxy~/GNUmakefile.in +++ privoxy/GNUmakefile.in -@@ -704,6 +704,10 @@ +@@ -700,6 +700,11 @@ mkdir -p doc/source/temp && cd doc/source/temp && $(RM) * ;\ nsgmls ../privoxy-man-page.sgml | sgmlspl ../../../utils/docbook2man/docbook2man-spec.pl &&\ perl -pi.bak -e 's/ //; s/\[ /\[/g' privoxy.8 ;\ + perl -pi.bak -e "s/\[ /\[/g;s/á/\\\\['a]/g;s/é/\\\\['e]/g" privoxy.8; \ ++ perl -pi.bak -e "s/ö/\\\\[:o]/g" privoxy.8; \ + perl -pi.bak -e 's/([ {])-([a-z])/$$1\\-$$2/g' privoxy.8; \ + perl -pi.bak -e 's/ --([a-z])/ \\-\\-$$1/g' privoxy.8; \ + perl -pi.bak -e 's/\\fB--/\\fB\\-\\-/g' privoxy.8; \ $(DB) ../privoxy-man-page.sgml && $(MV) -f privoxy.8 ../../../privoxy.8 # For those with man2html ala RH7s. -@@ -716,6 +720,7 @@ +@@ -712,6 +717,7 @@ # Twice because my version of man2html is pulling in commas and periods in URLs. $(PERL) -pi.bak -e 's/()/$$1$$2/g' tmp.html $(PERL) -pi.bak -e 's,\.">,">,g' tmp.html diff --git a/debian/patches/20_makefile_fixup.dpatch b/debian/patches/20_makefile_fixup.dpatch deleted file mode 100755 index bf24d809..00000000 --- a/debian/patches/20_makefile_fixup.dpatch +++ /dev/null @@ -1,23 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 20_makefile_fixup.dpatch by Roland Rosenfeld -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix syntax error in GNUmakefile.in - -@DPATCH@ -diff -urNad privoxy~/GNUmakefile.in privoxy/GNUmakefile.in ---- privoxy~/GNUmakefile.in -+++ privoxy/GNUmakefile.in -@@ -672,9 +672,9 @@ - $(RM) -r doc/source/user-manual/ - mkdir -p doc/text doc/source/user-manual - cd doc/source/user-manual && $(DB) -iuser-man ../user-manual.sgml && cd .. && cp user-manual/*.html ../webserver/user-manual/ -- @#FIXME: temp fix so same stylesheet gets in more than one place so it works \ -- @# for all doc set-ups, including the 'user manual' config option in local \ -- @#system where it MUST be in same directory as html. -+ #FIXME: temp fix so same stylesheet gets in more than one place so it works \ -+ # for all doc set-ups, including the 'user manual' config option in local \ -+ #system where it MUST be in same directory as html. - $(PERL) -pi.bak -e 's/<\/head/\n\n<\/head/i' doc/webserver/user-manual/*html - cd doc/source && $(DB) -iuser-man -V nochunks user-manual.sgml > tmp.html && $(WDUMP) tmp.html > ../text/user-manual.txt && $(RM) -r tmp.html user-manual - diff --git a/debian/patches/24_global_action.dpatch b/debian/patches/24_global_action.dpatch index 4b90453a..b9e8ce7b 100755 --- a/debian/patches/24_global_action.dpatch +++ b/debian/patches/24_global_action.dpatch @@ -9,7 +9,7 @@ diff -urNad privoxy~/GNUmakefile.in privoxy/GNUmakefile.in --- privoxy~/GNUmakefile.in +++ privoxy/GNUmakefile.in -@@ -166,7 +166,7 @@ +@@ -167,7 +167,7 @@ ############################################################################# # We include these files in our distributions ############################################################################# @@ -21,7 +21,7 @@ diff -urNad privoxy~/GNUmakefile.in privoxy/GNUmakefile.in diff -urNad privoxy~/config privoxy/config --- privoxy~/config +++ privoxy/config -@@ -361,6 +361,7 @@ +@@ -371,6 +371,7 @@ # to allow previously forbidden characters. # actionsfile standard.action # Internal purpose, recommended @@ -32,7 +32,7 @@ diff -urNad privoxy~/config privoxy/config diff -urNad privoxy~/default.action.master privoxy/default.action.master --- privoxy~/default.action.master +++ privoxy/default.action.master -@@ -552,16 +552,6 @@ +@@ -550,16 +550,6 @@ allow-ads = -block -filter{banners-by-size} -filter{banners-by-link} ############################################################################# diff --git a/debian/patches/27_remove_nsl.dpatch b/debian/patches/27_remove_nsl.dpatch index a14da4eb..96be28f0 100755 --- a/debian/patches/27_remove_nsl.dpatch +++ b/debian/patches/27_remove_nsl.dpatch @@ -8,7 +8,7 @@ diff -urNad privoxy~/configure.in privoxy/configure.in --- privoxy~/configure.in +++ privoxy/configure.in -@@ -926,7 +926,7 @@ +@@ -972,7 +972,7 @@ dnl ================================================================= dnl Next line needed to find the gethost*_r functions on Solaris diff --git a/debian/postinst b/debian/postinst index 4f9a0e00..832a1ecf 100644 --- a/debian/postinst +++ b/debian/postinst @@ -27,7 +27,7 @@ case "$1" in configure) adduser --quiet --system --home /etc/privoxy --no-create-home \ --ingroup nogroup --disabled-password privoxy - chown -R privoxy.adm /var/log/privoxy + chown -R privoxy:adm /var/log/privoxy chmod 750 /var/log/privoxy chown privoxy /etc/privoxy/user.action /etc/privoxy/trust [ -f /etc/privoxy/global.action ] \ @@ -39,6 +39,17 @@ case "$1" in chown root /etc/privoxy/standard.action \ /etc/privoxy/default.action fi + + if [ "x$2" != "x" ] && dpkg --compare-versions "$2" lt "3.0.7" \ + && grep -q '^actionsfile [a-z]*[[:space:]]*#.*$' /etc/privoxy/config + then + # Upgrading from version before 3.0.7 where the user kept his old + # (modified) config file: + # Try to change "actionsfile foo" to "actionsfile foo.action" + # as needed in 3.0.7: + sed 's/^actionsfile \([a-z]*\)\([ ]*\#\)/actionsfile \1.action\2/' \ + -i.bak /etc/privoxy/config + fi ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/debian/rules b/debian/rules index a8422365..75ec21f5 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f # -# (C) 2002-2007 Roland Rosenfeld , based on +# (C) 2002-2008 Roland Rosenfeld , based on # Sample debian/rules that uses debhelper. # This file is public domain software, originally written by Joey Hess. @@ -36,19 +36,10 @@ build-stamp: patch-stamp --enable-zlib \ --with-docbook=/usr/share/sgml/docbook/stylesheet/dsssl/modular $(MAKE) -# create missing doc/pdf directory if necessary: - [ -d doc/pdf ] || mkdir doc/pdf - $(MAKE) dok-pdf $(MAKE) dok env -u LANG $(MAKE) man $(MAKE) man2html -# 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 clean: clean1 unpatch @@ -68,7 +59,6 @@ clean1: rm -f doc/source/ldp.dsl rm -rf doc/source/temp -# rm -rf doc/pdf dh_clean -Xrc.privoxy.orig @@ -88,6 +78,11 @@ install: build-stamp install -m 0644 default.filter $(DEBDIR)/etc/privoxy/default.filter install -m 0644 trust $(DEBDIR)/etc/privoxy/trust + install -m 0755 tools/privoxy-log-parser.pl \ + $(DEBDIR)/usr/bin/privoxy-log-parser + pod2man tools/privoxy-log-parser.pl \ + > $(DEBDIR)/usr/share/man/man1/privoxy-log-parser.1 + cp -r templates $(DEBDIR)/etc/privoxy/ rm -f $(DEBDIR)/etc/privoxy/templates/*~ rm -rf $(DEBDIR)/etc/privoxy/templates/CVS @@ -129,11 +124,11 @@ binary-arch: build-stamp install dh_installchangelogs ChangeLog dh_link dh_strip - dh_compress -Xpdf + dh_compress dh_fixperms # dh_makeshlibs dh_installdeb -# dh_perl + dh_perl dh_shlibdeps dh_gencontrol dh_md5sums diff --git a/debian/watch b/debian/watch index abc7f3f3..6b81d791 100644 --- a/debian/watch +++ b/debian/watch @@ -5,4 +5,4 @@ version=3 #http://sourceforge.net/project/showfiles.php?group_id=11118 http://prdownloads.sourceforge.net/ijbswa/privoxy-(.*)-stable-src.tar.gz\?download -http://prdownloads.sourceforge.net/ijbswa/privoxy-(.*)-stable-src.tar.gz +http://sf.net/ijbswa/privoxy-(\d+.*)-(?:stable|beta)-src.tar.gz