X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=debian%2Frules;h=c8b6c1c4e514b62073f280114369d0e641f7b669;hb=d3856acd00b4c8164f66301b4d7ca01d5521ffbc;hp=113dadb7164a9b423b6e24ca8012bff87331d5f8;hpb=b1f25d63e134f8efce6f4d3851940468ace1f2df;p=privoxy.git

diff --git a/debian/rules b/debian/rules
index 113dadb7..c8b6c1c4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 #
-# (c) 2002-2015 Roland Rosenfeld <roland@debian.org>
+# (c) 2002-2021 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,15 +23,20 @@ override_dh_auto_configure:
 		--enable-zlib \
 		--enable-no-gifs \
 		--enable-external-filters \
+		--enable-extended-statistics \
+		--enable-pcre-host-patterns \
+		--with-mbedtls \
+		--with-brotli \
 		--with-docbook=/usr/share/sgml/docbook/stylesheet/dsssl/modular
 
 override_dh_auto_build:
 	$(MAKE)
 # 	preserve auto build documentation from source package:
-	tar cf debian/doc.tar README INSTALL AUTHORS doc/source 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
+	env -u LANG LC_ALL=C.UTF-8 $(MAKE) man2html
 
 override_dh_auto_clean:
 #	restore auto build documentation from source package:
@@ -41,20 +46,22 @@ 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
 	rm -f doc/source/ldp.dsl
 	rm -rf doc/source/temp
-	dh_clean -Xrc.privoxy.orig
+	dh_clean
 
 override_dh_auto_install:
 	install -m 0755 privoxy $(DEBDIR)/usr/sbin/privoxy
-	install -m 644 config $(DEBDIR)/etc/privoxy/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
 	install -m 0644 user.action $(DEBDIR)/etc/privoxy/user.action
+	install -m 0644 regression-tests.action \
+		$(DEBDIR)/etc/privoxy/regression-tests.action
 	install -m 0644 default.filter $(DEBDIR)/etc/privoxy/default.filter
 	install -m 0644 user.filter $(DEBDIR)/etc/privoxy/user.filter
 	install -m 0644 trust $(DEBDIR)/etc/privoxy/trust
@@ -64,25 +71,33 @@ override_dh_auto_install:
 	pod2man tools/privoxy-log-parser.pl \
 		> $(DEBDIR)/usr/share/man/man1/privoxy-log-parser.1
 
+	install -m 0755 tools/privoxy-regression-test.pl \
+		$(DEBDIR)/usr/bin/privoxy-regression-test
+	pod2man tools/privoxy-regression-test.pl \
+		> $(DEBDIR)/usr/share/man/man1/privoxy-regression-test.1
+
 	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_install:
+	dh_install
+	install -m0644 debian/apparmor/usr.sbin.privoxy \
+		$(DEBDIR)/etc/apparmor.d/
+	dh_apparmor --profile-name=usr.sbin.privoxy
+
 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')
 
 override_dh_perl:
 #	We only need perl-base: