Merge Debian 3.0.33-1 changes.

diff --git a/debian/changelog b/debian/changelog
index 97814c5..022e2d0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,17 @@
-privoxy (3.0.33~gitsnapshot-1) UNRELEASED; urgency=medium
+privoxy (3.0.34~gitsnapshot-1) UNRELEASED; urgency=medium
 
   * Unreleased GIT snapshot.
-  * Adapt Debian patches to GIT changes.
+
+ -- Roland Rosenfeld <roland@debian.org>  Thu, 09 Dec 2021 16:35:46 +0100
+
+privoxy (3.0.33-1) unstable; urgency=medium
+
+  * New upstream version 3.0.33.
+  * Adapt all patches to new version.
+  * Remove pcre dir from copyright and debian/source/lintian-overrides.
   * Undo lintian override for bug 992465.
 
- -- Roland Rosenfeld <roland@debian.org>  Thu, 02 Dec 2021 09:04:45 +0100
+ -- Roland Rosenfeld <roland@debian.org>  Wed, 08 Dec 2021 16:29:31 +0100
 
 privoxy (3.0.32-3) unstable; urgency=medium
 

diff --git a/debian/copyright b/debian/copyright
index 00a73b0..d68b465 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -61,32 +61,6 @@ Copyright:
  2002-2021  Roland Rosenfeld <roland@debian.org>
 License: GPL-2+
 
-Files: ./pcre/*
-Copyright: Copyright (c) 1997-2000 University of Cambridge
-Comment:
- Written by: Philip Hazel <ph10@cam.ac.uk>
- .
- University of Cambridge Computing Service,
- Cambridge, England. Phone: +44 1223 334714.
-License: BSD-like
- Permission is granted to anyone to use this software for any purpose on any
- computer system, and to redistribute it freely, subject to the following
- restrictions:
- .
- 1. This software 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.
- .
- 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.
- .
- 4. If PCRE is embedded in any software that is released under the GNU
-    General Purpose Licence (GPL), then the terms of that licence shall
-    supersede any condition above with which it is incompatible.
-
 License: GPL-2+
  This program is free software; you can redistribute it
  and/or modify it under the terms of the GNU General

diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
deleted file mode 100644 (file)
index 3ddafbb..0000000
--- a/debian/source/lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-# we don't use the local pcre source but use the ones from libpcre3-dev,
-# so we can ignore the warnings about old libtool versions:
-privoxy source: ancient-libtool pcre/ltconfig
-privoxy source: ancient-libtool pcre/ltmain.sh 1.3.4