Merge Debian 4.0.0-1 changes.

diff --git a/debian/changelog b/debian/changelog
index c378502..1a81f52 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,19 @@
-privoxy (3.0.35~gitsnapshot-1) UNRELEASED; urgency=medium
+privoxy (4.0.1~gitsnapshot-1) UNRELEASED; urgency=medium
 
   * Unreleased GIT snapshot.
-  * The following patches are now incorporated upstream: 35_pcre2-support,
-    36_pcre2-patternfix, 37_socks-bufferoverflow, 38_filter.c-init1,
-    39_filter.c-init2, 40_openssl-deprwarn, 41_md5-to-sha256.
 
- -- Roland Rosenfeld <roland@debian.org>  Fri, 11 Oct 2024 16:31:33 +0200
+ -- Roland Rosenfeld <roland@debian.org>  Fri, 31 Jan 2025 16:05:14 +0100
+
+privoxy (4.0.0-1) unstable; urgency=medium
+
+  * New upstream version 4.0.0.
+  * Update all patches to new version.  The following patches are now
+    incorporated upstream: 35_pcre-support, 36_pcre2-patternfix,
+    37_socks-bufferoverflow, 38_filter.c-init1, 39_filter.c-init2,
+    40_openssl-deprwarn, 41_md5-to-sha256.
+  * Update debian/copyright.
+
+ -- Roland Rosenfeld <roland@debian.org>  Sat, 18 Jan 2025 15:33:14 +0100
 
 privoxy (3.0.34-6) unstable; urgency=medium
 

diff --git a/debian/copyright b/debian/copyright
index 010a993..9740b16 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,8 +5,8 @@ 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-2023 by Privoxy Developers <privoxy-devel@lists.privoxy.org>
+ Copyright (C) 2001-2025 by the Privoxy team. https://www.privoxy.org/
+ Copyright (C) 2001-2025 by Privoxy Developers <privoxy-devel@lists.privoxy.org>
  Parts Copyright (c) 1997 by Anonymous Coders and Junkbusters, Inc.
  Parts Copyright (C) 1999 Adam Lock <locka@iol.ie>
  Parts Copyright (C) 1998-1999 Steve Cheng <steve@ggi-project.org>
@@ -33,14 +33,16 @@ Comment:
  binaries under the terms of the GNU General Public License as
  published by the Free Software Foundation, either version 3 of the
  license, or (at your option) any later version.
-License: GPL-2+ or GPL-3
+License: GPL-2+
 
-Files: ./regression-tests.action ./tools/uagen.pl
- ./tools/privoxy-regression-test.pl ./tools/privoxy-log-parser.pl
- ./tools/url-pattern-translator.pl ./utils/changelog2doc.pl
- ./utils/create-package-feed.pl
+Files: regression-tests.action tools/uagen.pl
+ tools/privoxy-regression-test.pl tools/privoxy-log-parser.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
 Copyright:
- Copyright (c) 2006-2021 Fabian Keil <fk@fabiankeil.de>
+ Copyright (c) 2006-2025 Fabian Keil <fk@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
@@ -54,7 +56,7 @@ License: ISC
  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-Files: ./strptime.h
+Files: strptime.h
 Copyright:
  Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
 Comment:
@@ -76,7 +78,7 @@ License: LGPL-2+
  write to the Free Software Foundation, Inc., 51 Franklin St, Fifth
  Floor, Boston, MA 02110-1301, USA.
 
-Files: ./config.guess ./config.sub
+Files: config.guess config.sub
 Copyright:
   1992-2013, Free Software Foundation, Inc.
 License: GPL-2+ with Autoconf-data exception
@@ -98,7 +100,7 @@ License: GPL-2+ with Autoconf-data exception
  configuration script generated by Autoconf, you may include it under
  the same distribution terms that you use for the rest of that program.
 
-Files: ./install-sh
+Files: install-sh
 Copyright: 1991 by the Massachusetts Institute of Technology
 License: HPND-sell-variant
  Permission to use, copy, modify, distribute, and sell this software and its
@@ -113,7 +115,7 @@ License: HPND-sell-variant
 
 Files: debian/*
 Copyright:
- 2002-2024  Roland Rosenfeld <roland@debian.org>
+ 2002-2025  Roland Rosenfeld <roland@debian.org>
 License: GPL-2+
 
 License: GPL-2+
@@ -138,21 +140,3 @@ License: GPL-2+
  On Debian systems, the full text of the GNU General Public
  License version 2 can be found in the file
  `/usr/share/common-licenses/GPL-2'.
-
-License: GPL-3
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <https://www.gnu.org/licenses/>.
- .
- On Debian systems, the full text of the GNU General Public
- License version 3 can be found in the file
- `/usr/share/common-licenses/GPL-3'.

diff --git a/debian/patches/33_manpage_hyphen.patch b/debian/patches/33_manpage_hyphen.patch
index 6e2058e..492d32e 100644 (file)
--- a/debian/patches/33_manpage_hyphen.patch
+++ b/debian/patches/33_manpage_hyphen.patch
@@ -5,7 +5,7 @@ Forwarded: not-needed
 
 --- a/GNUmakefile.in
 +++ b/GNUmakefile.in
-@@ -540,8 +540,7 @@ man: dok-release
+@@ -544,8 +544,7 @@ man: dok-release
        perl -pi.bak -e "s/\[ /\[/g;s/á/\\\\['a]/g;s/é/\\\\['e]/g" $(MAN_PAGE); \
        perl -pi.bak -e "s/ö/\\\\[:o]/g" $(MAN_PAGE); \
        perl -pi.bak -e 's/([ {])-([a-z])/$$1\\-$$2/g' $(MAN_PAGE); \

diff --git a/debian/patches/34_system-docbook2man.patch b/debian/patches/34_system-docbook2man.patch
index b496957..06fb54f 100644 (file)
--- a/debian/patches/34_system-docbook2man.patch
+++ b/debian/patches/34_system-docbook2man.patch
@@ -6,7 +6,7 @@ Forwarded: not-needed
 
 --- a/GNUmakefile.in
 +++ b/GNUmakefile.in
-@@ -535,7 +535,7 @@ dok-man:
+@@ -539,7 +539,7 @@ dok-man:
  # target for man page generation!
  man: dok-release
        mkdir -p doc/source/temp && cd doc/source/temp && $(RM) * ;\