current/debian/patches 35_man-spelling.patch, NONE, 1.1 05_defaut_action.patch, 1.1, 1.2 14_config.patch, 1.1, 1.2 25_standard_medium.patch, 1.1, 1.2 27_remove_nsl.patch, 1.1, 1.2 33_manpage_hyphen.patch, 1.1, 1.2 34_system-docbook2man.patch, 1.1, 1.2 series, 1.1, 1.2 28_listen_localhost.patch, 1.1, NONE

Roland Rosenfeld <[email protected]> Mon, 29 Aug 2016 12:04:11 +0000
Newsgroups	gmane.comp.web.privoxy.cvs
Message-ID	<[email protected]>
Update of /cvsroot/ijbswa/current/debian/patches
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31992/patches

Modified Files:
	05_defaut_action.patch 14_config.patch 
	25_standard_medium.patch 27_remove_nsl.patch 
	33_manpage_hyphen.patch 34_system-docbook2man.patch series 
Added Files:
	35_man-spelling.patch 
Removed Files:
	28_listen_localhost.patch 
Log Message:
Add all Debian changes since 3.0.24-2.


Index: 34_system-docbook2man.patch
===================================================================
RCS file: /cvsroot/ijbswa/current/debian/patches/34_system-docbook2man.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** 34_system-docbook2man.patch	6 Feb 2016 12:29:54 -0000	1.1
--- 34_system-docbook2man.patch	29 Aug 2016 12:04:09 -0000	1.2
***************
*** 5,9 ****
  --- a/GNUmakefile.in
  +++ b/GNUmakefile.in
! @@ -469,7 +469,7 @@ dok-man:
   # target for man page generation!
   man: dok-release
--- 5,9 ----
  --- a/GNUmakefile.in
  +++ b/GNUmakefile.in
! @@ -479,7 +479,7 @@ dok-man:
   # target for man page generation!
   man: dok-release

Index: 25_standard_medium.patch
===================================================================
RCS file: /cvsroot/ijbswa/current/debian/patches/25_standard_medium.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** 25_standard_medium.patch	6 Feb 2016 12:29:53 -0000	1.1
--- 25_standard_medium.patch	29 Aug 2016 12:04:09 -0000	1.2
***************
*** 6,13 ****
  --- a/match-all.action
  +++ b/match-all.action
! @@ -10,7 +10,16 @@
!  +change-x-forwarded-for{block} \
   +client-header-tagger{css-requests} \
   +client-header-tagger{image-requests} \
  ++deanimate-gifs{last} \
  ++filter{refresh-tags} \
--- 6,13 ----
  --- a/match-all.action
  +++ b/match-all.action
! @@ -11,7 +11,16 @@
   +client-header-tagger{css-requests} \
   +client-header-tagger{image-requests} \
+  +client-header-tagger{range-requests} \
  ++deanimate-gifs{last} \
  ++filter{refresh-tags} \

Index: 27_remove_nsl.patch
===================================================================
RCS file: /cvsroot/ijbswa/current/debian/patches/27_remove_nsl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** 27_remove_nsl.patch	6 Feb 2016 12:29:53 -0000	1.1
--- 27_remove_nsl.patch	29 Aug 2016 12:04:09 -0000	1.2
***************
*** 4,8 ****
  --- a/configure.in
  +++ b/configure.in
! @@ -470,7 +470,7 @@ dnl gmtime and localtime
   dnl =================================================================
   
--- 4,8 ----
  --- a/configure.in
  +++ b/configure.in
! @@ -491,7 +491,7 @@ dnl gmtime and localtime
   dnl =================================================================
   

Index: 14_config.patch
===================================================================
RCS file: /cvsroot/ijbswa/current/debian/patches/14_config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** 14_config.patch	6 Feb 2016 12:29:53 -0000	1.1
--- 14_config.patch	29 Aug 2016 12:04:09 -0000	1.2
***************
*** 4,21 ****
  --- a/config
  +++ b/config
- @@ -1,6 +1,6 @@
- -#        Sample Configuration File for Privoxy 3.0.24
- +#        Sample Configuration File for Privoxy
-  #
- -#  $Id$
- +#  Id: config,v
-  #
-  #  Copyright (C) 2001-2014 Privoxy Developers http://www.privoxy.org/
-  #
  @@ -128,7 +128,7 @@
   #          config file, because it is used while the config file is
   #          being read.
   #
! -#user-manual http://www.privoxy.org/user-manual/
  +user-manual /usr/share/doc/privoxy/user-manual
   #
--- 4,12 ----
  --- a/config
  +++ b/config
  @@ -128,7 +128,7 @@
   #          config file, because it is used while the config file is
   #          being read.
   #
! -#user-manual https://www.privoxy.org/user-manual/
  +user-manual /usr/share/doc/privoxy/user-manual
   #

Index: series
===================================================================
RCS file: /cvsroot/ijbswa/current/debian/patches/series,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** series	6 Feb 2016 12:29:54 -0000	1.1
--- series	29 Aug 2016 12:04:09 -0000	1.2
***************
*** 6,11 ****
  25_standard_medium.patch
  27_remove_nsl.patch
- 28_listen_localhost.patch
  32_bind_fixup.patch
  33_manpage_hyphen.patch
  34_system-docbook2man.patch
--- 6,11 ----
  25_standard_medium.patch
  27_remove_nsl.patch
  32_bind_fixup.patch
  33_manpage_hyphen.patch
  34_system-docbook2man.patch
+ 35_man-spelling.patch

Index: 05_defaut_action.patch
===================================================================
RCS file: /cvsroot/ijbswa/current/debian/patches/05_defaut_action.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** 05_defaut_action.patch	6 Feb 2016 12:29:53 -0000	1.1
--- 05_defaut_action.patch	29 Aug 2016 12:04:09 -0000	1.2
***************
*** 4,8 ****
  --- a/default.action.master
  +++ b/default.action.master
! @@ -2413,6 +2413,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
--- 4,8 ----
  --- a/default.action.master
  +++ b/default.action.master
! @@ -2419,6 +2419,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
***************
*** 14,18 ****
   {-filter{unsolicited-popups}}
   # Sticky Actions = -filter{unsolicited-popups}
! @@ -2471,6 +2474,11 @@ tr.anp.se/
   {+filter{tiny-textforms}}
   .sourceforge.net/tracker
--- 14,18 ----
   {-filter{unsolicited-popups}}
   # Sticky Actions = -filter{unsolicited-popups}
! @@ -2477,6 +2480,11 @@ tr.anp.se/
   {+filter{tiny-textforms}}
   .sourceforge.net/tracker

--- 28_listen_localhost.patch DELETED ---

--- NEW FILE: 35_man-spelling.patch ---
Description: Fix typo in man page privoxy-log-parser(1)
Author: Roland Rosenfeld <[email protected]>

--- a/tools/privoxy-log-parser.pl
+++ b/tools/privoxy-log-parser.pl
@@ -2612,7 +2612,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!
 
-[B<--no-msecs>] Don't expect milisecond resolution
+[B<--no-msecs>] Don't expect millisecond resolution
 
 [B<--no-syntax-highlighting>] Disable syntax-highlighting. Useful when
 the filtered output is piped into less in which case the ANSI control

Index: 33_manpage_hyphen.patch
===================================================================
RCS file: /cvsroot/ijbswa/current/debian/patches/33_manpage_hyphen.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** 33_manpage_hyphen.patch	6 Feb 2016 12:29:54 -0000	1.1
--- 33_manpage_hyphen.patch	29 Aug 2016 12:04:09 -0000	1.2
***************
*** 4,8 ****
  --- a/GNUmakefile.in
  +++ b/GNUmakefile.in
! @@ -474,8 +474,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); \
--- 4,8 ----
  --- a/GNUmakefile.in
  +++ b/GNUmakefile.in
! @@ -484,8 +484,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); \

------------------------------------------------------------------------------

_______________________________________________
ijbswa-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ijbswa-commits