X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=debian%2Frules;h=a842236516a87ed435fc06afb695b0578e2aad09;hb=d52001f4635fd28608fd8a311d6b200e4663ecfa;hp=55b8e8899b8f02f1c5bb86b4a3131264ef9e7b7b;hpb=20a28003d9d4f3c5af30eea34423493a8783e518;p=privoxy.git

diff --git a/debian/rules b/debian/rules
index 55b8e889..a8422365 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-2007 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
@@ -30,6 +33,7 @@ build-stamp: patch-stamp
 	env CFLAGS="$(OPTIMIZE) -g" \
 		./configure --prefix=/usr --sysconfdir=/etc \
 		--mandir=/usr/share/man	$(WITHDEBUG) \
+		--enable-zlib \
 		--with-docbook=/usr/share/sgml/docbook/stylesheet/dsssl/modular
 	$(MAKE)
 #       create missing doc/pdf directory if necessary:
@@ -53,8 +57,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
 
@@ -78,6 +82,7 @@ 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 user.action $(DEBDIR)/etc/privoxy/user.action
 	install -m 0644 default.filter $(DEBDIR)/etc/privoxy/default.filter
@@ -134,16 +139,6 @@ binary-arch: build-stamp install
 	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 \