15_mansection8 and 35_man-spelling are now incorporated upstream.

diff --git a/debian/changelog b/debian/changelog
index db6a5c4..9f9f59c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,10 +2,11 @@ privoxy (3.0.30-1~pp-1) unstable; urgency=medium
 
   * New upstream release 3.0.30.
   * Update all patches to new version.
-  * 39_show-status and 40_redirect-ssl are now incorporated upstream.
+  * 15_mansection8, 35_man-spelling, 39_show-status and 40_redirect-ssl
+    are now incorporated upstream.
   * Optimize debian/rules clean to restore pristine state.
 
- -- Roland Rosenfeld <roland@debian.org>  Wed, 20 Jan 2021 19:55:41 +0100
+ -- Roland Rosenfeld <roland@debian.org>  Thu, 21 Jan 2021 18:52:08 +0100
 
 privoxy (3.0.29-2) unstable; urgency=medium
 

diff --git a/debian/patches/15_mansection8.patch b/debian/patches/15_mansection8.patch
deleted file mode 100644 (file)
index 36d064b..0000000
--- a/debian/patches/15_mansection8.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Roland Rosenfeld <roland@debian.org>
-Date: Mon, 21 Apr 2003 11:11:31 +0200
-Subject: Move man page from man section 1 to man section 8.
-Forwarded: not-needed
-
---- a/GNUmakefile.in
-+++ b/GNUmakefile.in
-@@ -60,7 +60,7 @@ CONF_BASE    = @sysconfdir@
- SBIN_DEST    = @sbindir@
- MAN_DIR      = @mandir@
- MAN_DEST     = $(MAN_DIR)/man1
--MAN_PAGE     = privoxy.1
-+MAN_PAGE     = privoxy.8
- SHARE_DEST   = @datadir@
- DOC_DEST     = $(SHARE_DEST)/doc/privoxy
- VAR_DEST     = @localstatedir@
---- a/doc/source/privoxy-man-page.sgml
-+++ b/doc/source/privoxy-man-page.sgml
-@@ -54,7 +54,7 @@
- </refentryinfo>
- <refmeta>
-  <refentrytitle>privoxy</refentrytitle>
-- <manvolnum>1</manvolnum>
-+ <manvolnum>8</manvolnum>
-  <refmiscinfo>
-   Privoxy &p-version;<![%p-not-stable;[ &p-status;]]>
-  </refmiscinfo>

diff --git a/debian/patches/35_man-spelling.patch b/debian/patches/35_man-spelling.patch
deleted file mode 100644 (file)
index 89e8f63..0000000
--- a/debian/patches/35_man-spelling.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-From: Roland Rosenfeld <roland@debian.org>
-Date: Sun, 1 May 2016 14:21:22 +0200
-Subject: Fix typo in man page privoxy-log-parser(1)
-Forwarded: not-needed
-
---- a/tools/privoxy-log-parser.pl
-+++ b/tools/privoxy-log-parser.pl
-@@ -2814,7 +2814,7 @@ It does not escape any input!
- [B<--keep-date>] Don't remove the date when printing highlighted log messages.
- Useful when parsing multiple log files at once.
- 
--[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

diff --git a/debian/patches/series b/debian/patches/series
index e639ed8..216c4bb 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,7 @@
 14_config.patch
-15_mansection8.patch
 17_502_no_such_domain.patch
 25_standard_medium.patch
 27_remove_nsl.patch
 32_bind_fixup.patch
 33_manpage_hyphen.patch
 34_system-docbook2man.patch
-35_man-spelling.patch

diff --git a/debian/rules b/debian/rules
index 5c1b6d1..c8b6c1c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ override_dh_auto_configure:
 override_dh_auto_build:
        $(MAKE)
 #      preserve auto build documentation from source package:
-       tar cf debian/doc.tar README INSTALL AUTHORS doc/webserver
+       tar cf debian/doc.tar README INSTALL AUTHORS doc/webserver 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
@@ -46,7 +46,6 @@ override_dh_auto_clean:
        [ ! -f GNUmakefile ] || $(MAKE) clean
        [ ! -f GNUmakefile ] || $(MAKE) distclean
        rm -f configure config.h GNUmakefile
-       rm -f privoxy.8
        rm -rf obj
        rm -f ActivityConsole.jar
        rm -f src/java/org/privoxy/activityconsole/*.class