X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=debian%2Frules;h=1a632959e59b17386b991e48f30f9d1c550794d2;hb=f47808636216d1608372876cad58098408fece4f;hp=564aa84e0c5bda6538f201d9f483221beda8faa7;hpb=307d9bf70dec6e98cf0403b95ead326611ad2f37;p=privoxy.git

diff --git a/debian/rules b/debian/rules
index 564aa84e..1a632959 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 #
-# (c) 2002-2016 Roland Rosenfeld <roland@debian.org>
+# (c) 2002-2020 Roland Rosenfeld <roland@debian.org>
 #
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -11,7 +11,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 DEBDIR=`pwd`/debian/privoxy
 
 %:
-	dh $@ --with autotools_dev --with systemd
+	dh $@
 
 override_dh_auto_configure:
 	autoheader
@@ -23,6 +23,7 @@ override_dh_auto_configure:
 		--enable-zlib \
 		--enable-no-gifs \
 		--enable-external-filters \
+		--with-mbedtls \
 		--with-docbook=/usr/share/sgml/docbook/stylesheet/dsssl/modular
 
 override_dh_auto_build:
@@ -32,6 +33,7 @@ override_dh_auto_build:
 	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
 
 override_dh_auto_clean:
 #	restore auto build documentation from source package:
@@ -51,8 +53,7 @@ override_dh_auto_clean:
 
 override_dh_auto_install:
 	install -m 0755 privoxy $(DEBDIR)/usr/sbin/privoxy
-	sed -e 's/\(Sample Configuration File for Privoxy\).*/\1/;' \
-	    -e 's/\$$Id: config,v.*/Id: config,v/' < config \
+	sed -e 's/\(Sample Configuration File for Privoxy\).*/\1/;' < config \
 	    > $(DEBDIR)/usr/share/privoxy/config
 	install -m 0644 default.action $(DEBDIR)/etc/privoxy/default.action
 	install -m 0644 match-all.action $(DEBDIR)/etc/privoxy/match-all.action
@@ -75,21 +76,17 @@ override_dh_auto_install:
 
 	cp -r templates $(DEBDIR)/etc/privoxy/
 	rm -f $(DEBDIR)/etc/privoxy/templates/*~
-	rm -rf $(DEBDIR)/etc/privoxy/templates/CVS
 
-#	Remove CVS tags and trailing spaces from config files:
+#      Remove trailing spaces from config files:
 	find $(DEBDIR)/etc/privoxy -type f \
-	| xargs grep -l '\$$[A-Z][^$$]*:[^$$]*\$$' \
+	| xargs grep -l ' $$' \
 	| while read f; do \
-	    sed -e 's/\$$\(Id: [^$$]*,v\)[^$$]*\$$/\1/' \
-		-e 's/\$$\(Source: [^$$]*\)\$$/\1/' \
-		-e 's/\$$\(Log: [^$$]*\)\$$/\1/' \
-		-e 's/ *$$//' < $$f > $$f.new; \
+	    sed -e 's/  *$$//' < $$f > $$f.new; \
 	    mv -f $$f.new $$f; \
 	done
 
 override_dh_installdocs:
-	dh_installdocs -XCVS
+	dh_installdocs
 	(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')