+privoxy (3.0.26-6) unstable; urgency=medium
+
+ * Fix typo in patch description.
+ * postinst: avoid using chown -R.
+ * Move source.lintian-overrides to soure/lintian-overrides.
+ * Add Vcs-headers pointing to salsa.
+ * Upgrade to Standards-Version 4.1.4 (no changes).
+
+ -- Roland Rosenfeld <roland@debian.org> Sun, 29 Apr 2018 11:57:47 +0200
+
+privoxy (3.0.26-5) unstable; urgency=medium
+
+ * Add ru debconf translation. Thanks to Lev Lamberov (Closes: #883110).
+ * Optimize patches for gbp pq.
+ * Upgrade to Standards-Version 4.1.3 (no changes).
+ * Upgrade to debhelper v11 (remove systemd from dh call).
+
+ -- Roland Rosenfeld <roland@debian.org> Sat, 20 Jan 2018 12:49:42 +0100
+
+privoxy (3.0.26-4) unstable; urgency=medium
+
+ * Add pt debconf translation. Thanks to Rui Branco (Closes: #858743).
+ * Add description to 36_openspopenjade.patch.
+ * Upgrade to debhelper v10 and remove dh-systemd build dependency.
+ * debhelper v10 replaces autotools-dev.
+ * Remove Testsuite header, since this is automatically added.
+ * Upgrade to Standards-Version 4.1.1
+ - change copyrights-format to https.
+
+ -- Roland Rosenfeld <roland@debian.org> Wed, 01 Nov 2017 10:45:49 +0100
+
+privoxy (3.0.26-3) unstable; urgency=medium
+
+ * Add da debconf translation. Thanks to Joe Dalton (Closes: #850876).
+ * 37_adventofcode: unlock adventofcode.com (Closes: #848211).
+
+ -- Roland Rosenfeld <roland@debian.org> Wed, 11 Jan 2017 22:24:55 +0100
+
+privoxy (3.0.26-2) unstable; urgency=medium
+
+ * Add db_stop to postinst, since upgrade fails otherwise in some
+ situations (Closes: #835409).
+ * Replace sp and jade with opensp and openjade. Thanks to Neil Roeth
+ for providing a patch (Closes: #837207).
+
+ -- Roland Rosenfeld <roland@debian.org> Sat, 10 Sep 2016 08:48:35 +0200
+
privoxy (3.0.26-1) unstable; urgency=medium
* New upstream version 3.0.26.
Priority: optional
Maintainer: Roland Rosenfeld <roland@debian.org>
Build-Depends: autoconf,
- autotools-dev,
- debhelper (>= 9),
- dh-systemd (>= 1.4),
+ debhelper (>= 11~),
docbook,
docbook-dsssl,
docbook-utils,
groff,
- jade,
libpcre3-dev,
man2html,
+ opensp,
po-debconf,
sgmlspl,
- sp,
w3m,
zlib1g-dev
-Standards-Version: 3.9.8
+Standards-Version: 4.1.4
Homepage: https://www.privoxy.org/
-Testsuite: autopkgtest
+Vcs-Git: https://salsa.debian.org/debian/privoxy.git
+Vcs-Browser: https://salsa.debian.org/debian/privoxy
Package: privoxy
Architecture: any
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Privoxy
Upstream-Contact: Privoxy Developers <privoxy-devel@lists.privoxy.org>
-Source: http://www.privoxy.org/sf-download-mirror/Sources/
+Source: https://sourceforge.net/projects/ijbswa/files/Sources/
Files: *
Copyright:
Files: pcre/*
Copyright: Copyright (c) 1997-2000 University of Cambridge
-Comment:
+Comment:
Written by: Philip Hazel <ph10@cam.ac.uk>
.
University of Cambridge Computing Service,
.
2. The origin of this software must not be misrepresented, either by
explicit claim or by omission.
- .
+ .
3. Altered versions must be plainly marked as such, and must not be
misrepresented as being the original software.
.
usr/bin
usr/sbin
usr/share/doc/privoxy
+usr/share/man/man1
usr/share/privoxy
var/log/privoxy
-usr/share/man/man1
-README
AUTHORS
+README
TODO
-doc/webserver/faq
-doc/webserver/user-manual
doc/webserver/developer-manual
+doc/webserver/faq
doc/webserver/images
+doc/webserver/man-page
doc/webserver/p_doc.css
doc/webserver/privoxy-index.html
-doc/webserver/man-page
+doc/webserver/user-manual
-Author: Roland Rosenfeld <roland@debian.org>
-Description: Serveral changes/additons to default.action.
+From: Roland Rosenfeld <roland@debian.org>
+Date: Sun, 15 Feb 2009 13:39:10 +0100
+Subject: Several changes/additons to default.action.
--- a/default.action.master
+++ b/default.action.master
-Author: Roland Rosenfeld <roland@debian.org>
-Description: Stop converting 8bit chars in the documentation (#203697)
-Bug-Debian: http://bugs.debian.org/203697
+From: Roland Rosenfeld <roland@debian.org>
+Date: Sun, 15 May 2005 15:28:56 +0200
+Subject: Stop converting 8bit chars in the documentation (#203697)
+Bug-Debian: https://bugs.debian.org/203697
--- a/doc/source/ldp.dsl.in
+++ b/doc/source/ldp.dsl.in
-Author: Roland Rosenfeld <roland@debian.org>
-Description: Several Debian specific changes to config file
+From: Roland Rosenfeld <roland@debian.org>
+Date: Sat, 11 Feb 2006 21:27:14 +0100
+Subject: Several Debian specific changes to config file
--- a/config
+++ b/config
-Author: Roland Rosenfeld <roland@debian.org>
-Description: Move man page from man section 1 to man section 8.
+From: Roland Rosenfeld <roland@debian.org>
+Date: Mon, 21 Apr 2003 11:11:31 +0200
+Subject: Move man page from man section 1 to man section 8.
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
-Author: Roland Rosenfeld <roland@debian.org>
-Description: Changes the 404 HTTP status code of the "No such Domain" template
- to 502 Bad Gateway, which seems to be more correct according to
+From: Roland Rosenfeld <roland@debian.org>
+Date: Sat, 5 Aug 2006 15:15:17 +0200
+Subject: Changes the 404 HTTP status code of the "No such Domain" template
+ to 502 Bad Gateway, which seems to be more correct according to
http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
--- a/templates/no-such-domain
-Author: Roland Rosenfeld <roland@debian.org>
-Description: Change the global default from standard.Cautious to
- standard.Medium, which is similar to the old 3.0.3 behavior and
- doesn't change too much.
+From: Roland Rosenfeld <roland@debian.org>
+Date: Sat, 23 Sep 2006 23:37:03 +0200
+Subject: Change the global default from standard.Cautious to standard.Medium,
+ which is similar to the old 3.0.3 behavior and doesn't change too much.
--- a/match-all.action
+++ b/match-all.action
-Author: Roland Rosenfeld <roland@debian.org>
-Description: Remove unnecessary linking against libnsl.
+From: Roland Rosenfeld <roland@debian.org>
+Date: Sat, 7 Oct 2006 13:12:13 +0200
+Subject: Remove unnecessary linking against libnsl.
--- a/configure.in
+++ b/configure.in
-Author: Roland Rosenfeld <roland@debian.org>
-Description: Work around bind problems on startup (Closes: #534735)
-Bug-Debian: http://bugs.debian.org/534735
+From: Roland Rosenfeld <roland@debian.org>
+Date: Tue, 18 May 2010 10:14:18 +0200
+Subject: Work around bind problems on startup (Closes: #534735)
+Bug-Debian: https://bugs.debian.org/534735
--- a/jbsockets.c
+++ b/jbsockets.c
-Author: Roland Rosenfeld <roland@debian.org>
-Description: Replace all -- in man page by \-\- to make lintian happy.
+From: Roland Rosenfeld <roland@debian.org>
+Date: Thu, 24 Jan 2013 17:40:51 +0100
+Subject: Replace all -- in man page by \-\- to make lintian happy.
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
-Author: Roland Rosenfeld <roland@debian.org>
-Description: Use Debian docbook2man-spec.pl (from docbook-utils)
- instead of local copy, to make package reproducible.
+From: Roland Rosenfeld <roland@debian.org>
+Date: Sat, 19 Sep 2015 15:05:41 +0200
+Subject: Use Debian docbook2man-spec.pl (from docbook-utils) instead of local
+ copy, to make package reproducible.
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
-Description: Fix typo in man page privoxy-log-parser(1)
-Author: Roland Rosenfeld <roland@debian.org>
+From: Roland Rosenfeld <roland@debian.org>
+Date: Sun, 1 May 2016 14:21:22 +0200
+Subject: Fix typo in man page privoxy-log-parser(1)
--- a/tools/privoxy-log-parser.pl
+++ b/tools/privoxy-log-parser.pl
--- /dev/null
+From: Neil Roeth <neil@debian.org>
+Date: Sat, 10 Sep 2016 08:48:35 +0200
+Subject: Replace sp and jade with opensp and openjade.
+Bug-Debian: https://bugs.debian.org/837207
+
+--- a/GNUmakefile.in
++++ b/GNUmakefile.in
+@@ -479,7 +479,7 @@ dok-man:
+ # target for man page generation!
+ man: dok-release
+ mkdir -p doc/source/temp && cd doc/source/temp && $(RM) * ;\
+- nsgmls ../privoxy-man-page.sgml | sgmlspl /usr/share/perl5/sgmlspl-specs/docbook2man-spec.pl &&\
++ onsgmls ../privoxy-man-page.sgml | sgmlspl /usr/share/perl5/sgmlspl-specs/docbook2man-spec.pl &&\
+ perl -pi.bak -e 's/ <URL:.*>//; s/\[ /\[/g' $(MAN_PAGE) ;\
+ perl -pi.bak -e "s/\[ /\[/g;s/á/\\\\['a]/g;s/é/\\\\['e]/g" $(MAN_PAGE); \
+ perl -pi.bak -e "s/ö/\\\\[:o]/g" $(MAN_PAGE); \
+--- a/utils/docbook2man/docbook2man-spec.pl.1
++++ b/utils/docbook2man/docbook2man-spec.pl.1
+@@ -11,14 +11,14 @@ docbook2man-spec.pl \- convert DocBook R
+ \fBsgmlspl\fR \fBdocbook2man-spec.pl\fR
+
+
+-\fBnsgmls\fR [ \fB\fIsgml document\fB\fR ]\fB| sgmlspl\fR \fBdocbook2man-spec.pl\fR
++\fBonsgmls\fR [ \fB\fIsgml document\fB\fR ]\fB| sgmlspl\fR \fBdocbook2man-spec.pl\fR
+
+ .SH "DESCRIPTION"
+ .PP
+ \fBdocbook2man\fR is a sgmlspl spec file that produced man
+ pages (using the -man macros) from DocBook RefEntry markup.
+ .PP
+-The program reads ESIS produced by nsgmls (or other SGML parsers) from
++The program reads ESIS produced by onsgmls (or other SGML parsers) from
+ standard input. Markup not found in RefEntry is discarded.
+ .PP
+ Its output, the converted man pages, are written to the current directory. If
--- /dev/null
+From: Roland Rosenfeld <roland@debian.org>
+Date: Wed, 11 Jan 2017 22:24:55 +0100
+Subject: unblock adventofcode.com
+Bug-Debian: https://bugs.debian.org/848211
+Forwarded: https://sourceforge.net/p/ijbswa/actionsfile-feedback/937/
+
+--- a/default.action.master
++++ b/default.action.master
+@@ -1941,7 +1941,8 @@ klikki.fi/adv/
+ #MASTER# UNBLOCK-REFERRER: http://www.ardmediathek.de/tv
+ # URL = http://www.ardmediathek.de/ard/static/img/ardmt/banner/ard-mediathek.svg
+ .ardmediathek.de/
+-
++#MASTER# UNBLOCK-REFERRER: http://adventofcode.com
++adventofcode.com
+
+ #############################################################################
+ # Site-specific special rules:
33_manpage_hyphen.patch
34_system-docbook2man.patch
35_man-spelling.patch
+36_openspopenjade.patch
+37_adventofcode.patch
--- /dev/null
+# privoxy debconf translations
+# Copyright (C) 2017 privoxy og nedenstående oversættere.
+# This file is distributed under the same license as the privoxy package.
+# Joe Hansen <joedalton2@yahoo.dk>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: privoxy\n"
+"Report-Msgid-Bugs-To: privoxy@packages.debian.org\n"
+"POT-Creation-Date: 2016-04-08 17:17+0200\n"
+"PO-Revision-Date: 2017-01-10 17:30+01:00\n"
+"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
+"Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
+"Language: da\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../templates:1001
+msgid "Adresses on with Privoxy listens:"
+msgstr "Adresser hvorpå Privoxy lytter:"
+
+#. Type: string
+#. Description
+#: ../templates:1001
+msgid ""
+"Please enter a space separated list of address:port combinations on which "
+"Privoxy will listen for client requests."
+msgstr ""
+"Indtast venligst en mellemrumsadskilt liste med adresse:port-kombinationer "
+"hvorpå Privoxy vil lytte efter klientforespørgsler."
--- /dev/null
+# Portuguese translation for privoxy debconf messages.
+# This file is distributed under the same license as the privoxy package.
+# Rui Branco <ruipb@debianpt.org>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: privoxy\n"
+"Report-Msgid-Bugs-To: privoxy@packages.debian.org\n"
+"POT-Creation-Date: 2016-04-08 17:17+0200\n"
+"PO-Revision-Date: 2017-03-14 19:56+0000\n"
+"Last-Translator: Rui Branco <ruipb@debianpt.org>\n"
+"Language-Team: Portuguese <traduz@debianpt.org>\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Gtranslator 2.91.7\n"
+
+#. Type: string
+#. Description
+#: ../templates:1001
+msgid "Adresses on with Privoxy listens:"
+msgstr "Endereços activos em que o Privoxy escuta:"
+
+#. Type: string
+#. Description
+#: ../templates:1001
+msgid ""
+"Please enter a space separated list of address:port combinations on which "
+"Privoxy will listen for client requests."
+msgstr ""
+"Por favor introduza uma lista de endereços:portas separada por espaços da "
+"qual o Privoxy escutará pedidos de clientes."
--- /dev/null
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: privoxy\n"
+"Report-Msgid-Bugs-To: privoxy@packages.debian.org\n"
+"POT-Creation-Date: 2016-04-08 17:17+0200\n"
+"PO-Revision-Date: 2017-11-30 00:29+0500\n"
+"Last-Translator: Lev Lamberov <dogsleg@debian.org>\n"
+"Language-Team: \n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 2.0.4\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#. Type: string
+#. Description
+#: ../templates:1001
+msgid "Adresses on with Privoxy listens:"
+msgstr "Адреса, прослушиваемые Privoxy:"
+
+#. Type: string
+#. Description
+#: ../templates:1001
+msgid ""
+"Please enter a space separated list of address:port combinations on which "
+"Privoxy will listen for client requests."
+msgstr ""
+"Введите комбинации вида адрес:порт, разделяя их пробелами, на которых "
+"Privoxy будет прослушивать клиентские запросы."
configure)
adduser --quiet --system --home $CONFDIR --no-create-home \
--ingroup nogroup --disabled-password privoxy
- chown -R privoxy:adm /var/log/privoxy
+ chown privoxy:adm /var/log/privoxy
+ [ -f /var/log/privoxy/logfile ] \
+ && chown privoxy:adm /var/log/privoxy/logfile
chmod 750 /var/log/privoxy
chown privoxy $CONFDIR/user.action $CONFDIR/trust
[ -f $CONFDIR/match-all.action ] \
ucf --three-way --debconf-ok $CONFIG.ucftmp $CONFIG
ucfr privoxy $CONFIG
rm -f $CONFIG.ucftmp
+ db_stop
if [ "x$2" != "x" ] && dpkg --compare-versions "$2" lt "3.0.4"
then
#!/usr/bin/make -f
#
-# (c) 2002-2016 Roland Rosenfeld <roland@debian.org>
+# (c) 2002-2018 Roland Rosenfeld <roland@debian.org>
#
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
DEBDIR=`pwd`/debian/privoxy
%:
- dh $@ --with autotools_dev --with systemd
+ dh $@
override_dh_auto_configure:
autoheader