From c151927f1864f7072ef2f29476f32825b7b541ff Mon Sep 17 00:00:00 2001 From: Roland Rosenfeld <roland@debian.org> Date: Wed, 20 Jan 2021 19:45:14 +0100 Subject: [PATCH] Prepare Debian release 3.0.30-1~pp-1. --- debian/changelog | 6 +++--- debian/patches/14_config.patch | 6 +++--- debian/patches/35_man-spelling.patch | 2 +- debian/rules | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 057a2ef5..be4cfd6d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -privoxy (3.0.30~git-snapshot-1) UNRELEASED; urgency=medium +privoxy (3.0.30-1~pp-1) unstable; urgency=medium - * Git Snapshot. + * New upstream release 3.0.30. * Update all patches to new version. * 39_show-status and 40_redirect-ssl are now incorporated upstream. - -- Roland Rosenfeld <roland@debian.org> Sun, 17 Jan 2021 15:15:58 +0100 + -- Roland Rosenfeld <roland@debian.org> Wed, 20 Jan 2021 19:44:57 +0100 privoxy (3.0.29-2) unstable; urgency=medium diff --git a/debian/patches/14_config.patch b/debian/patches/14_config.patch index 81a24151..deb228ff 100644 --- a/debian/patches/14_config.patch +++ b/debian/patches/14_config.patch @@ -32,7 +32,7 @@ Forwarded: not-needed # # 2.5. actionsfile # ================= -@@ -2467,7 +2467,7 @@ socket-timeout 300 +@@ -2468,7 +2468,7 @@ socket-timeout 300 # # ca-directory /usr/local/etc/privoxy/CA # @@ -41,7 +41,7 @@ Forwarded: not-needed # # 7.2. ca-cert-file # ================== -@@ -2624,7 +2624,7 @@ socket-timeout 300 +@@ -2627,7 +2627,7 @@ socket-timeout 300 # # certificate-directory /usr/local/var/privoxy/certs # @@ -50,7 +50,7 @@ Forwarded: not-needed # # 7.6. cipher-list # ================= -@@ -2756,7 +2756,7 @@ socket-timeout 300 +@@ -2759,7 +2759,7 @@ socket-timeout 300 # # trusted-cas-file trusted_cas_file.pem # diff --git a/debian/patches/35_man-spelling.patch b/debian/patches/35_man-spelling.patch index 873e4f9b..89e8f63c 100644 --- a/debian/patches/35_man-spelling.patch +++ b/debian/patches/35_man-spelling.patch @@ -5,7 +5,7 @@ Forwarded: not-needed --- a/tools/privoxy-log-parser.pl +++ b/tools/privoxy-log-parser.pl -@@ -2793,7 +2793,7 @@ It does not escape any input! +@@ -2814,7 +2814,7 @@ It does not escape any input! [B<--keep-date>] Don't remove the date when printing highlighted log messages. Useful when parsing multiple log files at once. diff --git a/debian/rules b/debian/rules index e7745b0c..08644536 100755 --- a/debian/rules +++ b/debian/rules @@ -52,7 +52,7 @@ override_dh_auto_clean: rm -f src/java/org/privoxy/activityconsole/*.class rm -f doc/source/ldp.dsl rm -rf doc/source/temp - dh_clean -Xrc.privoxy.orig + dh_clean override_dh_auto_install: install -m 0755 privoxy $(DEBDIR)/usr/sbin/privoxy -- 2.49.0