X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=debian%2Frules;h=c2ba13230f7049dfe9b3eb08d9b94cffa034bea2;hb=e6da52fa3929789d48c6e6b3bb337d85eae98a33;hp=815f2aeb8a8a767efbaef4a5d65ee739036dc6e7;hpb=72081f829de368392d04076728f8c991178c0080;p=privoxy.git

diff --git a/debian/rules b/debian/rules
index 815f2aeb..c2ba1323 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 #
-# (C) 2002-2006 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. 
 
@@ -14,6 +14,9 @@ DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 DEBDIR=`pwd`/debian/privoxy
 
+# Include dpatch stuff.
+include /usr/share/dpatch/dpatch.make
+
 OPTIMIZE=
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
         OPTIMIZE=-O0
@@ -21,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
 
@@ -30,21 +35,13 @@ build-stamp: patch-stamp
 	env CFLAGS="$(OPTIMIZE) -g" \
 		./configure --prefix=/usr --sysconfdir=/etc \
 		--mandir=/usr/share/man	$(WITHDEBUG) \
+		--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
@@ -53,8 +50,8 @@ clean1:
 	dh_testroot
 	rm -f build-stamp configure-stamp
 
-	-$(MAKE) clean
-	-$(MAKE) distclean
+	[ ! -f GNUmakefile ] || $(MAKE) clean
+	[ ! -f GNUmakefile ] || $(MAKE) distclean
 	rm -f configure config.h GNUmakefile
 	rm -f privoxy.8
 
@@ -64,25 +61,30 @@ clean1:
 
 	rm -f doc/source/ldp.dsl
 	rm -rf doc/source/temp
-	rm -rf doc/pdf
 
-	dh_clean
+	dh_clean -Xrc.privoxy.orig
 
 install: build-stamp
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_clean -k -Xrc.privoxy.orig
 	dh_installdirs
 
 	install -m 0755 privoxy $(DEBDIR)/usr/sbin/privoxy
 
 	install -m 644 config $(DEBDIR)/etc/privoxy/config
 	install -m 0644 default.action $(DEBDIR)/etc/privoxy/default.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
@@ -124,26 +126,16 @@ 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
 	dh_builddeb
 
-patch: patch-stamp
-patch-stamp:
-	dpatch apply-all
-	touch patch-stamp
-	#dpatch call-all -a=pkg-info >patch-stamp
-
-unpatch:
-	dpatch deapply-all
-	rm -rf patch-stamp debian/patched
-
 binary: binary-indep binary-arch
 
 .PHONY: build clean binary-indep binary-arch binary install patch unpatch \