[Privoxy-commits] [privoxy] branch master updated: More adaptions of debian specific changes to new upstream version.

[User Git]

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

git pushed a commit to branch master
in repository privoxy.

The following commit(s) were added to refs/heads/master by this push:
     new 1677d6be More adaptions of debian specific changes to new upstream version.
1677d6be is described below

commit 1677d6bec20af7d0658bae6b4cb8658aa564ccb3
Author: Roland Rosenfeld <roland at debian.org>
AuthorDate: Sat Apr 11 19:26:16 2026 +0200

    More adaptions of debian specific changes to new upstream version.
---
 debian/manpages                            |  2 +-
 debian/patches/33_manpage_hyphen.patch     | 17 +++++++++--------
 debian/patches/34_system-docbook2man.patch |  9 +++++----
 debian/rules                               |  2 +-
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/debian/manpages b/debian/manpages
index 51ec1109..df50bf57 100644
--- a/debian/manpages
+++ b/debian/manpages
@@ -1 +1 @@
-privoxy.8
+man/privoxy.8
diff --git a/debian/patches/33_manpage_hyphen.patch b/debian/patches/33_manpage_hyphen.patch
index 492d32ee..0207e51e 100644
--- a/debian/patches/33_manpage_hyphen.patch
+++ b/debian/patches/33_manpage_hyphen.patch
@@ -1,17 +1,18 @@
 From: Roland Rosenfeld <roland at debian.org>
 Date: Thu, 24 Jan 2013 17:40:51 +0100
+Last-Update: 2026-04-11
 Subject: Replace all -- in man page by \-\- to make lintian happy.
 Forwarded: not-needed
 
 --- a/GNUmakefile.in
 +++ b/GNUmakefile.in
-@@ -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); \
--	perl -pi.bak -e 's/ --([a-z])/ \\-\\-$$1/g' $(MAN_PAGE); \
--	perl -pi.bak -e 's/\\fB--/\\fB\\-\\-/g' $(MAN_PAGE); \
-+	perl -pi.bak -e 's/--/\\-\\-/g' $(MAN_PAGE); \
- 	$(DB) ../privoxy-man-page.sgml && $(MV) -f $(MAN_PAGE) ../../../$(MAN_PAGE)
+@@ -552,8 +552,7 @@ man: dok-release
+ 	perl -pi.bak -e "s/\[ /\[/g;s/�/\\\\['a]/g;s/�/\\\\['e]/g" $(PRIVOXY_MAN_PAGE); \
+ 	perl -pi.bak -e "s/�/\\\\[:o]/g" $(PRIVOXY_MAN_PAGE); \
+ 	perl -pi.bak -e 's/([ {])-([a-z])/$$1\\-$$2/g' $(PRIVOXY_MAN_PAGE); \
+-	perl -pi.bak -e 's/ --([a-z])/ \\-\\-$$1/g' $(PRIVOXY_MAN_PAGE); \
+-	perl -pi.bak -e 's/\\fB--/\\fB\\-\\-/g' $(PRIVOXY_MAN_PAGE); \
++	perl -pi.bak -e 's/--/\\-\\-/g' $(PRIVOXY_MAN_PAGE); \
+ 	$(DB) ../privoxy-man-page.sgml && $(MV) -f $(PRIVOXY_MAN_PAGE) ../../../man/$(PRIVOXY_MAN_PAGE)
  
  # For those with man2html ala RH7s.
diff --git a/debian/patches/34_system-docbook2man.patch b/debian/patches/34_system-docbook2man.patch
index 06fb54f4..a76b69b5 100644
--- a/debian/patches/34_system-docbook2man.patch
+++ b/debian/patches/34_system-docbook2man.patch
@@ -1,17 +1,18 @@
 From: Roland Rosenfeld <roland at debian.org>
 Date: Sat, 19 Sep 2015 15:05:41 +0200
+Last-Update: 2026-04-11
 Subject: Use Debian docbook2man-spec.pl (from docbook-utils) instead of local
  copy, to make package reproducible.
 Forwarded: not-needed
 
 --- a/GNUmakefile.in
 +++ b/GNUmakefile.in
-@@ -539,7 +539,7 @@ dok-man:
+@@ -547,7 +547,7 @@ dok-man:
  # target for man page generation!
  man: dok-release
  	mkdir -p doc/source/temp && cd doc/source/temp && $(RM) * ;\
 -	$(NSGMLS) ../privoxy-man-page.sgml  | sgmlspl ../../../utils/docbook2man/docbook2man-spec.pl &&\
 +	$(NSGMLS) ../privoxy-man-page.sgml  | sgmlspl /usr/share/perl5/sgmlspl-specs/docbook2man-spec.pl &&\
- 	perl -pi.bak -e 's/ <URL:.*>//; s/\[ /\[/g' $(MAN_PAGE) ;\
- 	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/ <URL:.*>//; s/\[ /\[/g' $(PRIVOXY_MAN_PAGE) ;\
+ 	perl -pi.bak -e "s/\[ /\[/g;s/�/\\\\['a]/g;s/�/\\\\['e]/g" $(PRIVOXY_MAN_PAGE); \
+ 	perl -pi.bak -e "s/�/\\\\[:o]/g" $(PRIVOXY_MAN_PAGE); \
diff --git a/debian/rules b/debian/rules
index b2c78243..2d4dcd77 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,7 +41,7 @@ override_dh_auto_build:
 
 ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
 #	preserve auto build documentation from source package:
-	tar cf debian/doc.tar README INSTALL AUTHORS doc/webserver privoxy.8
+	tar cf debian/doc.tar README INSTALL AUTHORS doc/webserver man/privoxy.8
 	env -u LANG LC_ALL=C.UTF-8 $(MAKE) dok
 	rm -f doc/webserver/user-manual/*.bak
 	env -u LANG LC_ALL=C.UTF-8 $(MAKE) man

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