From f05f83b5327ae76db35a16148508c93cbbe4aa4a Mon Sep 17 00:00:00 2001
From: Roland Rosenfeld <roland@debian.org>
Date: Thu, 2 Dec 2021 09:05:51 +0100
Subject: [PATCH] Merge Debian 3.0.32-3 changes.

---
 debian/changelog               | 16 +++++++++++++++-
 debian/control                 |  4 ++--
 debian/maintscript             |  2 ++
 debian/patches/14_config.patch |  6 +++---
 debian/postrm                  |  9 ++++++---
 5 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 05f402ec..97814c53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,22 @@ privoxy (3.0.33~gitsnapshot-1) UNRELEASED; urgency=medium
 
   * Unreleased GIT snapshot.
   * Adapt Debian patches to GIT changes.
+  * Undo lintian override for bug 992465.
 
- -- Roland Rosenfeld <roland@debian.org>  Sun, 11 Apr 2021 13:07:57 +0200
+ -- Roland Rosenfeld <roland@debian.org>  Thu, 02 Dec 2021 09:04:45 +0100
+
+privoxy (3.0.32-3) unstable; urgency=medium
+
+  * d/maintscript: Remove orphaned /etc/privoxy/(standard|global).action
+    (Closes: #990157).
+  * No longer "rm /etc/privoxy" on purge.
+  * postrm: optimize ucf purge of /etc/privoxy/config*
+  * Update to Standards-Version 4.6.0 (no changes).
+  * Use "command -v" instead of deprecated "which" in postrm.
+  * Override lintian bug 992465 (usr/lib/systemd outside /lib).
+  * debian/control: update Build-Depends for cross builds.
+
+ -- Roland Rosenfeld <roland@debian.org>  Fri, 27 Aug 2021 13:26:25 +0200
 
 privoxy (3.0.32-2) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 19bca69e..9e7bde5e 100644
--- a/debian/control
+++ b/debian/control
@@ -13,12 +13,12 @@ Build-Depends: autoconf,
                libmbedtls-dev,
                libpcre3-dev,
                man2html <!nodoc>,
-               opensp <!nodoc>,
+               opensp:native <!nodoc>,
                po-debconf,
                sgmlspl <!nodoc>,
                w3m <!nodoc>,
                zlib1g-dev
-Standards-Version: 4.5.1
+Standards-Version: 4.6.0
 Homepage: https://www.privoxy.org/
 Vcs-Git: https://salsa.debian.org/debian/privoxy.git
 Vcs-Browser: https://salsa.debian.org/debian/privoxy
diff --git a/debian/maintscript b/debian/maintscript
index e6f00897..77e4ed98 100644
--- a/debian/maintscript
+++ b/debian/maintscript
@@ -1 +1,3 @@
+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
diff --git a/debian/patches/14_config.patch b/debian/patches/14_config.patch
index 49102dbe..dcb14984 100644
--- a/debian/patches/14_config.patch
+++ b/debian/patches/14_config.patch
@@ -32,7 +32,7 @@ Forwarded: not-needed
  #
  #  2.5. actionsfile
  #  =================
-@@ -2463,7 +2463,7 @@ socket-timeout 300
+@@ -2483,7 +2483,7 @@ socket-timeout 300
  #
  #      ca-directory /usr/local/etc/privoxy/CA
  #
@@ -41,7 +41,7 @@ Forwarded: not-needed
  #
  #  7.2. ca-cert-file
  #  ==================
-@@ -2622,7 +2622,7 @@ socket-timeout 300
+@@ -2650,7 +2650,7 @@ socket-timeout 300
  #
  #      certificate-directory /usr/local/var/privoxy/certs
  #
@@ -50,7 +50,7 @@ Forwarded: not-needed
  #
  #  7.6. cipher-list
  #  =================
-@@ -2751,7 +2751,7 @@ socket-timeout 300
+@@ -2779,7 +2779,7 @@ socket-timeout 300
  #
  #      trusted-cas-file trusted_cas_file.pem
  #
diff --git a/debian/postrm b/debian/postrm
index aa9c832f..7fa593f2 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -21,13 +21,16 @@ set -e
 case "$1" in
     purge)
         # deluser --quiet privoxy
-        if [ -x "$(which ucf 2>/dev/null)" ]; then
+        for ext in .ucf-new .ucf-old .ucf-dist ""; do
+                rm -f "/etc/privoxy/config$ext"
+        done
+        if [ -x "$(command -v ucf)" ]; then
             ucf --purge /etc/privoxy/config
         fi
-        if [ -x "$(which ucfr 2>/dev/null)" ]; then
+        if [ -x "$(command -v ucfr)" ]; then
             ucfr --purge privoxy /etc/privoxy/config
         fi
-        rm -rf /var/log/privoxy /etc/privoxy
+        rm -rf /var/log/privoxy
         if [ -e /usr/share/debconf/confmodule ]; then
             . /usr/share/debconf/confmodule
             db_purge
-- 
2.39.2