X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=debian%2Frules;h=c2ba13230f7049dfe9b3eb08d9b94cffa034bea2;hp=a842236516a87ed435fc06afb695b0578e2aad09;hb=dc33fcf6aa752fb4d122dbf2f111026392b5cfca;hpb=3b1aa5679211bfdff57aa46cad375ed988ed385a

diff --git a/debian/rules b/debian/rules
index a8422365..c2ba1323 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 #
-# (C) 2002-2007 Roland Rosenfeld <roland@debian.org>, based on
+# (C) 2002-2011 Roland Rosenfeld <roland@debian.org>, based on
 # Sample debian/rules that uses debhelper.
 # This file is public domain software, originally written by Joey Hess. 
 
@@ -24,7 +24,9 @@ else
         OPTIMIZE=-O2
 endif
 
-build: build-stamp
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
 build-stamp: patch-stamp
 	dh_testdir
 
@@ -33,22 +35,13 @@ build-stamp: patch-stamp
 	env CFLAGS="$(OPTIMIZE) -g" \
 		./configure --prefix=/usr --sysconfdir=/etc \
 		--mandir=/usr/share/man	$(WITHDEBUG) \
-		--enable-zlib \
+		--enable-zlib --enable-no-gifs \
 		--with-docbook=/usr/share/sgml/docbook/stylesheet/dsssl/modular
 	$(MAKE)
-#       create missing doc/pdf directory if necessary:
-	[ -d doc/pdf ] || mkdir doc/pdf
-	$(MAKE) dok-pdf
 	$(MAKE) dok
 	env -u LANG $(MAKE) man
 	$(MAKE) man2html
 
-# 	remove trailing whitespaces:
-	for x in developer-manual user-manual faq; do \
-		sed -e 's/[ 	]*$$//' < doc/text/$$x.txt > doc/text/$$x.nws;\
-		mv -f doc/text/$$x.nws doc/text/$$x.txt; \
-	done
-
 	touch build-stamp
 
 clean: clean1 unpatch
@@ -68,7 +61,6 @@ clean1:
 
 	rm -f doc/source/ldp.dsl
 	rm -rf doc/source/temp
-#	rm -rf doc/pdf
 
 	dh_clean -Xrc.privoxy.orig
 
@@ -82,12 +74,17 @@ install: build-stamp
 
 	install -m 644 config $(DEBDIR)/etc/privoxy/config
 	install -m 0644 default.action $(DEBDIR)/etc/privoxy/default.action
-	install -m 0644 global.action $(DEBDIR)/etc/privoxy/global.action
-	install -m 0644 standard.action $(DEBDIR)/etc/privoxy/standard.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 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
 
+	install -m 0755 tools/privoxy-log-parser.pl \
+		$(DEBDIR)/usr/bin/privoxy-log-parser
+	pod2man tools/privoxy-log-parser.pl \
+		> $(DEBDIR)/usr/share/man/man1/privoxy-log-parser.1
+
 	cp -r templates $(DEBDIR)/etc/privoxy/
 	rm -f $(DEBDIR)/etc/privoxy/templates/*~
 	rm -rf $(DEBDIR)/etc/privoxy/templates/CVS
@@ -129,11 +126,11 @@ binary-arch: build-stamp install
 	dh_installchangelogs ChangeLog
 	dh_link
 	dh_strip
-	dh_compress -Xpdf
+	dh_compress
 	dh_fixperms
 #	dh_makeshlibs
 	dh_installdeb
-#	dh_perl
+	dh_perl
 	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums