From: Roland Rosenfeld Date: Sun, 5 Feb 2023 10:00:13 +0000 (+0100) Subject: Merge Debian 3.0.33-4 and 3.0.34-1 changes. X-Git-Url: http://www.privoxy.org/gitweb/templates.html?p=privoxy.git;a=commitdiff_plain;h=f96e9b6885e33c58b6891ec43b3d831a79f0c6ba Merge Debian 3.0.33-4 and 3.0.34-1 changes. And prepare 3.0.35 git snapshot. --- diff --git a/debian/changelog b/debian/changelog index e9cd823a..d8368f30 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,30 @@ -privoxy (3.0.34~gitsnapshot-1) UNRELEASED; urgency=medium +privoxy (3.0.35~gitsnapshot-1) UNRELEASED; urgency=medium * Unreleased GIT snapshot. - -- Roland Rosenfeld Sun, 25 Sep 2022 20:01:09 +0200 + -- Roland Rosenfeld Sun, 05 Feb 2023 10:58:57 +0100 + +privoxy (3.0.34-1) unstable; urgency=medium + + * New upstream version 3.0.34. + * The following patches are now incorporated upstream: 35_gif_deanimate, + 36_pending_tls, 37_https_connect. + + -- Roland Rosenfeld Sun, 05 Feb 2023 10:41:26 +0100 + +privoxy (3.0.33-4) unstable; urgency=medium + + * Add it debconf translation. Thanks to Ceppo + (Closes: #1024071). + * Update to Standards-Version 4.6.2 (no changes). + * Remove lsb-base dependency, since it is essential. + * 35_gif_deanimate: Tolerate multiple image extensions in a row. + * 36_pending_tls: Check for pending TLS data from the client before + checking if data is available on the connection. + * 37_https_connect: Reject https URLs without CONNECT request. + * d/maintscript: fix version numbers. + + -- Roland Rosenfeld Sat, 28 Jan 2023 15:46:54 +0100 privoxy (3.0.33-3) unstable; urgency=medium diff --git a/debian/control b/debian/control index 43186955..a1f43ff8 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,7 @@ Build-Depends: autoconf, sgmlspl , w3m , zlib1g-dev -Standards-Version: 4.6.1 +Standards-Version: 4.6.2 Homepage: https://www.privoxy.org/ Vcs-Git: https://salsa.debian.org/debian/privoxy.git Vcs-Browser: https://salsa.debian.org/debian/privoxy @@ -29,7 +29,6 @@ Architecture: any Depends: adduser, debconf, logrotate, - lsb-base (>= 3.2-13), ucf, ${misc:Depends}, ${perl:Depends}, diff --git a/debian/copyright b/debian/copyright index d68b465d..917e794b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -6,7 +6,7 @@ Source: https://sourceforge.net/projects/ijbswa/files/Sources/ Files: * Copyright: Copyright (C) 2001-2021 by the Privoxy team. https://www.privoxy.org/ - Copyright (C) 2001-2021 by Privoxy Developers + Copyright (C) 2001-2023 by Privoxy Developers Parts Copyright (c) 1997 by Anonymous Coders and Junkbusters, Inc. Parts Copyright (C) 1999 Adam Lock Parts Copyright (C) 1998-1999 Steve Cheng @@ -58,7 +58,7 @@ License: GPL-2+ Files: debian/* Copyright: - 2002-2021 Roland Rosenfeld + 2002-2023 Roland Rosenfeld License: GPL-2+ License: GPL-2+ diff --git a/debian/maintscript b/debian/maintscript index d48b0975..051d5185 100644 --- a/debian/maintscript +++ b/debian/maintscript @@ -1,4 +1,4 @@ -rm_conffile /etc/privoxy/global.action 3.0.11-1~ privoxy -rm_conffile /etc/privoxy/standard.action 3.0.11-1~ privoxy -rm_conffile /etc/privoxy/templates/show-version 3.0.28-2~ privoxy -rm_conffile /etc/privoxy/templates/edit-actions-for-url-string-filter 3.0.33-2~ privoxy +rm_conffile /etc/privoxy/global.action 3.0.33-4~ privoxy +rm_conffile /etc/privoxy/standard.action 3.0.33-4~ privoxy +rm_conffile /etc/privoxy/templates/show-version 3.0.33-4~ privoxy +rm_conffile /etc/privoxy/templates/edit-actions-for-url-string-filter 3.0.33-3~ privoxy diff --git a/debian/po/it.po b/debian/po/it.po new file mode 100644 index 00000000..32fca702 --- /dev/null +++ b/debian/po/it.po @@ -0,0 +1,33 @@ +# privoxy po-debconf italian translation +# Copyright (C) 2022 privoxy's copyright holder +# This file is distributed under the same license as the privoxy package. +# Ceppo \n" +"Language-Team: Italian \n" +"Language: it\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 "Indirizzi su cui Privoxy deve ascoltare:" + +#. 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 "" +"Inserire una lista separata da spazi di combinazioni indirizzo:porta su cui " +"Privoxy resterà in ascolto per le richieste dei client."