[Privoxy-commits] [privoxy] branch master updated: Merge Debian 4.2.0-1 release to debian/ direcetory.

Thu Jun 11 20:02:31 CEST 2026

This is an automated email from the git hooks/post-receive script.

git pushed a commit to branch master
in repository privoxy.

The following commit(s) were added to refs/heads/master by this push:
     new 07db33be Merge Debian 4.2.0-1 release to debian/ direcetory.
07db33be is described below

commit 07db33be0793ad2421bcd4234e701536451c7a80
Author: Roland Rosenfeld <roland at debian.org>
AuthorDate: Thu Jun 4 09:27:25 2026 +0200

    Merge Debian 4.2.0-1 release to debian/ direcetory.
---
 debian/changelog                           | 12 +++++-
 debian/control                             | 61 ++++++++++++++++--------------
 debian/copyright                           |  6 +--
 debian/lrc.config                          |  1 +
 debian/patches/33_manpage_hyphen.patch     |  2 +-
 debian/patches/34_system-docbook2man.patch |  2 +-
 debian/po/es.po                            |  2 +-
 debian/po/fr.po                            |  2 +-
 debian/po/sv.po                            |  2 +-
 9 files changed, 52 insertions(+), 38 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c038168f..3703c4a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,18 @@
-privoxy (4.2.0~gitsnapshot-1) UNRELEASED; urgency=medium
+privoxy (4.3.0~gitsnapshot-1) UNRELEASED; urgency=medium
 
   * Unreleased GIT snapshot.
-  * Update all patches to new version.
 
  -- Roland Rosenfeld <roland at debian.org>  Sat, 11 Apr 2026 12:15:13 +0200
 
+privoxy (4.2.0-1) unstable; urgency=medium
+
+  * New upstream version 4.2.0.
+  * Adapt all patches to new version.
+  * Declare compliance with Debian Policy 4.7.4.
+  * Fix some warnings in debian/po/*.po files.
+
+ -- Roland Rosenfeld <roland at debian.org>  Wed, 03 Jun 2026 20:48:50 +0200
+
 privoxy (4.1.0-1) unstable; urgency=medium
 
   * New upstream version 4.1.0.
diff --git a/debian/control b/debian/control
index 72cc882d..66a2ae8f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,40 +1,45 @@
 Source: privoxy
 Maintainer: Roland Rosenfeld <roland at debian.org>
 Section: web
-Build-Depends: autoconf,
-               debhelper-compat (= 13),
-               dh-apparmor,
-               docbook <!nodoc>,
-               docbook-dsssl <!nodoc>,
-               docbook-utils <!nodoc>,
-               groff <!nodoc>,
-               libbrotli-dev,
-               libpcre2-dev,
-               libssl-dev,
-               libzstd-dev,
-               man2html <!nodoc>,
-               opensp:native <!nodoc>,
-               po-debconf,
-               sgmlspl <!nodoc>,
-               w3m <!nodoc>,
-               zlib1g-dev
-Standards-Version: 4.7.3
+Build-Depends:
+ debhelper-compat (= 13),
+ dh-apparmor,
+ autoconf,
+ docbook <!nodoc>,
+ docbook-dsssl <!nodoc>,
+ docbook-utils <!nodoc>,
+ groff <!nodoc>,
+ libbrotli-dev,
+ libpcre2-dev,
+ libssl-dev,
+ libzstd-dev,
+ man2html <!nodoc>,
+ opensp:native <!nodoc>,
+ po-debconf,
+ sgmlspl <!nodoc>,
+ w3m <!nodoc>,
+ zlib1g-dev,
+Standards-Version: 4.7.4
 Vcs-Browser: https://salsa.debian.org/debian/privoxy
 Vcs-Git: https://salsa.debian.org/debian/privoxy.git
 Homepage: https://www.privoxy.org/
 
 Package: privoxy
 Architecture: any
-Depends: ${misc:Depends},
-         ${perl:Depends},
-         ${shlibs:Depends},
-         adduser,
-         debconf,
-         logrotate,
-         ucf
-Recommends: doc-base
-Suggests: apparmor
-Pre-Depends: ${misc:Pre-Depends}
+Depends:
+ adduser,
+ debconf,
+ logrotate,
+ ucf,
+ ${misc:Depends},
+ ${perl:Depends},
+ ${shlibs:Depends},
+Recommends:
+ doc-base,
+Suggests:
+ apparmor,
+Pre-Depends:
+ ${misc:Pre-Depends},
 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/copyright b/debian/copyright
index 71fa31a5..9d786a63 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -14,7 +14,7 @@ Copyright:
  Parts Copyright (C) 2001 Jonathan Foster http://www.jon-foster.co.uk/
  Parts Copyright (C) 2003 Ian Cummings <ian_a_c at hotmail.com>
  Parts Copyright (C) 2000-2003 by Andreas S. Oesterhelt <andreas at oesterhelt.org>
- Parts Copyright (C) 2006-2021 Fabian Keil <fk at fabiankeil.de>
+ Parts Copyright (C) 2006-2026 Fabian Keil <fk at fabiankeil.de>
  Parts Copyright (c) 2020 Maxim Antonov <mantonov at gmail.com>
  Parts Copyright (C) 2017-2020 Vaclav Svec. FIT CVUT.
 License: GPL-2+
@@ -40,9 +40,9 @@ Files: regression-tests.action tools/uagen.pl
  tools/url-pattern-translator.pl utils/changelog2doc.pl
  utils/create-package-feed.pl tests/cts/gen-skip-reasons.pl
  tests/cts/privoxy-runtests.pm tests/cts/run-privoxy-tests.sh
- tests/cts/runtests-wrapper.sh
+ tests/cts/runtests-wrapper.sh tests/cts/bind-to-address.pl
 Copyright:
- Copyright (c) 2006-2025 Fabian Keil <fk at fabiankeil.de>
+ Copyright (c) 2006-2026 Fabian Keil <fk at fabiankeil.de>
 License: ISC
  Permission to use, copy, modify, and distribute this software for any
  purpose with or without fee is hereby granted, provided that the above
diff --git a/debian/lrc.config b/debian/lrc.config
index a05fe3dc..6dcbba56 100644
--- a/debian/lrc.config
+++ b/debian/lrc.config
@@ -6,6 +6,7 @@
 # These files often contain licenses for other files.
 #  (File foo also treated as foo.*)
 doc/source/license.sgml
+doc/source/license-explanation.sgml
 doc/webserver/man-page/privoxy-man-page.html
 doc/webserver/announce.txt
 privoxy.8
diff --git a/debian/patches/33_manpage_hyphen.patch b/debian/patches/33_manpage_hyphen.patch
index 0207e51e..a26a06d2 100644
--- a/debian/patches/33_manpage_hyphen.patch
+++ b/debian/patches/33_manpage_hyphen.patch
@@ -1,6 +1,6 @@
 From: Roland Rosenfeld <roland at debian.org>
 Date: Thu, 24 Jan 2013 17:40:51 +0100
-Last-Update: 2026-04-11
+Last-Update: 2026-06-02
 Subject: Replace all -- in man page by \-\- to make lintian happy.
 Forwarded: not-needed
 
diff --git a/debian/patches/34_system-docbook2man.patch b/debian/patches/34_system-docbook2man.patch
index a76b69b5..93109f26 100644
--- a/debian/patches/34_system-docbook2man.patch
+++ b/debian/patches/34_system-docbook2man.patch
@@ -1,6 +1,6 @@
 From: Roland Rosenfeld <roland at debian.org>
 Date: Sat, 19 Sep 2015 15:05:41 +0200
-Last-Update: 2026-04-11
+Last-Update: 2026-06-02
 Subject: Use Debian docbook2man-spec.pl (from docbook-utils) instead of local
  copy, to make package reproducible.
 Forwarded: not-needed
diff --git a/debian/po/es.po b/debian/po/es.po
index 6e0b44b5..fe46009a 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -30,7 +30,7 @@ msgstr ""
 "PO-Revision-Date: 2018-07-16 00:23+0200\n"
 "Last-Translator: Jonathan Bustillos <jathanblackred at openmailbox.com>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
-"Language: \n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 31883937..ee8dc9b0 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -12,7 +12,7 @@ msgstr ""
 "PO-Revision-Date: 2016-05-27 08:57+0200\n"
 "Last-Translator: Steve Petruzzello <dlist at bluewin.ch>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
-"Language: \n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/debian/po/sv.po b/debian/po/sv.po
index d899f5ec..9b710eba 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2016-04-08 17:17+0200\n"
 "PO-Revision-Date: 2016-05-21 09:51+0100\n"
 "Last-Translator: Jonatan Nyberg <jonatan at autistici.org>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language-Team: Swedish <debian-l10n-swedish at lists.debian.org>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.
