[Privoxy-commits] [privoxy] 03/03: Debian: Support nodoc build option.

[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 ad23d2517cf20001749dd79d19f3839a739bfbd1
Author: Roland Rosenfeld <roland at debian.org>
AuthorDate: Fri Jan 29 17:50:02 2021 +0100

    Debian: Support nodoc build option.
---
 debian/changelog | 10 ++++++++--
 debian/control   | 16 ++++++++--------
 debian/rules     | 14 ++++++++++++++
 3 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 04fefbb2..0b908955 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,10 @@
-privoxy (3.0.30-1~pp+1) unstable; urgency=medium
+privoxy (3.0.31~gitsnapshot-1) UNRELEASED; urgency=medium
+
+  * Support nodoc build option.
+
+ -- Roland Rosenfeld <roland at debian.org>  Fri, 29 Jan 2021 14:55:54 +0100
+
+privoxy (3.0.30-1) unstable; urgency=medium
 
   * New upstream release 3.0.30.
   * Update all patches to new version.
@@ -6,7 +12,7 @@ privoxy (3.0.30-1~pp+1) unstable; urgency=medium
     are now incorporated upstream.
   * Optimize debian/rules clean to restore pristine state.
 
- -- Roland Rosenfeld <roland at debian.org>  Thu, 28 Jan 2021 21:55:12 +0100
+ -- Roland Rosenfeld <roland at debian.org>  Thu, 28 Jan 2021 22:00:05 +0100
 
 privoxy (3.0.29-2) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 754124d5..19bca69e 100644
--- a/debian/control
+++ b/debian/control
@@ -5,18 +5,18 @@ Maintainer: Roland Rosenfeld <roland at debian.org>
 Build-Depends: autoconf,
                debhelper-compat (= 13),
                dh-apparmor,
-               docbook,
-               docbook-dsssl,
-               docbook-utils,
-               groff,
+               docbook <!nodoc>,
+               docbook-dsssl <!nodoc>,
+               docbook-utils <!nodoc>,
+               groff <!nodoc>,
                libbrotli-dev,
                libmbedtls-dev,
                libpcre3-dev,
-               man2html,
-               opensp,
+               man2html <!nodoc>,
+               opensp <!nodoc>,
                po-debconf,
-               sgmlspl,
-               w3m,
+               sgmlspl <!nodoc>,
+               w3m <!nodoc>,
                zlib1g-dev
 Standards-Version: 4.5.1
 Homepage: https://www.privoxy.org/
diff --git a/debian/rules b/debian/rules
index c8b6c1c4..d6c23b39 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,17 +31,22 @@ override_dh_auto_configure:
 
 override_dh_auto_build:
 	$(MAKE)
+
+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
 	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
 	env -u LANG LC_ALL=C.UTF-8 $(MAKE) man2html
+endif
 
 override_dh_auto_clean:
+ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
 #	restore auto build documentation from source package:
 	[ ! -f debian/doc.tar ] || tar xf debian/doc.tar
 	rm -f debian/doc.tar
+endif
 	find doc/source -name \*.html | xargs -r rm -f
 	[ ! -f GNUmakefile ] || $(MAKE) clean
 	[ ! -f GNUmakefile ] || $(MAKE) distclean
@@ -57,6 +62,13 @@ override_dh_auto_install:
 	install -m 0755 privoxy $(DEBDIR)/usr/sbin/privoxy
 	sed -e 's/\(Sample Configuration File for Privoxy\).*/\1/;' < config \
 	    > $(DEBDIR)/usr/share/privoxy/config
+ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
+	echo "with doc"
+else
+#	use remote user-manual (default) on nodoc configuration:
+	sed -i 's/^user-manual/#user-manual/' \
+		$(DEBDIR)/usr/share/privoxy/config
+endif
 	install -m 0644 default.action $(DEBDIR)/etc/privoxy/default.action
 	install -m 0644 match-all.action $(DEBDIR)/etc/privoxy/match-all.action
 	install -m 0644 user.action $(DEBDIR)/etc/privoxy/user.action
@@ -95,9 +107,11 @@ override_dh_install:
 
 override_dh_installdocs:
 	dh_installdocs
+ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
 	(cd $(DEBDIR)/usr/share/doc/privoxy/; \
 	 mv privoxy-index.html index.html)
 	(cd $(DEBDIR)/usr/share/doc/privoxy/user-manual; ln -s '../p_doc.css')
+endif
 
 override_dh_perl:
 #	We only need perl-base:

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