Debian: Update to new git version 8097d5 (update all patches)

diff --git a/debian/changelog b/debian/changelog
index 0bade0b..205eee7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-privoxy (3.0.29~gitec5b42-1) UNRELEASED; urgency=medium
+privoxy (3.0.29~gitdbcfeb-1) UNRELEASED; urgency=medium

 
 

-  * New upstream developement version.
+  * New upstream development version.

   * Update all patches to new version.
   * 36_trusted-cgi-referer-example and 37_ppedit-tests403 are now
     incorporated upstream.
   * Update all patches to new version.
   * 36_trusted-cgi-referer-example and 37_ppedit-tests403 are now
     incorporated upstream.

diff --git a/debian/patches/05_defaut_action.patch b/debian/patches/05_defaut_action.patch
index 4e8911e..ba4f2b5 100644 (file)
--- 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
 
 --- a/default.action.master
 +++ b/default.action.master

-@@ -2435,6 +2435,9 @@ schneegans.de/sv/\?url=referer
+@@ -2452,6 +2452,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
  #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}
  
  {-filter{unsolicited-popups}}
  # Sticky Actions = -filter{unsolicited-popups}

-@@ -2493,6 +2496,11 @@ tr.anp.se/
+@@ -2510,6 +2513,11 @@ tr.anp.se/

  {+filter{tiny-textforms}}
  .sourceforge.net/tracker
  
  {+filter{tiny-textforms}}
  .sourceforge.net/tracker
  

diff --git a/debian/patches/25_standard_medium.patch b/debian/patches/25_standard_medium.patch
index ba6745c..df505d0 100644 (file)
--- 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
 
 --- a/match-all.action
 +++ b/match-all.action

-@@ -10,7 +10,16 @@
+@@ -11,7 +11,16 @@

  +client-header-tagger{css-requests} \
  +client-header-tagger{image-requests} \
  +client-header-tagger{range-requests} \
  +client-header-tagger{css-requests} \
  +client-header-tagger{image-requests} \
  +client-header-tagger{range-requests} \

diff --git a/debian/patches/35_man-spelling.patch b/debian/patches/35_man-spelling.patch
index 841fd62..9b828c4 100644 (file)
--- 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
 
 --- a/tools/privoxy-log-parser.pl
 +++ b/tools/privoxy-log-parser.pl

-@@ -2628,7 +2628,7 @@ omitted, ANSI escape sequences are used
+@@ -2709,7 +2709,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!
  
  This option is only intended to make embedding log excerpts in web pages easier.
  It does not escape any input!