From: Roland Rosenfeld <roland@debian.org>
Date: Thu, 11 Jun 2020 16:52:03 +0000 (+0200)
Subject: Update to GIT c62254 and update all patches.
X-Git-Tag: v_3_0_29~164
X-Git-Url: http://www.privoxy.org/gitweb/gpl.html?a=commitdiff_plain;h=244c58834701c8910136b7ef7c435481cfc99800;p=privoxy.git

Update to GIT c62254 and update all patches.
---

diff --git a/debian/changelog b/debian/changelog
index 8c7fc523..9a8214ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-privoxy (3.0.29~gitdbcfeb-1) UNRELEASED; urgency=medium
+privoxy (3.0.29~gitc62254-1) UNRELEASED; urgency=medium
 
   * New upstream development version.
   * Update all patches to new version.
@@ -10,7 +10,7 @@ privoxy (3.0.29~gitdbcfeb-1) UNRELEASED; urgency=medium
   * Adapt TLS/SSL settings to Debian FHS.
   * Generate dirs with correct permissions for https-inspection.
 
- -- Roland Rosenfeld <roland@debian.org>  Fri, 05 Jun 2020 18:13:53 +0200
+ -- Roland Rosenfeld <roland@debian.org>  Fri, 04 Sep 2020 15:13:08 +0200
 
 privoxy (3.0.28-3) unstable; urgency=medium
 
diff --git a/debian/patches/05_defaut_action.patch b/debian/patches/05_defaut_action.patch
index ba4f2b57..68053c70 100644
--- a/debian/patches/05_defaut_action.patch
+++ b/debian/patches/05_defaut_action.patch
@@ -4,7 +4,7 @@ Subject: Several changes/additons to default.action.
 
 --- a/default.action.master
 +++ b/default.action.master
-@@ -2452,6 +2452,9 @@ schneegans.de/sv/\?url=referer
+@@ -2462,6 +2462,9 @@ schneegans.de/sv/\?url=referer
  #MASTER# REMARKS: Exclude per Debian bug report #377843
  # URL = http://blogs.msdn.com/wga/archive/2006/07/16/667063.aspx
  blogs.msdn.com
@@ -14,7 +14,7 @@ Subject: Several changes/additons to default.action.
  
  {-filter{unsolicited-popups}}
  # Sticky Actions = -filter{unsolicited-popups}
-@@ -2510,6 +2513,11 @@ tr.anp.se/
+@@ -2520,6 +2523,11 @@ tr.anp.se/
  {+filter{tiny-textforms}}
  .sourceforge.net/tracker
  
diff --git a/debian/patches/25_standard_medium.patch b/debian/patches/25_standard_medium.patch
index df505d0e..ba6745c9 100644
--- a/debian/patches/25_standard_medium.patch
+++ b/debian/patches/25_standard_medium.patch
@@ -5,7 +5,7 @@ Subject: Change the global default from standard.Cautious to standard.Medium,
 
 --- a/match-all.action
 +++ b/match-all.action
-@@ -11,7 +11,16 @@
+@@ -10,7 +10,16 @@
  +client-header-tagger{css-requests} \
  +client-header-tagger{image-requests} \
  +client-header-tagger{range-requests} \
diff --git a/debian/patches/33_manpage_hyphen.patch b/debian/patches/33_manpage_hyphen.patch
index bdff94cb..c79fef3b 100644
--- a/debian/patches/33_manpage_hyphen.patch
+++ b/debian/patches/33_manpage_hyphen.patch
@@ -4,7 +4,7 @@ Subject: Replace all -- in man page by \-\- to make lintian happy.
 
 --- a/GNUmakefile.in
 +++ b/GNUmakefile.in
-@@ -537,8 +537,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 45b0d12f..55b38072 100644
--- a/debian/patches/34_system-docbook2man.patch
+++ b/debian/patches/34_system-docbook2man.patch
@@ -5,7 +5,7 @@ Subject: Use Debian docbook2man-spec.pl (from docbook-utils) instead of local
 
 --- a/GNUmakefile.in
 +++ b/GNUmakefile.in
-@@ -532,7 +532,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) * ;\
diff --git a/debian/patches/35_man-spelling.patch b/debian/patches/35_man-spelling.patch
index 9b828c48..51158f70 100644
--- a/debian/patches/35_man-spelling.patch
+++ b/debian/patches/35_man-spelling.patch
@@ -4,7 +4,7 @@ Subject: Fix typo in man page privoxy-log-parser(1)
 
 --- a/tools/privoxy-log-parser.pl
 +++ b/tools/privoxy-log-parser.pl
-@@ -2709,7 +2709,7 @@ omitted, ANSI escape sequences are used
+@@ -2730,7 +2730,7 @@ omitted, ANSI escape sequences are used
  This option is only intended to make embedding log excerpts in web pages easier.
  It does not escape any input!