[or-cvs] Always enable DataDirectory, requires dpatch

[Peter Palfrader]

Update of /home/or/cvsroot/debian
In directory moria.mit.edu:/tmp/cvs-serv30717

Modified Files:
	changelog rules 
Log Message:
Always enable DataDirectory, requires dpatch

Index: changelog
===================================================================
RCS file: /home/or/cvsroot/debian/changelog,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- changelog	3 Mar 2004 12:33:40 -0000	1.18
+++ changelog	3 Mar 2004 12:56:04 -0000	1.19
@@ -3,8 +3,10 @@
   * New upstream release.
   * Do not strip binaries for now.
   * Add "# ulimit -c unlimited" to tor.default
+  * Always enable DataDirectory.
+  * Actually use dpatch now (to modify upstream torrc.in)
 
- -- Peter Palfrader <weasel at debian.org>  Wed,  3 Mar 2004 13:33:19 +0100
+ -- Peter Palfrader <weasel at debian.org>  Wed,  3 Mar 2004 13:48:09 +0100
 
 tor (0.0.1+0.0.2pre23-1) unstable; urgency=low
 

Index: rules
===================================================================
RCS file: /home/or/cvsroot/debian/rules,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- rules	3 Mar 2004 12:32:21 -0000	1.7
+++ rules	3 Mar 2004 12:56:04 -0000	1.8
@@ -13,6 +13,9 @@
 
 CFLAGS = -Wall -g
 
+export PACKAGE=tor
+include /usr/share/dpatch/dpatch.make
+
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
 else
@@ -22,6 +25,7 @@
 #	INSTALL_PROGRAM += -s
 #endif
 
+configure: patch-stamp
 config.status: configure
 	dh_testdir
 	CFLAGS="$(CFLAGS)" ./configure \
@@ -47,7 +51,7 @@
 
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp