[Privoxy-commits] [privoxy] 02/02: Adapt Debian patches to GIT changes.

[User Git]

This is an automated email from the git hooks/post-receive script.

git pushed a commit to branch master
in repository privoxy.

commit 1961769c7e0598d45666536959cc51b57ebcd1d1
Author: Roland Rosenfeld <roland at debian.org>
AuthorDate: Sun Apr 11 13:08:39 2021 +0200

    Adapt Debian patches to GIT changes.
---
 debian/changelog                           | 3 ++-
 debian/patches/14_config.patch             | 6 +++---
 debian/patches/27_remove_nsl.patch         | 2 +-
 debian/patches/33_manpage_hyphen.patch     | 2 +-
 debian/patches/34_system-docbook2man.patch | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e0e16fdd..05f402ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 privoxy (3.0.33~gitsnapshot-1) UNRELEASED; urgency=medium
 
   * Unreleased GIT snapshot.
+  * Adapt Debian patches to GIT changes.
 
- -- Roland Rosenfeld <roland at debian.org>  Thu, 25 Feb 2021 22:29:55 +0100
+ -- Roland Rosenfeld <roland at debian.org>  Sun, 11 Apr 2021 13:07:57 +0200
 
 privoxy (3.0.32-2) unstable; urgency=medium
 
diff --git a/debian/patches/14_config.patch b/debian/patches/14_config.patch
index deb228ff..49102dbe 100644
--- a/debian/patches/14_config.patch
+++ b/debian/patches/14_config.patch
@@ -32,7 +32,7 @@ Forwarded: not-needed
  #
  #  2.5. actionsfile
  #  =================
-@@ -2468,7 +2468,7 @@ socket-timeout 300
+@@ -2463,7 +2463,7 @@ socket-timeout 300
  #
  #      ca-directory /usr/local/etc/privoxy/CA
  #
@@ -41,7 +41,7 @@ Forwarded: not-needed
  #
  #  7.2. ca-cert-file
  #  ==================
-@@ -2627,7 +2627,7 @@ socket-timeout 300
+@@ -2622,7 +2622,7 @@ socket-timeout 300
  #
  #      certificate-directory /usr/local/var/privoxy/certs
  #
@@ -50,7 +50,7 @@ Forwarded: not-needed
  #
  #  7.6. cipher-list
  #  =================
-@@ -2759,7 +2759,7 @@ socket-timeout 300
+@@ -2751,7 +2751,7 @@ socket-timeout 300
  #
  #      trusted-cas-file trusted_cas_file.pem
  #
diff --git a/debian/patches/27_remove_nsl.patch b/debian/patches/27_remove_nsl.patch
index 23554bab..e465fb23 100644
--- a/debian/patches/27_remove_nsl.patch
+++ b/debian/patches/27_remove_nsl.patch
@@ -5,7 +5,7 @@ Forwarded: not-needed
 
 --- a/configure.in
 +++ b/configure.in
-@@ -512,7 +512,7 @@ dnl gmtime and localtime
+@@ -521,7 +521,7 @@ dnl gmtime and localtime
  dnl =================================================================
  
  dnl Next line needed to find the gethost*_r functions on Solaris
diff --git a/debian/patches/33_manpage_hyphen.patch b/debian/patches/33_manpage_hyphen.patch
index d51ae684..6e2058ef 100644
--- a/debian/patches/33_manpage_hyphen.patch
+++ b/debian/patches/33_manpage_hyphen.patch
@@ -5,7 +5,7 @@ Forwarded: not-needed
 
 --- a/GNUmakefile.in
 +++ b/GNUmakefile.in
-@@ -546,8 +546,7 @@ man: dok-release
+@@ -540,8 +540,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 4d1eedf1..b4969578 100644
--- a/debian/patches/34_system-docbook2man.patch
+++ b/debian/patches/34_system-docbook2man.patch
@@ -6,7 +6,7 @@ Forwarded: not-needed
 
 --- a/GNUmakefile.in
 +++ b/GNUmakefile.in
-@@ -541,7 +541,7 @@ dok-man:
+@@ -535,7 +535,7 @@ dok-man:
  # target for man page generation!
  man: dok-release
  	mkdir -p doc/source/temp && cd doc/source/temp && $(RM) * ;\

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.