X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=debian%2Frules;h=d30d495845f59d76db6edd0ba0c400573b08c34a;hp=be5438e62be8cd9b03e6b56e2e85dfba70b4d742;hb=e0786740f1d0a00af35d9e0e5b29b60331297660;hpb=daecd4737ed179358a8f8b415f1a61b881d3ad1e

diff --git a/debian/rules b/debian/rules
index be5438e6..d30d4958 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,12 @@
 #!/usr/bin/make -f
+#
+# (C) 2002-2006 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
 
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=3
-
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -15,75 +14,73 @@ DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 DEBDIR=`pwd`/debian/privoxy
 
-DB2HTML=jw -f docbook -b html -d `pwd`/ldpOK.dsl\#html
-
-
-CFLAGS="-O2"
-WITHDEBUG=""
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -g
-	WITHDEBUG="--with-debug"
+OPTIMIZE=
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+        OPTIMIZE=-O0
+else
+        OPTIMIZE=-O2
 endif
 
-configure: configure-stamp
-configure-stamp:
+build: build-stamp
+build-stamp: patch-stamp
 	dh_testdir
 
 	autoheader
 	autoconf
-	env CFLAGS=$(CFLAGS) \
+	env CFLAGS="$(OPTIMIZE) -g" \
 		./configure --prefix=/usr --sysconfdir=/etc \
 		--mandir=/usr/share/man	$(WITHDEBUG) \
 		--with-docbook=/usr/share/sgml/docbook/stylesheet/dsssl/modular
-
-	touch configure-stamp
-
-build: build-stamp
-build-stamp: configure-stamp 
-	dh_testdir
-
 	$(MAKE)
-
-# 	And now we create the documentation (manually):
-	$(MAKE) doc/source/ldpOK.dsl
-	(cd doc/source; \
-	 $(DB2HTML) -o faq faq.sgml; \
-	 $(DB2HTML) -o user-manual user-manual.sgml; \
-	 $(DB2HTML) -o developer-manual developer-manual.sgml; \
-	 docbook2txt faq.sgml; \
-	 docbook2txt user-manual.sgml; \
-	 docbook2txt developer-manual.sgml)
+#       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:
+clean: clean1 unpatch
+clean1:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
 
-	-$(MAKE) clobber
-	rm -f privoxy 
-	rm -f configure config.h GNUmakefile 
-	rm -f doc/source/ldpOK.dsl
-	rm -rf doc/source/faq doc/source/user-manual \
-		doc/source/developer-manual
-	rm -f doc/source/*.txt
+	-$(MAKE) clean
+	-$(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
+#	rm -rf doc/pdf
 
-	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#^confdir \.#confdir /etc/privoxy#' \
-	    -e 's#^logdir \.#logdir /var/log/privoxy#' \
-		< 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
 
@@ -91,17 +88,29 @@ install: build
 	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	
-	dh_installdocs
+	dh_installdocs -XCVS
+	(cd $(DEBDIR)/usr/share/doc/privoxy/; \
+	 mv privoxy-index.html index.html)
 	dh_installexamples
 	dh_installmenu
 	dh_installlogrotate
@@ -116,7 +125,7 @@ binary-arch: build install
 	dh_installchangelogs ChangeLog
 	dh_link
 	dh_strip
-	dh_compress
+	dh_compress -Xpdf
 	dh_fixperms
 #	dh_makeshlibs
 	dh_installdeb
@@ -126,5 +135,17 @@ binary-arch: build 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 configure
+
+.PHONY: build clean binary-indep binary-arch binary install patch unpatch \
+	clean1