X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=debian%2Frules;h=75ec21f501b669055322f581a701927ac4abb287;hb=b96d9243b1252c7dc423957782894a99cd4448f4;hp=5490b5db8bcd727055fe6ee6b3fb66be0b51e59b;hpb=9150de67bf88cf72430cb9ec158275531c2381c8;p=privoxy.git

diff --git a/debian/rules b/debian/rules
index 5490b5db..75ec21f5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,8 @@
 #!/usr/bin/make -f
+#
+# (C) 2002-2008 Roland Rosenfeld <roland@debian.org>, based on
 # Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+# This file is public domain software, originally written by Joey Hess. 
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -12,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
@@ -19,104 +24,86 @@ else
         OPTIMIZE=-O2
 endif
 
-configure: configure-stamp
-configure-stamp:
+build: build-stamp
+build-stamp: patch-stamp
 	dh_testdir
 
 	autoheader
 	autoconf
 	env CFLAGS="$(OPTIMIZE) -g" \
 		./configure --prefix=/usr --sysconfdir=/etc \
-		--mandir=/usr/share/man	$(WITHDEBUG)
-
-	touch configure-stamp
-
-build: build-stamp
-build-stamp: configure-stamp 
-	dh_testdir
-
+		--mandir=/usr/share/man	$(WITHDEBUG) \
+		--enable-zlib \
+		--with-docbook=/usr/share/sgml/docbook/stylesheet/dsssl/modular
 	$(MAKE)
-
-# 	backup formatted upstream documentation:
-	for x in text webserver pdf; do \
-		if [ ! -d doc/$$x.dist ]; then \
-			cp -a doc/$$x doc/$$x.dist; \
-		fi; \
-	done
-	for x in INSTALL README privoxy.1; do \
-		if [ ! -f $$x.dist ]; then \
-			cp -a $$x $$x.dist; \
-		fi; \
-	done
-
-	(cd doc/source; $(MAKE) pdf)
-	(cd doc/source; $(MAKE) all)
+	$(MAKE) dok
+	env -u LANG $(MAKE) man
+	$(MAKE) man2html
 
 	touch build-stamp
 
-clean:
+clean: clean1 unpatch
+clean1:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
 
-	-$(MAKE) clean
-	-$(MAKE) distclean
-	rm -f privoxy 
-	rm -f configure config.h GNUmakefile 
-	rm -f doc/source/ldp.dsl
+	[ ! -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
 
-# 	restore formatted upstream documentation:
-	for x in text webserver pdf; do \
-		if [ -d doc/$$x.dist ]; then \
-			rm -rf doc/$$x; \
-			mv doc/$$x.dist doc/$$x; \
-		fi; \
-	done
-	for x in INSTALL README privoxy.1; do \
-		if [ -f $$x.dist ]; then \
-			rm -f $$x; \
-			mv $$x.dist $$x; \
-		fi; \
-	done
+	rm -f doc/source/ldp.dsl
+	rm -rf doc/source/temp
 
-	dh_clean
+	dh_clean -Xrc.privoxy.orig
 
-install: build
+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
 
-	sed -e 's/^\(\(trust\|proxy\)-info-url\|admin-address\)/#\1/'  \
-	    -e 's/^\(enable-\(edit-actions\|remote-toggle\)\)[ 	]*1/\1 0/' \
-	    -e 's#^confdir .*#confdir /etc/privoxy#' \
-	    -e 's#^logdir .*#logdir /var/log/privoxy#' \
-	    -e 's%^#\(user-manual\).*%\1 /usr/share/doc/privoxy/user-manual%' \
-	    -e 's/\(Sample Configuration File for Privoxy\).*/\1/' \
-	    -e 's/Id: config,v.*/Id: config,v $$/' \
-		< config > $(DEBDIR)/etc/privoxy/config
+	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
 	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
 
+#	Remove CVS tags and trailing spaces from config files:
+	find $(DEBDIR)/etc/privoxy -type f \
+	| xargs grep -l '\$$[A-Z][^$$]*:[^$$]*\$$' \
+	| while read f; do \
+	    sed -e 's/\$$\(Id: [^$$]*,v\)[^$$]*\$$/\1/' \
+		-e 's/\$$\(Source: [^$$]*\)\$$/\1/' \
+		-e 's/\$$\(Log: [^$$]*\)\$$/\1/' \
+		-e 's/ *$$//' < $$f > $$f.new; \
+	    mv -f $$f.new $$f; \
+	done
 
 # Build architecture-independent files here.
-binary-indep: build install
+binary-indep: build-stamp install
 # We have nothing to do by default.
 
 # Build architecture-dependent files here.
-binary-arch: build install
+binary-arch: build-stamp install
 	dh_testdir
 	dh_testroot
 #	dh_installdebconf	
@@ -137,15 +124,17 @@ binary-arch: build 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
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+
+.PHONY: build clean binary-indep binary-arch binary install patch unpatch \
+	clean1